diff --git a/deploy/selfhost/docker-compose.yml b/deploy/selfhost/docker-compose.yml
index c91893f7e5..baca1c3caa 100644
--- a/deploy/selfhost/docker-compose.yml
+++ b/deploy/selfhost/docker-compose.yml
@@ -51,10 +51,9 @@ x-app-env: &app-env
   API_KEY_RATE_LIMIT: ${API_KEY_RATE_LIMIT:-60/minute}
   MINIO_ENDPOINT_SSL: ${MINIO_ENDPOINT_SSL:-0}
 
-
 services:
   web:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-frontend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-frontend:${APP_RELEASE:-stable}
     command: node web/server.js web
     deploy:
       replicas: ${WEB_REPLICAS:-1}
@@ -65,7 +64,7 @@ services:
       - worker
 
   space:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-space:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-space:${APP_RELEASE:-stable}
     command: node space/server.js space
     deploy:
       replicas: ${SPACE_REPLICAS:-1}
@@ -77,7 +76,7 @@ services:
       - web
 
   admin:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-admin:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-admin:${APP_RELEASE:-stable}
     command: node admin/server.js admin
     deploy:
       replicas: ${ADMIN_REPLICAS:-1}
@@ -88,7 +87,7 @@ services:
       - web
 
   live:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-live:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-live:${APP_RELEASE:-stable}
     command: node live/dist/server.js live
     environment:
       <<: [*live-env]
@@ -101,7 +100,7 @@ services:
       - web
 
   api:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-backend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-stable}
     command: ./bin/docker-entrypoint-api.sh
     deploy:
       replicas: ${API_REPLICAS:-1}
@@ -117,7 +116,7 @@ services:
       - plane-mq
 
   worker:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-backend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-stable}
     command: ./bin/docker-entrypoint-worker.sh
     deploy:
       replicas: ${WORKER_REPLICAS:-1}
@@ -134,7 +133,7 @@ services:
       - plane-mq
 
   beat-worker:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-backend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-stable}
     command: ./bin/docker-entrypoint-beat.sh
     deploy:
       replicas: ${BEAT_WORKER_REPLICAS:-1}
@@ -151,7 +150,7 @@ services:
       - plane-mq
 
   migrator:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-backend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-stable}
     command: ./bin/docker-entrypoint-migrator.sh
     deploy:
       replicas: 1
@@ -213,7 +212,7 @@ services:
 
   # Comment this if you already have a reverse proxy running
   proxy:
-    image: ${DOCKERHUB_USER:-artifacts.plane.so/makeplane}/plane-proxy:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE:-stable}
     ports:
       - target: 80
         published: ${NGINX_PORT:-80}