diff --git a/src/runtime/hack/update-generated-runtime-proto.sh b/src/runtime/hack/update-generated-runtime-proto.sh
index 19d6b5cdd0..d94956d753 100755
--- a/src/runtime/hack/update-generated-runtime-proto.sh
+++ b/src/runtime/hack/update-generated-runtime-proto.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Copyright 2019 HyperHQ Inc.
 #
diff --git a/tests/error.sh b/tests/error.sh
index cbc897ac92..4f875422f8 100644
--- a/tests/error.sh
+++ b/tests/error.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+#
 # Copyright (c) 2022-2024 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
diff --git a/tools/osbuilder/rootfs-builder/alpine/config.sh b/tools/osbuilder/rootfs-builder/alpine/config.sh
index 4a6568aeca..0ad9f13623 100644
--- a/tools/osbuilder/rootfs-builder/alpine/config.sh
+++ b/tools/osbuilder/rootfs-builder/alpine/config.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Copyright (c) 2018 Intel Corporation
 #
diff --git a/tools/osbuilder/rootfs-builder/cbl-mariner/config.sh b/tools/osbuilder/rootfs-builder/cbl-mariner/config.sh
index f032867d0c..85ff5ad98a 100644
--- a/tools/osbuilder/rootfs-builder/cbl-mariner/config.sh
+++ b/tools/osbuilder/rootfs-builder/cbl-mariner/config.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+#
 # Copyright (c) 2023 Microsoft Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
diff --git a/tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh
index 0288d4d77e..f96142d7eb 100644
--- a/tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh
+++ b/tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+#
 # Copyright (c) 2023 Microsoft Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
diff --git a/tools/osbuilder/rootfs-builder/debian/config.sh b/tools/osbuilder/rootfs-builder/debian/config.sh
index 203cad9f97..8f90ef0b3c 100644
--- a/tools/osbuilder/rootfs-builder/debian/config.sh
+++ b/tools/osbuilder/rootfs-builder/debian/config.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Copyright (c) 2018 SUSE
 #
diff --git a/tools/osbuilder/rootfs-builder/debian/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/debian/rootfs_lib.sh
index f6aae26364..fa6eb48706 100644
--- a/tools/osbuilder/rootfs-builder/debian/rootfs_lib.sh
+++ b/tools/osbuilder/rootfs-builder/debian/rootfs_lib.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Copyright (c) 2018 SUSE
 #
diff --git a/tools/osbuilder/rootfs-builder/template/config_template.sh b/tools/osbuilder/rootfs-builder/template/config_template.sh
index 9e98863c92..4543bab688 100644
--- a/tools/osbuilder/rootfs-builder/template/config_template.sh
+++ b/tools/osbuilder/rootfs-builder/template/config_template.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Copyright (c) 2018 Intel Corporation
 #
diff --git a/tools/osbuilder/rootfs-builder/template/rootfs_lib_template.sh b/tools/osbuilder/rootfs-builder/template/rootfs_lib_template.sh
index 978a89bc87..2ef2e12b7f 100644
--- a/tools/osbuilder/rootfs-builder/template/rootfs_lib_template.sh
+++ b/tools/osbuilder/rootfs-builder/template/rootfs_lib_template.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Copyright (c) 2018-2020 Intel Corporation
 #
diff --git a/tools/osbuilder/rootfs-builder/ubuntu/config.sh b/tools/osbuilder/rootfs-builder/ubuntu/config.sh
index f1eb736645..9b0fccbd12 100644
--- a/tools/osbuilder/rootfs-builder/ubuntu/config.sh
+++ b/tools/osbuilder/rootfs-builder/ubuntu/config.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+#
 # Copyright (c) 2018 Yash Jain, 2022 IBM Corp.
 #
 # SPDX-License-Identifier: Apache-2.0
diff --git a/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh b/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
index 464144fb45..8dd88f485a 100644
--- a/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
+++ b/tools/osbuilder/rootfs-builder/ubuntu/rootfs_lib.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+#
 # Copyright (c) 2018 Yash Jain, 2022 IBM Corp.
 #
 # SPDX-License-Identifier: Apache-2.0
@@ -49,7 +51,7 @@ EOF
 	apt update
 
 	if ! multistrap -a "$DEB_ARCH" -d "$rootfs_dir" -f "$multistrap_conf"; then
-		if [ "$OS_VERSION" = "focal" ]; then	
+		if [ "$OS_VERSION" = "focal" ]; then
 			echo "WARN: multistrap failed, proceed with hack for Ubuntu 20.04"
 			build_dbus $rootfs_dir
 		else
diff --git a/tools/osbuilder/tests/test_config.sh b/tools/osbuilder/tests/test_config.sh
index eb2dc231d3..67f2f37e67 100644
--- a/tools/osbuilder/tests/test_config.sh
+++ b/tools/osbuilder/tests/test_config.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 # Copyright (c) 2018 SUSE LLC
 #