diff --git a/.github/workflows/on_push_to_main.yaml b/.github/workflows/on_push_to_main.yaml
index e44b6820..ec9893ba 100644
--- a/.github/workflows/on_push_to_main.yaml
+++ b/.github/workflows/on_push_to_main.yaml
@@ -90,3 +90,29 @@ jobs:
           suffixes: |
             -linux-amd64
 #            -linux-arm64
+
+  release-helm:
+    runs-on: ubuntu-22.04
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: checkout the source code
+        uses: actions/checkout@v3
+
+      - uses: wistia/parse-tool-versions@v1.0
+
+      - uses: earthly/actions-setup@v1
+        with: { version: "v${{ env.EARTHLY_TOOL_VERSION }}" }
+
+      - name: Build and push the Docker image
+        run: |
+          earthly \
+            --push \
+            +release-helm \
+              --HELM_VERSION ${{ env.HELM_VERSION }} \
+              --CHART_RELEASER_VERSION ${{ env.HELM-CR_TOOL_VERSION }} \
+              --repo_owner ${{ github.repository_owner }} \
+              --token ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/on_release_published.yaml b/.github/workflows/on_release_published.yaml
index 5c019125..4d537ceb 100644
--- a/.github/workflows/on_release_published.yaml
+++ b/.github/workflows/on_release_published.yaml
@@ -6,29 +6,6 @@ on:
     types: [published]
 
 jobs:
-  release-helm:
-    runs-on: ubuntu-22.04
-
-    permissions:
-      contents: write
-
-    steps:
-      - name: checkout the source code
-        uses: actions/checkout@v3
-
-      - uses: wistia/parse-tool-versions@v1.0
-
-      - uses: earthly/actions-setup@v1
-        with: { version: "v${{ env.EARTHLY_TOOL_VERSION }}" }
-
-      - name: Build and push the Docker image
-        run: |
-          earthly \
-            --push \
-            +release-helm \
-              --repo_owner ${{ github.repository_owner }} \
-              --token ${{ secrets.GITHUB_TOKEN }}
-
   release-docker:
     runs-on: ubuntu-22.04
 
diff --git a/.tool-versions b/.tool-versions
index d7b8ebc1..979531c6 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,6 +1,7 @@
-earthly 0.7.14
+earthly 0.7.22
 golang 1.19.11
 helm 3.12.2
+helm-cr 1.6.1
 helm-ct 3.8.0
 kubeconform 0.6.3
 kustomize 5.1.0