diff --git a/.github/workflows/release-charts.yaml b/.github/workflows/release-charts.yaml
index cf6738b1a9..0bd4fa5989 100644
--- a/.github/workflows/release-charts.yaml
+++ b/.github/workflows/release-charts.yaml
@@ -16,7 +16,7 @@ jobs:
   push-retina-charts:
     name: Publish Retina Helm Charts
     runs-on: ubuntu-latest
-
+    if: github.ref_type == 'tag'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/release-images.yaml b/.github/workflows/release-images.yaml
index fad3c2f257..0ad731c018 100644
--- a/.github/workflows/release-images.yaml
+++ b/.github/workflows/release-images.yaml
@@ -99,12 +99,10 @@ jobs:
 
       - name: Sign container image
         run: |
-          for year in 2019 2022; do
-            for image in retina-agent ; do
-              IMAGE_PATH="ghcr.io/${{ github.repository }}/$image:$TAG-windows-ltsc$year-${{ matrix.arch }}"
-              DIGEST=$(jq -r '.["containerimage.digest"]' image-metadata-$image-$TAG-windows-ltsc$year-${{ matrix.arch }}.json) 
-              cosign sign --yes ${IMAGE_PATH}@${DIGEST} 
-            done
+          for image in retina-agent ; do
+            IMAGE_PATH="ghcr.io/${{ github.repository }}/$image:$TAG-windows-ltsc${{ matrix.year }}-${{ matrix.arch }}"
+            DIGEST=$(jq -r '.["containerimage.digest"]' image-metadata-$image-$TAG-windows-ltsc${{ matrix.year }}-${{ matrix.arch }}.json) 
+            cosign sign --yes ${IMAGE_PATH}@${DIGEST}
           done
 
   operator-images: