diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 7618849f48..e05c8696e4 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -156,8 +156,6 @@
 ./pkg/kubectl/cmd/edit/testdata/record_testcase.sh
 ./pkg/util/verify-util-pkg.sh
 ./plugin/pkg/admission/imagepolicy/gencerts.sh
-./staging/src/k8s.io/csi-api/hack/update-codegen.sh
-./staging/src/k8s.io/csi-api/hack/verify-codegen.sh
 ./staging/src/k8s.io/kube-aggregator/hack/build-image.sh
 ./staging/src/k8s.io/kube-aggregator/hack/local-up-kube-aggregator.sh
 ./staging/src/k8s.io/kube-aggregator/hack/register-all-apis-from.sh
diff --git a/staging/src/k8s.io/csi-api/hack/update-codegen.sh b/staging/src/k8s.io/csi-api/hack/update-codegen.sh
index 106cf6ed92..f36b7fff97 100755
--- a/staging/src/k8s.io/csi-api/hack/update-codegen.sh
+++ b/staging/src/k8s.io/csi-api/hack/update-codegen.sh
@@ -18,15 +18,15 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
-CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
 
 # generate the code with:
 # --output-base    because this script should also be able to run inside the vendor dir of
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
-${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
+"${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \
   k8s.io/csi-api/pkg/client k8s.io/csi-api/pkg/apis \
   csi:v1alpha1 \
-  --output-base "$(dirname ${BASH_SOURCE})/../../.." \
-  --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
+  --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
+  --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
diff --git a/staging/src/k8s.io/csi-api/hack/verify-codegen.sh b/staging/src/k8s.io/csi-api/hack/verify-codegen.sh
index 8be07ea160..08318721bf 100755
--- a/staging/src/k8s.io/csi-api/hack/verify-codegen.sh
+++ b/staging/src/k8s.io/csi-api/hack/verify-codegen.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 DIFFROOT="${SCRIPT_ROOT}/pkg"
 TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"