diff --git a/.gitea/workflows/new-deploy.yml b/.gitea/workflows/new-deploy.yml
index 6c93c66..af7e30a 100644
--- a/.gitea/workflows/new-deploy.yml
+++ b/.gitea/workflows/new-deploy.yml
@@ -70,10 +70,30 @@ jobs:
           docker push $REGISTRY/frontend:${{ github.sha }}
           docker push $REGISTRY/frontend:${{ env.IMAGE_TAG }} 
 
-  deploy:
+  verify-images:
     needs: build
     runs-on: ubuntu-latest
 
+    steps:
+      - name: Docker login
+        run: |
+          echo "${{ secrets.REGISTRY_PASS }}" | docker login $REGISTRY \
+            -u "${{ secrets.REGISTRY_USER }}" --password-stdin
+
+      - name: Verify backend image tags exist
+        run: |
+          docker manifest inspect $REGISTRY/backend:${{ github.sha }} >/dev/null
+          docker manifest inspect $REGISTRY/backend:${{ env.IMAGE_TAG }} >/dev/null
+
+      - name: Verify frontend image tags exist
+        run: |
+          docker manifest inspect $REGISTRY/frontend:${{ github.sha }} >/dev/null
+          docker manifest inspect $REGISTRY/frontend:${{ env.IMAGE_TAG }} >/dev/null
+
+  deploy:
+    needs: verify-images
+    runs-on: ubuntu-latest
+
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
@@ -118,9 +138,9 @@ jobs:
           echo "Deployment job finished with status: $STATUS"
 
           if [ "$STATUS" = "success" ]; then
-            MSG="🚀 Costco App Deployment succeeded: $IMAGE_NAME:${{ github.sha }}"
+            MSG="🚀 Grocery App Deployment succeeded: $IMAGE_NAME:${{ github.sha }}"
           else
-            MSG="❌ Costco App Deployment FAILED: $IMAGE_NAME:${{ github.sha }}"
+            MSG="❌ Grocery App Deployment FAILED: $IMAGE_NAME:${{ github.sha }}"
           fi
 
           curl -d "$MSG" \