diff --git a/dockermake-cross.bat b/dockermake-cross.bat
index f68842da..43a1c8dd 100644
--- a/dockermake-cross.bat
+++ b/dockermake-cross.bat
@@ -19,5 +19,5 @@ set REL=%UPP%!REL:%MAT%=!
 if "!REL!" EQU "!ROOT!" (set REL=) ELSE (set "REL=!REL:\=/!")
 set REL=/!REL!
 
-docker pull grumpycoders/pcsx-redux-build-cross:latest
-docker run --rm --env-file "%ROOT%/cross-env.list" -i -w"/project%REL%" -v "%ROOT%:/project" grumpycoders/pcsx-redux-build-cross make CROSS=arm64 %*
+docker pull ghcr.io/grumpycoders/pcsx-redux-build-cross:latest
+docker run --rm --env-file "%ROOT%/cross-env.list" -i -w"/project%REL%" -v "%ROOT%:/project" ghcr.io/grumpycoders/pcsx-redux-build-cross make CROSS=arm64 %*
diff --git a/dockermake-cross.sh b/dockermake-cross.sh
index fc5aa915..e0ec9652 100755
--- a/dockermake-cross.sh
+++ b/dockermake-cross.sh
@@ -6,5 +6,5 @@ cd $ROOT
 ROOT=$(pwd)
 cd $CWD
 
-docker pull grumpycoders/pcsx-redux-build-cross:latest
-docker run --rm --env-file ${ROOT}/cross-env.list -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` grumpycoders/pcsx-redux-build-cross make CROSS=arm64 $@
+docker pull ghcr.io/grumpycoders/pcsx-redux-build-cross:latest
+docker run --rm --env-file ${ROOT}/cross-env.list -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` ghcr.io/grumpycoders/pcsx-redux-build-cross make CROSS=arm64 $@
diff --git a/dockermake.bat b/dockermake.bat
index 04786d1b..22c29057 100644
--- a/dockermake.bat
+++ b/dockermake.bat
@@ -19,5 +19,5 @@ set REL=%UPP%!REL:%MAT%=!
 if "!REL!" EQU "!ROOT!" (set REL=) ELSE (set "REL=!REL:\=/!")
 set REL=/!REL!
 
-docker pull grumpycoders/pcsx-redux-build:latest
-docker run --rm --env-file "%ROOT%/env.list" -i -w"/project%REL%" -v "%ROOT%:/project" grumpycoders/pcsx-redux-build:latest make %*
+docker pull ghcr.io/grumpycoders/pcsx-redux-build:latest
+docker run --rm --env-file "%ROOT%/env.list" -i -w"/project%REL%" -v "%ROOT%:/project" ghcr.io/grumpycoders/pcsx-redux-build:latest make %*
diff --git a/dockermake.sh b/dockermake.sh
index 1dc7ef1b..db654e4d 100755
--- a/dockermake.sh
+++ b/dockermake.sh
@@ -6,5 +6,5 @@ cd $ROOT
 ROOT=$(pwd)
 cd $CWD
 
-docker pull grumpycoders/pcsx-redux-build:latest
-docker run --rm --env-file ${ROOT}/env.list -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` grumpycoders/pcsx-redux-build:latest make $@
+docker pull ghcr.io/grumpycoders/pcsx-redux-build:latest
+docker run --rm --env-file ${ROOT}/env.list -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` ghcr.io/grumpycoders/pcsx-redux-build:latest make $@
diff --git a/dockershell.bat b/dockershell.bat
index b2a57d5c..ea826b56 100644
--- a/dockershell.bat
+++ b/dockershell.bat
@@ -19,5 +19,5 @@ set REL=%UPP%!REL:%MAT%=!
 if "!REL!" EQU "!ROOT!" (set REL=) ELSE (set "REL=!REL:\=/!")
 set REL=/!REL!
 
-docker pull grumpycoders/pcsx-redux-build:latest
-docker run --rm --env-file "%ROOT%/env.list" -t -i -w"/project%REL%" -v "%ROOT%:/project" grumpycoders/pcsx-redux-build:latest bash -l
+docker pull ghcr.io/grumpycoders/pcsx-redux-build:latest
+docker run --rm --env-file "%ROOT%/env.list" -t -i -w"/project%REL%" -v "%ROOT%:/project" ghcr.io/grumpycoders/pcsx-redux-build:latest bash -l
diff --git a/dockershell.sh b/dockershell.sh
index 37d6f666..c39d7198 100755
--- a/dockershell.sh
+++ b/dockershell.sh
@@ -6,5 +6,5 @@ cd $ROOT
 ROOT=$(pwd)
 cd $CWD
 
-docker pull grumpycoders/pcsx-redux-build:latest
-docker run --rm --env-file ${ROOT}/env.list -t -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` grumpycoders/pcsx-redux-build:latest bash -l
+docker pull ghcr.io/grumpycoders/pcsx-redux-build:latest
+docker run --rm --env-file ${ROOT}/env.list -t -i -w/project${CWD#$ROOT} -v "${ROOT}:/project" -u `id -u`:`id -g` ghcr.io/grumpycoders/pcsx-redux-build:latest bash -l
diff --git a/tools/build-cross/Dockerfile b/tools/build-cross/Dockerfile
index 6206dd0d..84260b74 100644
--- a/tools/build-cross/Dockerfile
+++ b/tools/build-cross/Dockerfile
@@ -1,4 +1,4 @@
-# Dockerfile for grumpycoders/pcsx-redux-build-cross
+# Dockerfile for ghcr.io/grumpycoders/pcsx-redux-build-cross
 # IMPORTANT: to build this file, the package qemu-user-static needs to be
 # installed on the host machine.
 
diff --git a/tools/build/Dockerfile b/tools/build/Dockerfile
index 70fd2fc0..3e2575ec 100644
--- a/tools/build/Dockerfile
+++ b/tools/build/Dockerfile
@@ -1,4 +1,4 @@
-# Dockerfile for grumpycoders/pcsx-redux-build
+# Dockerfile for ghcr.io/grumpycoders/pcsx-redux-build
 
 FROM ubuntu:22.10