diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a8c1fdcae..d9e001913 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,6 @@ on:
 env:
   NODE_VERSION: 18.x
   GCP_REPO: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-web
-  DOCKERHUB_REPO: sheltertechsf/askdarcel-web
 
 jobs:
   lint:
@@ -119,25 +118,19 @@ jobs:
         with:
           credentials_json: ${{ secrets.GCP_SA_KEY }}
 
-      # Login to both registries
+      # Login to GCP Artifact Registry
       - uses: docker/login-action@v3
         with:
           registry: us-west2-docker.pkg.dev
           username: _json_key
           password: ${{ secrets.GCP_SA_KEY }}
 
-      - uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      # Build and push to both registries
+      # Build and push
       - uses: docker/build-push-action@v6
         with:
           push: true
           context: .
           tags: |
             ${{ env.GCP_REPO }}:latest
-            ${{ env.DOCKERHUB_REPO }}:latest
 
       - run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/publish-qa.yml b/.github/workflows/publish-qa.yml
index dded886ae..bbd36ecf2 100644
--- a/.github/workflows/publish-qa.yml
+++ b/.github/workflows/publish-qa.yml
@@ -9,7 +9,6 @@ on:
 env:
   NODE_VERSION: 18.x
   GCP_REPO: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-web
-  DOCKERHUB_REPO: sheltertechsf/askdarcel-web
 
 jobs:
   build:
@@ -44,25 +43,19 @@ jobs:
         with:
           credentials_json: ${{ secrets.GCP_SA_KEY }}
 
-      # Login to both registries
+      # Login to GCP Artifact Registry
       - uses: docker/login-action@v3
         with:
           registry: us-west2-docker.pkg.dev
           username: _json_key
           password: ${{ secrets.GCP_SA_KEY }}
 
-      - uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      # Build and push to both registries
+      # Build and push
       - uses: docker/build-push-action@v6
         with:
           push: true
           context: .
           tags: |
             ${{ env.GCP_REPO }}:qa-one
-            ${{ env.DOCKERHUB_REPO }}:qa-one
 
       - run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index e152aed90..b005bae35 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -8,7 +8,6 @@ on:
 env:
   NODE_VERSION: 18.x
   GCP_REPO: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-web
-  DOCKERHUB_REPO: sheltertechsf/askdarcel-web
 
 jobs:
   build:
@@ -38,7 +37,7 @@ jobs:
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
 
-      # Create metadata for both registries
+      # Create image metadata
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -49,7 +48,6 @@ jobs:
             suffix=
           images: |
             ${{ env.GCP_REPO }}
-            ${{ env.DOCKERHUB_REPO }}
           tags: |
             type=semver,pattern={{version}}
 
@@ -58,19 +56,14 @@ jobs:
         with:
           credentials_json: ${{ secrets.GCP_SA_KEY }}
 
-      # Login to both registries
+      # Login to GCP Artifact Registry
       - uses: docker/login-action@v3
         with:
           registry: us-west2-docker.pkg.dev
           username: _json_key
           password: ${{ secrets.GCP_SA_KEY }}
 
-      - uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      # Build and push to both registries
+      # Build and push
       - uses: docker/build-push-action@v6
         with:
           push: true
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 8b1788732..6a4ad6ba3 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -17,7 +17,7 @@ services:
       retries: 5
 
   api:
-    image: sheltertechsf/askdarcel-api:latest
+    image: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/askdarcel-api:latest
     networks: [askdarcel]
     ports: ["3000:3000"]
     depends_on: [db]
@@ -33,7 +33,7 @@ services:
       # ALGOLIA_INDEX_PREFIX:
 
   api-go:
-    image: sheltertechsf/sheltertech-go:latest
+    image: us-west2-docker.pkg.dev/askdarcel-184805/sheltertech/sheltertech-go:latest
     networks: [askdarcel]
     ports: ["3001:3001"]
     depends_on: