diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml
index 6d21747..2f31bae 100644
--- a/.github/workflows/lint-and-test.yaml
+++ b/.github/workflows/lint-and-test.yaml
@@ -40,7 +40,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
 
       - name: Set up chart test CLI
         uses: helm/chart-testing-action@v2.1.0
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 708654d..d201f81 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -31,11 +31,8 @@ jobs:
           helm repo add bitnami https://charts.bitnami.com/bitnami
 
       - name: Run chart-releaser
-        # Fork of helm/chart-releaser-action to avoid unwanted release attempts.
-        # Upstream PR: https://github.com/helm/chart-releaser-action/pull/80
-        uses: florisvdg/chart-releaser-action@v1.3.0
+        uses: helm/chart-releaser-action@v1.6.0
         with:
           charts_dir: charts
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          HELM_EXPERIMENTAL_OCI: 1