diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index edaede6..8a70fe8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/xpeditis-backend:preprod
+          images: ${{ env.REGISTRY }}/xpeditis-backend
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -72,8 +72,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/backend:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/backend:buildcache,mode=max
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/xpeditis-backend:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/xpeditis-backend:buildcache,mode=max
           platforms: linux/amd64
 
   # ============================================
@@ -127,7 +127,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/xpeditis-frontend:preprod
+          images: ${{ env.REGISTRY }}/xpeditis-frontend
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -144,8 +144,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/frontend:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/frontend:buildcache,mode=max
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/xpeditis-frontend:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/xpeditis-frontend:buildcache,mode=max
           platforms: linux/amd64
           build-args: |
             NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL || 'http://localhost:4000' }}