diff --git a/.github/workflows/chart-build.yaml b/.github/workflows/chart-build.yaml
index da97705..a7d76a9 100644
--- a/.github/workflows/chart-build.yaml
+++ b/.github/workflows/chart-build.yaml
@@ -86,6 +86,7 @@ jobs:
       - name: Push chart to GHCR
         run: |
           version=$(yq eval ".version" charts/${{ matrix.chart }}/Chart.yaml)
-          echo "Pushing chart ${{ matrix.chart }} with version $version-${{ github.head_ref }}.${GITHUB_SHA::7}"
-          helm package charts/${{ matrix.chart }} --version "$version-${{ github.head_ref }}.${GITHUB_SHA::7}"
-          helm push "${{ matrix.chart }}-$version-${{ github.head_ref }}.${GITHUB_SHA::7}.tgz" "oci://ghcr.io/${{ github.repository }}"
+          branchName=$(echo "${{ github.head_ref }}" | tr '/' '-' | tr '.' '-')
+          echo "Pushing chart ${{ matrix.chart }} with version $version-$branchName.${GITHUB_SHA::7}"
+          helm package charts/${{ matrix.chart }} --version "$version-$branchName.${GITHUB_SHA::7}"
+          helm push "${{ matrix.chart }}-$version-$branchName.${GITHUB_SHA::7}.tgz" "oci://ghcr.io/${{ github.repository }}"
diff --git a/charts/adguard/Chart.yaml b/charts/adguard/Chart.yaml
index 8572633..ce989ca 100644
--- a/charts/adguard/Chart.yaml
+++ b/charts/adguard/Chart.yaml
@@ -1,3 +1,3 @@
 apiVersion: v2
 name: adguard
-version: 3.0.1
+version: 3.0.2
diff --git a/charts/adguard/values.yaml b/charts/adguard/values.yaml
index c771d57..d28a6c3 100644
--- a/charts/adguard/values.yaml
+++ b/charts/adguard/values.yaml
@@ -55,7 +55,7 @@ secretInit:
   image:
     registry: docker.io
     repository: bitnami/kubectl
-    tag: 1.30.4
+    tag: 1.31.0
 
   primary:
     create: false