diff --git a/hack/demo.sh b/hack/demo.sh
index 74a32851..6edc2573 100755
--- a/hack/demo.sh
+++ b/hack/demo.sh
@@ -9,11 +9,11 @@ CURRENT_DIR="$(readlink -f "$0")"
 SCRIPT_DIR="$(dirname "${CURRENT_DIR}")"
 
 SUFFIX="e2e$(date +'%d%H%M%S')"
-echo "using suffix: $SUFFIX"
+echo "using suffix: ${SUFFIX}"
 
 # build and install toolchain
-( "$SCRIPT_DIR/toolchain_build_push.sh" "$SUFFIX" )
-( "$SCRIPT_DIR/toolchain_install.sh" "$SUFFIX" )
+( "${SCRIPT_DIR}/toolchain_build_push.sh" "${SUFFIX}" )
+( "${SCRIPT_DIR}/toolchain_install.sh" "${SUFFIX}" )
 
 # build and install workspaces
-( "$SCRIPT_DIR/workspaces_install.sh" && make -C e2e test )
+( "${SCRIPT_DIR}/workspaces_install.sh" && make -C e2e test )
diff --git a/hack/toolchain_build_push.sh b/hack/toolchain_build_push.sh
index c9ae776f..b7d92c46 100755
--- a/hack/toolchain_build_push.sh
+++ b/hack/toolchain_build_push.sh
@@ -11,7 +11,7 @@ export QUAY_NAMESPACE=${QUAY_NAMESPACE:-konflux-workspaces}
 
 # create a temporary direction
 f=$(mktemp --directory /tmp/toolchain.XXXX)
-cd "$f"
+cd "${f}"
 
 # checkout
 git clone --depth 2 https://github.com/codeready-toolchain/member-operator.git
@@ -24,8 +24,8 @@ git clone --depth 1 --branch "${BRANCH}" https://github.com/filariow/toolchain-e
 # build and publish images
 make -C member-operator run-cicd-script \
   SCRIPT_PATH=scripts/ci/manage-member-operator.sh \
-  SCRIPT_PARAMS="-po true -io false -mn toolchain-member-operator -qn $QUAY_NAMESPACE -ds $TAG -dl false -mr ./"
+  SCRIPT_PARAMS="-po true -io false -mn toolchain-member-operator -qn ${QUAY_NAMESPACE} -ds ${TAG} -dl false -mr ./"
 
 make -C host-operator run-cicd-script \
   SCRIPT_PATH=scripts/ci/manage-host-operator.sh \
-  SCRIPT_PARAMS="-po true -io false -hn toolchain-host-operator -qn $QUAY_NAMESPACE -ds $TAG -dl false -hr ./ -rr ../registration-service"
+  SCRIPT_PARAMS="-po true -io false -hn toolchain-host-operator -qn ${QUAY_NAMESPACE} -ds ${TAG} -dl false -hr ./ -rr ../registration-service"
diff --git a/hack/toolchain_install.sh b/hack/toolchain_install.sh
index 6ecd4665..d2a5c1ca 100755
--- a/hack/toolchain_install.sh
+++ b/hack/toolchain_install.sh
@@ -9,7 +9,7 @@ TAG=${1:-e2etest}
 
 # create a temporary direction
 f=$(mktemp --directory /tmp/toolchain.XXXX)
-cd "$f"
+cd "${f}"
 
 # checkout
 git clone --depth 2 https://github.com/codeready-toolchain/member-operator.git
@@ -26,9 +26,9 @@ git clone --depth 2 --branch "${BRANCH}" https://github.com/filariow/registratio
   kubectl create namespace toolchain-member-operator --dry-run=client --output=yaml | \
     kubectl apply -f -
 
-  cd "$f/toolchain-e2e"
+  cd "${f}/toolchain-e2e"
 
-  make dev-deploy-e2e-local PUBLISH_OPERATOR=false DATE_SUFFIX="$TAG" DEPLOY_LATEST=false
+  make dev-deploy-e2e-local PUBLISH_OPERATOR=false DATE_SUFFIX="${TAG}" DEPLOY_LATEST=false
 )
 
 # patch configuration