diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8c546ada..eb555654 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -38,8 +38,9 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: approver-policy-${{ env.VERSION }}.tgz
+          name: ${{ needs.release.outputs.RELEASE_HELM_CHART_NAME }}-${{ needs.release.outputs.RELEASE_HELM_CHART_VERSION }}.tgz
           path: ${{ steps.release.outputs.RELEASE_HELM_CHART_TAR }}
+          if-no-files-found: error
 
     outputs:
       RELEASE_OCI_MANAGER_IMAGE: ${{ steps.release.outputs.RELEASE_OCI_MANAGER_IMAGE }}
diff --git a/make/02_mod.mk b/make/02_mod.mk
index 33e66d1a..c0485b08 100644
--- a/make/02_mod.mk
+++ b/make/02_mod.mk
@@ -32,7 +32,7 @@ include make/test-unit.mk
 .PHONY: release
 ## Publish all release artifacts (image + helm chart)
 ## @category [shared] Release
-release: | $(NEEDS_CRANE)
+release: helm-chart | $(NEEDS_CRANE)
 	$(MAKE) oci-push-manager
 
 	@echo "RELEASE_OCI_MANAGER_IMAGE=$(oci_manager_image_name)" >> "$(GITHUB_OUTPUT)"