diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index aa9d2c678..000a0ac2f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -40,4 +40,4 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          ./hack/create-release.sh --version ${{ github.ref_name }}
+          ./hack/create-release.sh ${{ github.ref_name }}
diff --git a/RELEASE.md b/RELEASE.md
index a7850530c..066b3b599 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -30,7 +30,7 @@ The device plugin consists in two artifacts:
       ```
     - Create the draft release by running:
       ```bash
-      ./hack/create-release.sh --version {{ .VERSION }}
+      ./hack/create-release.sh {{ .VERSION }}
       ```
 - If the `Publish Helm Chart` GitHub Action fails:
     - Check the logs for the error.
diff --git a/hack/update-helm-index.sh b/hack/update-helm-index.sh
index 674369033..de8d80e12 100755
--- a/hack/update-helm-index.sh
+++ b/hack/update-helm-index.sh
@@ -54,12 +54,15 @@ while [[ $# -gt 0 ]]; do
 		--help/h) usage
 			exit 0
 			;;
+		*)
+			break
+			;;
 	esac
 done
 
 
-if [ -z "${HELM_REPO_PATH}" ]; then
-	if [ -z "${VERSION}" ]; then
+if [[ -z "${HELM_REPO_PATH}" ]]; then
+	if [[ -z "${VERSION}" ]]; then
 		echo "Either helm repo path or version must be specified"
 		usage
 		exit 1
@@ -69,8 +72,8 @@ if [ -z "${HELM_REPO_PATH}" ]; then
 fi
 
 
-if [ -n ${VERSION} ]; then
-	if [ $# -gt 0 ]; then
+if [[ -n "${VERSION}" ]]; then
+	if [[ $# -gt 0 ]]; then
 		echo "If a version is specified, then no assets should be specified"
 		usage
 		exit 1