diff --git a/ci-operator/step-registry/baremetalds/devscripts/conf/compact/baremetalds-devscripts-conf-compact-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/conf/compact/baremetalds-devscripts-conf-compact-commands.sh
index 2956f58770995..68d9d364dfb89 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/conf/compact/baremetalds-devscripts-conf-compact-commands.sh
+++ b/ci-operator/step-registry/baremetalds/devscripts/conf/compact/baremetalds-devscripts-conf-compact-commands.sh
@@ -6,4 +6,4 @@ set -o pipefail
 
 echo "************ baremetalds devscripts conf compact command ************"
 
-echo "export NUM_WORKERS=0" >> ${SHARED_DIR}/dev-scripts-additional-config
+echo "export NUM_WORKERS=0" >> "${SHARED_DIR}/dev-scripts-additional-config"
diff --git a/ci-operator/step-registry/baremetalds/devscripts/conf/dualstack/baremetalds-devscripts-conf-dualstack-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/conf/dualstack/baremetalds-devscripts-conf-dualstack-commands.sh
index 783deda4b0cc4..d5042d936d477 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/conf/dualstack/baremetalds-devscripts-conf-dualstack-commands.sh
+++ b/ci-operator/step-registry/baremetalds/devscripts/conf/dualstack/baremetalds-devscripts-conf-dualstack-commands.sh
@@ -6,11 +6,4 @@ set -o pipefail
 
 echo "************ baremetalds devscripts conf dualstack command ************"
 
-echo "export IP_STACK=v4v6" >> ${SHARED_DIR}/dev-scripts-additional-config
-
-
-
-
-
-
-
+echo "export IP_STACK=v4v6" >> "${SHARED_DIR}/dev-scripts-additional-config"
diff --git a/ci-operator/step-registry/baremetalds/devscripts/conf/ipv4/baremetalds-devscripts-conf-ipv4-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/conf/ipv4/baremetalds-devscripts-conf-ipv4-commands.sh
index 6d604348a6d62..c5ee32987be22 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/conf/ipv4/baremetalds-devscripts-conf-ipv4-commands.sh
+++ b/ci-operator/step-registry/baremetalds/devscripts/conf/ipv4/baremetalds-devscripts-conf-ipv4-commands.sh
@@ -6,4 +6,4 @@ set -o pipefail
 
 echo "************ baremetalds devscripts conf ipv4 command ************"
 
-echo "export IP_STACK=v4" >> ${SHARED_DIR}/dev-scripts-additional-config
+echo "export IP_STACK=v4" >> "${SHARED_DIR}/dev-scripts-additional-config"
diff --git a/ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh
index 9f18ea65c2f46..dc74bf036ce27 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh
+++ b/ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh
@@ -7,7 +7,7 @@ set -o pipefail
 echo "************ baremetalds gather command ************"
 
 # TODO: Remove once OpenShift CI will be upgraded to 4.2 (see https://access.redhat.com/articles/4859371)
-${HOME}/fix_uid.sh
+~/fix_uid.sh
 
 # Initial check
 if [ "${CLUSTER_TYPE}" != "packet" ] ; then
@@ -15,26 +15,26 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then
     exit 1
 fi
 
-if [[ ! -e ${SHARED_DIR}/server-ip ]]
+if [[ ! -e "${SHARED_DIR}/server-ip" ]]
 then
   echo "No server IP found; skipping log gathering."
   exit 0
 fi
 
 # Fetch packet server IP
-IP=$(cat ${SHARED_DIR}/server-ip)
-SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${CLUSTER_PROFILE_DIR}/.packet-kni-ssh-privatekey"
+IP=$(cat "${SHARED_DIR}/server-ip")
+SSHOPTS=(-o 'ConnectTimeout=5' -o 'StrictHostKeyChecking=no' -o 'UserKnownHostsFile=/dev/null' -o 'ServerAliveInterval=90' -i "${CLUSTER_PROFILE_DIR}/.packet-kni-ssh-privatekey")
 
 function getlogs() {
   echo "### Downloading logs..."
-  scp $SSHOPTS root@$IP:/tmp/artifacts/\*.tar\* ${ARTIFACT_DIR}
+  scp "${SSHOPTS[@]}" "root@${IP}:/tmp/artifacts/*.tar*" "${ARTIFACT_DIR}"
 }
 
 # Gather logs regardless of what happens after this
 trap getlogs EXIT
 
 echo "### Gathering logs..."
-timeout -s 9 15m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g'
+timeout -s 9 15m ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g'
 cd dev-scripts
 
 # Get install-gather, if there is one
diff --git a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
index 849d8dee036d4..806f57e6560e3 100644
--- a/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
+++ b/ci-operator/step-registry/baremetalds/devscripts/setup/baremetalds-devscripts-setup-commands.sh
@@ -7,7 +7,7 @@ set -o pipefail
 echo "************ baremetalds devscripts setup command ************"
 
 # TODO: Remove once OpenShift CI will be upgraded to 4.2 (see https://access.redhat.com/articles/4859371)
-${HOME}/fix_uid.sh
+~/fix_uid.sh
 
 # Initial check
 if [ "${CLUSTER_TYPE}" != "packet" ] ; then
@@ -16,14 +16,14 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then
 fi
 
 # Fetch packet server IP
-IP=$(cat ${SHARED_DIR}/server-ip)
+IP=$(cat "${SHARED_DIR}/server-ip")
 
-SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${CLUSTER_PROFILE_DIR}/.packet-kni-ssh-privatekey"
+SSHOPTS=(-o 'ConnectTimeout=5' -o 'StrictHostKeyChecking=no' -o 'UserKnownHostsFile=/dev/null' -o 'ServerAliveInterval=90' -i "${CLUSTER_PROFILE_DIR}/.packet-kni-ssh-privatekey")
 
 # Checkout dev-scripts and make
 for x in $(seq 10) ; do
-    test $x == 10 && exit 1
-    ssh $SSHOPTS root@$IP hostname && break
+    test "$x" -eq 10 && exit 1
+    ssh "${SSHOPTS[@]}" "root@${IP}" hostname && break
     sleep 10
 done
 
@@ -34,23 +34,23 @@ finished()
 
   # Get dev-scripts logs
   echo "dev-scripts setup completed, fetching logs"
-  ssh $SSHOPTS root@$IP tar -czf - /root/dev-scripts/logs | tar -C ${ARTIFACT_DIR} -xzf -
-  sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' ${ARTIFACT_DIR}/root/dev-scripts/logs/*
+  ssh "${SSHOPTS[@]}" "root@${IP}" tar -czf - /root/dev-scripts/logs | tar -C "${ARTIFACT_DIR}" -xzf -
+  sed -i -e 's/.*auths.*/*** PULL_SECRET ***/g' "${ARTIFACT_DIR}"/root/dev-scripts/logs/*
 }
 trap finished EXIT TERM
 
 # Copy dev-scripts source from current directory to the remote server
-tar -czf - . | ssh $SSHOPTS root@$IP "cat > /root/dev-scripts.tar.gz"
+tar -czf - . | ssh "${SSHOPTS[@]}" "root@${IP}" "cat > /root/dev-scripts.tar.gz"
 
 # Prepare configuration and run dev-scripts
-scp $SSHOPTS ${CLUSTER_PROFILE_DIR}/pull-secret root@$IP:pull-secret
+scp "${SSHOPTS[@]}" "${CLUSTER_PROFILE_DIR}/pull-secret" "root@${IP}:pull-secret"
 
-if [[ -e ${SHARED_DIR}/dev-scripts-additional-config ]]
+if [[ -e "${SHARED_DIR}/dev-scripts-additional-config" ]]
 then
-  scp $SSHOPTS ${SHARED_DIR}/dev-scripts-additional-config root@$IP:dev-scripts-additional-config
+  scp "${SSHOPTS[@]}" "${SHARED_DIR}/dev-scripts-additional-config" "root@${IP}:dev-scripts-additional-config"
 fi
 
-timeout -s 9 175m ssh $SSHOPTS root@$IP bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g'
+timeout -s 9 175m ssh "${SSHOPTS[@]}" "root@${IP}" bash - << EOF |& sed -e 's/.*auths.*/*** PULL_SECRET ***/g'
 
 set -xeuo pipefail
 
diff --git a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh
index 9c51ad17b7b9f..4ca1515bfe093 100644
--- a/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh
+++ b/ci-operator/step-registry/baremetalds/e2e/test/baremetalds-e2e-test-commands.sh
@@ -24,22 +24,22 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then
 fi
 
 # Fetch packet server IP
-IP=$(cat ${SHARED_DIR}/server-ip)
+IP=$(cat "${SHARED_DIR}/server-ip")
 
-SSHOPTS="-o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=90 -i ${CLUSTER_PROFILE_DIR}/.packet-kni-ssh-privatekey"
+SSHOPTS=(-o 'ConnectTimeout=5' -o 'StrictHostKeyChecking=no' -o 'UserKnownHostsFile=/dev/null' -o 'ServerAliveInterval=90' -i "${CLUSTER_PROFILE_DIR}/.packet-kni-ssh-privatekey")
 
 # Copy test binaries on packet server
 echo "### Copying test binaries"
-scp $SSHOPTS /usr/bin/openshift-tests /usr/bin/kubectl root@$IP:/usr/local/bin
+scp "${SSHOPTS[@]}" /usr/bin/openshift-tests /usr/bin/kubectl "root@${IP}:/usr/local/bin"
 
 # Tests execution
 set +e
 echo "### Running tests"
-ssh $SSHOPTS root@$IP openshift-tests run "openshift/conformance/parallel" --dry-run \| grep 'Feature:ProjectAPI' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f -
+ssh "${SSHOPTS[@]}" "root@${IP}" openshift-tests run "openshift/conformance/parallel" --dry-run \| grep 'Feature:ProjectAPI' \| openshift-tests run -o /tmp/artifacts/e2e.log --junit-dir /tmp/artifacts/junit -f -
 rv=$?
 
 echo "### Fetching results"
-ssh $SSHOPTS root@$IP tar -czf - /tmp/artifacts | tar -C ${ARTIFACT_DIR} -xzf -
+ssh "${SSHOPTS[@]}" "root@${IP}" tar -czf - /tmp/artifacts | tar -C "${ARTIFACT_DIR}" -xzf -
 
 set -e
 echo "### Done! (${rv})"
diff --git a/ci-operator/step-registry/baremetalds/packet/check/baremetalds-packet-check-commands.sh b/ci-operator/step-registry/baremetalds/packet/check/baremetalds-packet-check-commands.sh
index e82daeab83ac0..f043a3e5446bb 100644
--- a/ci-operator/step-registry/baremetalds/packet/check/baremetalds-packet-check-commands.sh
+++ b/ci-operator/step-registry/baremetalds/packet/check/baremetalds-packet-check-commands.sh
@@ -6,9 +6,9 @@ set -o pipefail
 
 set +x
 
-PACKET_PROJECT_ID=$(cat ${CLUSTER_PROFILE_DIR}/.packet-kni-vars|grep packet_project_id|awk '{print $2}')
-PACKET_AUTH_TOKEN=$(cat ${CLUSTER_PROFILE_DIR}/.packet-kni-vars|grep packet_auth_token|awk '{print $2}')
-SLACK_AUTH_TOKEN=$(cat ${CLUSTER_PROFILE_DIR}/.slackhook)
+PACKET_PROJECT_ID=$(grep packet_project_id "${CLUSTER_PROFILE_DIR}/.packet-kni-vars" | awk '{print $2}')
+PACKET_AUTH_TOKEN=$(grep packet_auth_token "${CLUSTER_PROFILE_DIR}/.packet-kni-vars" | awk '{print $2}')
+SLACK_AUTH_TOKEN=$(cat "${CLUSTER_PROFILE_DIR}/.slackhook")
 
 # Initial check
 if [ "${CLUSTER_TYPE}" != "packet" ] ; then
@@ -17,9 +17,9 @@ if [ "${CLUSTER_TYPE}" != "packet" ] ; then
 fi
 
 #Packet API call to get list of servers in project
-servers="$(curl -X GET --header 'Accept: application/json' --header "X-Auth-Token: ${PACKET_AUTH_TOKEN}"\
- "https://api.packet.net/projects/${PACKET_PROJECT_ID}/devices?exclude=root_password,ssh_keys,created_by,project,project_lite\
-,ip_addresses,plan,meta,operating_system,facility,network_ports&per_page=1000")"
+servers="$(curl -X GET --header 'Accept: application/json' --header "X-Auth-Token: ${PACKET_AUTH_TOKEN}" \
+ "https://api.packet.net/projects/${PACKET_PROJECT_ID}/devices?exclude=root_password,ssh_keys,created_by,project,project_lite,ip_addresses,plan,meta,operating_system,facility,network_ports&per_page=1000"
+)"
 
 #Assuming all servers created more than 4 hours = 14400 sec ago are leaks
 leaks="$(echo "$servers" | jq -r '.devices[]|select((now-(.created_at|fromdate))>14400 and any(.hostname; startswith("ipi-")))')"
@@ -43,8 +43,8 @@ then
     #send slack notification and delete e2e-metal-ipi leaked servers 
     curl -X POST --data-urlencode\
      "payload={\"text\":\"New Packet.net server leaks total: $leak_num. Deleting the following:\n\",\"attachments\":[{\"color\":\"warning\",\"text\":\"$leak_report\"}]}"\
-      https://hooks.slack.com/services/T027F3GAJ/B011TAG710V/${SLACK_AUTH_TOKEN}
-    
+     "https://hooks.slack.com/services/T027F3GAJ/B011TAG710V/${SLACK_AUTH_TOKEN}"
+
     #delete leaks
     for leak in $leak_ids
     do
diff --git a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh
index 3ccd789e105b5..f70a785c4b741 100644
--- a/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh
+++ b/ci-operator/step-registry/baremetalds/packet/setup/baremetalds-packet-setup-commands.sh
@@ -7,10 +7,10 @@ set -o pipefail
 echo "************ baremetalds packet setup command ************"
 
 # TODO: Remove once OpenShift CI will be upgraded to 4.2 (see https://access.redhat.com/articles/4859371)
-${HOME}/fix_uid.sh
+~/fix_uid.sh
 
 # Run Ansible playbook
-cd ${HOME}
+cd
 cat > packet-setup.yaml <<-EOF
 - name: setup Packet host
   hosts: localhost
diff --git a/ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-commands.sh b/ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-commands.sh
index a57f1e8a6c5f1..b469a0ccf2a3a 100644
--- a/ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-commands.sh
+++ b/ci-operator/step-registry/baremetalds/packet/teardown/baremetalds-packet-teardown-commands.sh
@@ -7,10 +7,10 @@ set -o pipefail
 echo "************ baremetalds packet teardown command ************"
 
 # TODO: Remove once OpenShift CI will be upgraded to 4.2 (see https://access.redhat.com/articles/4859371)
-${HOME}/fix_uid.sh
+~/fix_uid.sh
 
 # Run Ansible playbook
-cd ${HOME}
+cd
 cat > packet-teardown.yaml <<-EOF
 - name: teardown Packet host
   hosts: localhost