diff --git a/.github/workflows/dockerize.yml b/.github/workflows/dockerize.yml
index 10da3b13..0bd3a7e9 100644
--- a/.github/workflows/dockerize.yml
+++ b/.github/workflows/dockerize.yml
@@ -128,7 +128,7 @@ jobs:
           file: computer.Dockerfile
           push: true
           tags: |
-            ghcr.io/computer:${{ env.DOCKER_IMAGE_TAG }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
+            ghcr.io/${{ github.repository }}-computer:${{ env.DOCKER_IMAGE_TAG }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
           cache-from: type=gha,scope=computer-${{ matrix.platform }}
           cache-to: type=gha,mode=max,scope=computer-${{ matrix.platform }}
           labels: |
diff --git a/docker-compose.yml b/docker-compose.yml
index 934ee9ac..a604a788 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
   # Creates Computer for Khoj to use.
   # Set KHOJ_OPERATOR_ENABLED=True in the server service environment variable to enable.
   computer:
-    image: ghcr.io/khoj-ai/computer:latest
+    image: ghcr.io/khoj-ai/khoj-computer:latest
     ports:
       - "5900:5900"
     volumes: