diff --git a/.github/workflows/release.yml b/.github/workflows/go-release.yml
similarity index 100%
rename from .github/workflows/release.yml
rename to .github/workflows/go-release.yml
diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
new file mode 100644
index 00000000..60d27d04
--- /dev/null
+++ b/.github/workflows/helm-release.yml
@@ -0,0 +1,30 @@
+name: Helm Chart Release
+
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - 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: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.8.0
+
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.3.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 1d3c7373..b8ca6a0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
-ARG DISTROLESS_IMAGE "gcr.io/distroless/static:nonroot"
-
 # Switch to distroless as minimal base image to package the capi2argo-cluster-operator binary
-FROM "${DISTROLESS_IMAGE}"
+FROM "gcr.io/distroless/static:nonroot"
 WORKDIR /
 COPY bin/capi2argo-cluster-operator .
 USER 65532:65532