diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74f643682d..8b8edd6214 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   codestyle_and_sql:
     docker:
-      - image: funjoker/circle-ci:4.3.4-buildpacks-hirsute
+      - image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -40,7 +40,7 @@ jobs:
             cat sql/updates/hotfixes/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
   pch:
     docker:
-      - image: funjoker/circle-ci:4.3.4-buildpacks-hirsute
+      - image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -80,7 +80,7 @@ jobs:
             cd bin/check_install/bin
             cp -r ../../../contrib/Docker/* .
             cp -r ../../../sql ./sql
-            image_prefix=$(echo $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME-$(echo $CIRCLE_BRANCH | tr '/' '-') | tr '[:upper:]' '[:lower:]')
+            image_prefix=$(echo cataclysmpreservationproject/$CIRCLE_PROJECT_REPONAME-$(echo $CIRCLE_BRANCH | tr '/' '-') | tr '[:upper:]' '[:lower:]')
             echo $image_prefix
             docker build --file Dockerfile --force-rm --tag $image_prefix:$CIRCLE_SHA1 --tag $image_prefix:latest .
             docker save $image_prefix:$CIRCLE_SHA1 | gzip > ../../../docker.tar.gz
@@ -88,7 +88,7 @@ jobs:
           path: docker.tar.gz
   nopch:
     docker:
-      - image: funjoker/circle-ci:4.3.4-buildpacks-hirsute
+      - image: cataclysmpreservationproject/circle-ci:4.3.4-buildpacks-hirsute
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD