diff --git a/.github/workflows/dev-docker.yml b/.github/workflows/dev-docker.yml
index a0545d93d9..93072f24a2 100644
--- a/.github/workflows/dev-docker.yml
+++ b/.github/workflows/dev-docker.yml
@@ -46,7 +46,7 @@ jobs:
           file: stacks/flow-api.Dockerfile
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: |
-            ghcr.io/peerdb-io/peerdb-flow-api:dev
+            ghcr.io/peerdb-io/flow-api:dev
 
       - name: Build (optionally publish) Flow Worker Dev Image
         uses: depot/build-push-action@v1
@@ -56,4 +56,4 @@ jobs:
           file: stacks/flow-worker.Dockerfile
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: |
-            ghcr.io/peerdb-io/peerdb-flow-worker:dev
+            ghcr.io/peerdb-io/flow-worker:dev
diff --git a/.github/workflows/stable-docker.yml b/.github/workflows/stable-docker.yml
index 0e5658e472..155696209f 100644
--- a/.github/workflows/stable-docker.yml
+++ b/.github/workflows/stable-docker.yml
@@ -43,7 +43,7 @@ jobs:
           file: stacks/flow-api.Dockerfile
           push: true
           tags: |
-            ghcr.io/peerdb-io/peerdb-flow-api:${{ github.ref_name }}
+            ghcr.io/peerdb-io/flow-api:${{ github.ref_name }}
 
       - name: Publish Flow Worker Stable Image
         uses: depot/build-push-action@v1
@@ -52,4 +52,4 @@ jobs:
           file: stacks/flow-worker.Dockerfile
           push: true
           tags: |
-            ghcr.io/peerdb-io/peerdb-flow-worker:${{ github.ref_name }}
+            ghcr.io/peerdb-io/flow-worker:${{ github.ref_name }}