diff --git a/.github/workflows/gitops.yaml b/.github/workflows/gitops.yaml
index c3b9db77..4fb7504e 100644
--- a/.github/workflows/gitops.yaml
+++ b/.github/workflows/gitops.yaml
@@ -66,7 +66,7 @@ jobs:
           context: ./services/${{ matrix.service }}
           push: true
           tags: |
-            z1yoon/nshm-${{ matrix.service }}:${{ github.sha }}
+            z1yoon/nshm-${{ matrix.service }}:${{ matrix.service }}-${{ github.sha }}
             z1yoon/nshm-${{ matrix.service }}:latest
           build-args: |
             NEXT_PUBLIC_API_BASE_URL=${{ secrets.NEXT_PUBLIC_API_BASE_URL }}
@@ -86,7 +86,7 @@ jobs:
       - name: Update Image Tag Values
         run: |
           chart_dir="helm/nshm"
-          new_image_tag=${{ github.sha }}
+          new_image_tag=${{ matrix.service }}-${{ github.sha }}
           sed -i "/z1yoon\/nshm-${{ matrix.service }}/{n;s/tag: .*/tag: $new_image_tag/;}" $chart_dir/values.yaml
           cat $chart_dir/values.yaml
 
diff --git a/services/item/test b/services/account/test
similarity index 100%
rename from services/item/test
rename to services/account/test
diff --git a/services/notification/test b/services/web/test
similarity index 100%
rename from services/notification/test
rename to services/web/test
diff --git a/services/transaction/test b/services/wishlist/test
similarity index 100%
rename from services/transaction/test
rename to services/wishlist/test