diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml
index 7d23d172f37..103961ae77a 100644
--- a/.github/workflows/charts-release.yaml
+++ b/.github/workflows/charts-release.yaml
@@ -40,6 +40,12 @@ jobs:
           # Fix sh files to always be executable
           find . -name '*.sh' | xargs chmod +x
 
+      # Optional step if GPG signing is used
+      - name: Clean Questions
+        shell: bash
+        run: |
+          find ./helm -type f -name 'questions.yaml' -exec rm {} \;
+
       - name: Commit Helm Changes
         run: |
           rm -rf helm/charts