diff --git a/scripts/build-upload-docker-images.sh b/scripts/build-upload-docker-images.sh
index fbea9b42f02..e0317f75d85 100755
--- a/scripts/build-upload-docker-images.sh
+++ b/scripts/build-upload-docker-images.sh
@@ -6,7 +6,7 @@ mode=${1-main}
 
 make build-binaries-linux
 
-if [ "$mode" = "pr-only" ]; then
+if [[ "$mode" == "pr-only" ]]; then
   make create-baseimg
   # build artifacts for linux/amd64 only for pull requests
   platforms="linux/amd64"
@@ -22,11 +22,11 @@ fi
 # build/upload raw and debug images of Jaeger backend components
 for component in agent collector query ingester remote-storage
 do
-	bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}" -t release
-	if ["$mode" != "pr-only"]; then 
-    #do not run debug image build when it is pr-only
+  bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}" -t release
+  # do not need debug image built for PRs
+  if [[ "$mode" != "pr-only" ]]; then
     bash scripts/build-upload-a-docker-image.sh -b -c "jaeger-${component}-debug" -d "cmd/${component}" -t debug
-  fi 
+  fi
 done
 
 bash scripts/build-upload-a-docker-image.sh -b -c jaeger-es-index-cleaner -d cmd/es-index-cleaner -p "${platforms}" -t release
@@ -36,5 +36,5 @@ bash scripts/build-upload-a-docker-image.sh -c jaeger-cassandra-schema -d plugin
 # build/upload images for jaeger-tracegen and jaeger-anonymizer
 for component in tracegen anonymizer
 do
-	bash scripts/build-upload-a-docker-image.sh -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}"
+  bash scripts/build-upload-a-docker-image.sh -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}"
 done
diff --git a/scripts/es-integration-test.sh b/scripts/es-integration-test.sh
index ce3b4c30f0b..680f1017173 100755
--- a/scripts/es-integration-test.sh
+++ b/scripts/es-integration-test.sh
@@ -86,6 +86,7 @@ bring_up_storage() {
   echo "starting ${distro} ${version}"
   for retry in 1 2 3
   do
+    echo "attempt $retry"
     if [ ${distro} = "elasticsearch" ]; then
       cid=$(setup_es ${version})
     elif [ ${distro} == "opensearch" ]; then
diff --git a/scripts/import-order-cleanup.sh b/scripts/import-order-cleanup.sh
index 3476ca9acda..b912652f87f 100755
--- a/scripts/import-order-cleanup.sh
+++ b/scripts/import-order-cleanup.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+# shellcheck disable=SC2046 -- we want multple arguments here
 ./scripts/import-order-cleanup.py -o $1 -t $(git ls-files "*\.go" | \
     grep -v \
         -e thrift-gen \
diff --git a/scripts/updateLicenses.sh b/scripts/updateLicenses.sh
index c8be58ac16b..b1d747cb749 100755
--- a/scripts/updateLicenses.sh
+++ b/scripts/updateLicenses.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+# shellcheck disable=SC2046 -- we want multple arguments here
 ./scripts/updateLicense.py $(git ls-files "*\.go" | \
     grep -v \
         -e thrift-gen \