diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml
index eb4ca3c334..7772e1b7ab 100644
--- a/.github/workflows/helm-release.yaml
+++ b/.github/workflows/helm-release.yaml
@@ -1,11 +1,10 @@
 name: helm-package
 on:
   push:
-    branches:
-    - master
+    tags:
+    - "*"
     paths:
     - 'charts/kyverno/**'
-  pull_request:
 env:
   HELM_CHART_URL: "https://nirmata.github.io/kyverno/helm-charts/"
 
@@ -23,25 +22,25 @@ jobs:
         chmod 700 get_helm.sh
         ./get_helm.sh
         helm init --client-only
-#     - name: Check Chart Version
-#       run: |
-#         helm repo add evalsocket ${{ env.HELM_CHART_URL }}
-#         helm search nirmata/kyverno --version `cat charts/kyverno/Chart.yaml | grep '^version: [[:alnum:]]' | awk '{print $2}'` > HELM_CHART_STATUS.txt
-#         HELM_CHART_STATUS=`cat HELM_CHART_STATUS.txt`
-#         if [ "${HELM_CHART_STATUS}" != 'No results found' ]; then
-#           echo 'Version already exist, impossible to continue...'
-#           exit 1
-#         fi
+    - name: Check Chart Version
+      run: |
+        helm repo add evalsocket ${{ env.HELM_CHART_URL }} || (echo "Kyverno Repository not available")
+        helm search nirmata/kyverno --version `cat charts/kyverno/Chart.yaml | grep '^version: [[:alnum:]]' | awk '{print $2}'` > HELM_CHART_STATUS.txt
+        HELM_CHART_STATUS=`cat HELM_CHART_STATUS.txt`
+        if [ "${HELM_CHART_STATUS}" != 'No results found' ]; then
+          echo 'Version already exist, impossible to continue...'
+          exit 1
+        fi
     - name: Check sintax
       run: helm lint charts/kyverno/
     - name: Create package
       run: |
         mkdir -p output/helm-charts/
         helm package charts/kyverno/ -d output/helm-charts/
-    # - name: Reindex repo
-    #   run: |
-    #     wget --quiet ${{ env.HELM_CHART_URL }}/index.yaml
-    #     helm repo index --merge index.yaml --url ${{ env.HELM_CHART_URL }} output/helm-charts/
+    - name: Reindex repo
+      run: |
+        wget --quiet ${{ env.HELM_CHART_URL }}/index.yaml
+        helm repo index --merge index.yaml --url ${{ env.HELM_CHART_URL }} output/helm-charts/
     - name: Release
       uses: JamesIves/github-pages-deploy-action@releases/v3
       with: