diff --git a/.github/workflows/push-image.yaml b/.github/workflows/push-image.yaml
index 3d7ff90..995ae1c 100644
--- a/.github/workflows/push-image.yaml
+++ b/.github/workflows/push-image.yaml
@@ -6,7 +6,8 @@ on:
       - main
 
 env:
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME_1: automatic-dns-failover 
+  IMAGE_NAME_2: custom-nginx
   IMAGE_REGISTRY: ghcr.io
   REGISTRY_USER: ${{ github.actor }}
   REGISTRY_PASSWORD: ${{ github.token }}
@@ -29,11 +30,17 @@ jobs:
           username: ${{ env.REGISTRY_USER }}
           password: ${{ env.REGISTRY_PASSWORD }}
 
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
+      - name: Extract metadata (tags, labels) for automatic-dns-failover Docker image
+        id: meta1
         uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e
         with:
-          images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME_1 }}
+
+      - name: Extract metadata (tags, labels) for custom-nginx Docker image
+        id: meta2
+        uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e
+        with:
+          images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME_2 }}
 
       - name: Build and push automatic-dns-failover image
         uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
@@ -42,13 +49,13 @@ jobs:
           push: true
           build-args: |
             DOCKER_METADATA_OUTPUT_JSON
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: latest
+          labels: ${{ steps.meta1.outputs.labels }}
 
       - name: Build and push custom-nginx image
         uses: docker/build-push-action@91df6b874e498451163feb47610c87c4a218c1ee
         with:
           context: ./nginx
           push: true
-          tags: ${{ env.IMAGE_REGISTRY }}/${{ github.repository }}/custom-nginx:latest
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          tags: latest
+          labels: ${{ steps.meta2.outputs.labels }}
\ No newline at end of file