diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index dbe932e..325e421 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -17,7 +17,6 @@ on:
 
 env:
   REGISTRY: qbit.realms.pub
-  IMAGE_PREFIX: realms
 
 jobs:
   build-all:
@@ -45,15 +44,15 @@ jobs:
         run: |
           echo "=== Building Backend ==="
           docker build \
-            -t ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/backend:${{ github.sha }} \
-            -t ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/backend:latest \
+            -t ${{ env.REGISTRY }}/${{ github.repository }}/backend:${{ github.sha }} \
+            -t ${{ env.REGISTRY }}/${{ github.repository }}/backend:latest \
             ./backend
 
       - name: Push Backend Image
         if: github.event_name == 'push'
         run: |
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/backend:${{ github.sha }}
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/backend:latest
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}/backend:${{ github.sha }}
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}/backend:latest
 
       # =========================================================================
       # Build Frontend (SvelteKit)
@@ -62,15 +61,15 @@ jobs:
         run: |
           echo "=== Building Frontend ==="
           docker build \
-            -t ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/frontend:${{ github.sha }} \
-            -t ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/frontend:latest \
+            -t ${{ env.REGISTRY }}/${{ github.repository }}/frontend:${{ github.sha }} \
+            -t ${{ env.REGISTRY }}/${{ github.repository }}/frontend:latest \
             ./frontend
 
       - name: Push Frontend Image
         if: github.event_name == 'push'
         run: |
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/frontend:${{ github.sha }}
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/frontend:latest
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}/frontend:${{ github.sha }}
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}/frontend:latest
 
       # =========================================================================
       # Build Chat Service
@@ -79,15 +78,15 @@ jobs:
         run: |
           echo "=== Building Chat Service ==="
           docker build \
-            -t ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/chat-service:${{ github.sha }} \
-            -t ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/chat-service:latest \
+            -t ${{ env.REGISTRY }}/${{ github.repository }}/chat-service:${{ github.sha }} \
+            -t ${{ env.REGISTRY }}/${{ github.repository }}/chat-service:latest \
             ./chat-service
 
       - name: Push Chat Service Image
         if: github.event_name == 'push'
         run: |
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/chat-service:${{ github.sha }}
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/chat-service:latest
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}/chat-service:${{ github.sha }}
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}/chat-service:latest
 
       # =========================================================================
       # Build OpenResty (Nginx + Lua)
@@ -96,12 +95,12 @@ jobs:
         run: |
           echo "=== Building OpenResty ==="
           docker build \
-            -t ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/openresty:${{ github.sha }} \
-            -t ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/openresty:latest \
+            -t ${{ env.REGISTRY }}/${{ github.repository }}/openresty:${{ github.sha }} \
+            -t ${{ env.REGISTRY }}/${{ github.repository }}/openresty:latest \
             ./openresty
 
       - name: Push OpenResty Image
         if: github.event_name == 'push'
         run: |
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/openresty:${{ github.sha }}
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/openresty:latest
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}/openresty:${{ github.sha }}
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}/openresty:latest
diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
index e1cdc52..2ea531d 100644
--- a/.forgejo/workflows/deploy.yml
+++ b/.forgejo/workflows/deploy.yml
@@ -17,7 +17,6 @@ on:
 
 env:
   REGISTRY: qbit.realms.pub
-  IMAGE_PREFIX: realms
 
 jobs:
   deploy:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index a93ca18..beb8759 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -59,7 +59,7 @@ services:
       - frontend
 
   drogon-backend:
-    image: qbit.realms.pub/realms/backend:latest
+    image: qbit.realms.pub/doomtube/beeta/backend:latest
     restart: unless-stopped
     depends_on:
       postgres:
@@ -91,7 +91,7 @@ services:
       - backend
 
   chat-service:
-    image: qbit.realms.pub/realms/chat-service:latest
+    image: qbit.realms.pub/doomtube/beeta/chat-service:latest
     restart: unless-stopped
     depends_on:
       redis:
@@ -154,7 +154,7 @@ services:
       - frontend
 
   openresty:
-    image: qbit.realms.pub/realms/openresty:latest
+    image: qbit.realms.pub/doomtube/beeta/openresty:latest
     restart: unless-stopped
     ports:
       - "80:80"
@@ -189,7 +189,7 @@ services:
       - backend
 
   sveltekit:
-    image: qbit.realms.pub/realms/frontend:latest
+    image: qbit.realms.pub/doomtube/beeta/frontend:latest
     restart: unless-stopped
     depends_on:
       openresty: