diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 756216b..4cba4b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,26 +1,47 @@
 name: Release Charts
 
 on:
+  workflow_dispatch:
   push:
     branches:
-      - master
+    - master
+    paths:
+    - "chart/**"
 
 jobs:
+  pre-release:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+    - name: Block concurrent releases
+      uses: softprops/turnstyle@v1
+      with:
+        continue-after-seconds: 180
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   release:
+    needs: pre-release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v1
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Configure Git
+      run: |
+        git config user.name "$GITHUB_ACTOR"
+        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
-      - name: Configure Git
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+    - name: Install Helm
+      uses: azure/setup-helm@v1
+      with:
+        version: v3.4.0
 
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.0.0
-        with:
+    - name: Run chart-releaser
+      uses: helm/chart-releaser-action@v1.2.0
+      with:
           charts_dir: chart
-        env:
-          CR_TOKEN: "${{ secrets.CR_TOKEN }}"
-          
+      env:
+        CR_TOKEN: "${{ secrets.CR_TOKEN }}"