diff --git a/coverity/run_coverity.sh b/coverity/run_coverity.sh
index 62e4801..b772b7e 100755
--- a/coverity/run_coverity.sh
+++ b/coverity/run_coverity.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/fvp_utils.sh b/fvp_utils.sh
index e2a1595..9bb8a34 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil b/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil
index f56d6f6..d824d67 100644
--- a/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil
+++ b/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil
index 290130c..1f1a683 100644
--- a/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil
+++ b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min:nil b/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min:nil
index e73229c..954de21 100644
--- a/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min:nil
+++ b/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/a70x0-default:nil b/group/tf-l1-build-plat/a70x0-default:nil
index 651719e..47ba46f 100644
--- a/group/tf-l1-build-plat/a70x0-default:nil
+++ b/group/tf-l1-build-plat/a70x0-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/a70x0_amc-default:nil b/group/tf-l1-build-plat/a70x0_amc-default:nil
index 651719e..47ba46f 100644
--- a/group/tf-l1-build-plat/a70x0_amc-default:nil
+++ b/group/tf-l1-build-plat/a70x0_amc-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/a80x0-default:nil b/group/tf-l1-build-plat/a80x0-default:nil
index 651719e..47ba46f 100644
--- a/group/tf-l1-build-plat/a80x0-default:nil
+++ b/group/tf-l1-build-plat/a80x0-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/a80x0_mcbin-default:nil b/group/tf-l1-build-plat/a80x0_mcbin-default:nil
index 651719e..47ba46f 100644
--- a/group/tf-l1-build-plat/a80x0_mcbin-default:nil
+++ b/group/tf-l1-build-plat/a80x0_mcbin-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-auto-opteed:nil b/group/tf-l1-build-plat/rcar-auto-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-auto-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-auto-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-d3-draak:nil b/group/tf-l1-build-plat/rcar-d3-draak:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-d3-draak:nil
+++ b/group/tf-l1-build-plat/rcar-d3-draak:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil b/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-e3-ebisu-4d-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil b/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-e3-ebisu-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-h3-salvator-x-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-h3-ulcb-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-h3n-opteed:nil b/group/tf-l1-build-plat/rcar-h3n-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-h3n-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-h3n-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-m3-salvator-x-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-m3-ulcb-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil b/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-m3n-salvator-x-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil b/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil
+++ b/group/tf-l1-build-plat/rcar-m3n-ulcb-opteed:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rcar-v3m-eagle:nil b/group/tf-l1-build-plat/rcar-v3m-eagle:nil
index b733163..0839dfe 100644
--- a/group/tf-l1-build-plat/rcar-v3m-eagle:nil
+++ b/group/tf-l1-build-plat/rcar-v3m-eagle:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rk3288-default:nil b/group/tf-l1-build-plat/rk3288-default:nil
index 1f21eff..a0bbe25 100644
--- a/group/tf-l1-build-plat/rk3288-default:nil
+++ b/group/tf-l1-build-plat/rk3288-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rk3328-default:nil b/group/tf-l1-build-plat/rk3328-default:nil
index 42894f4..03ca87c 100644
--- a/group/tf-l1-build-plat/rk3328-default:nil
+++ b/group/tf-l1-build-plat/rk3328-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rk3368-default:nil b/group/tf-l1-build-plat/rk3368-default:nil
index 42894f4..03ca87c 100644
--- a/group/tf-l1-build-plat/rk3368-default:nil
+++ b/group/tf-l1-build-plat/rk3368-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/rk3399-default:nil b/group/tf-l1-build-plat/rk3399-default:nil
index 42894f4..03ca87c 100644
--- a/group/tf-l1-build-plat/rk3399-default:nil
+++ b/group/tf-l1-build-plat/rk3399-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-build-plat/stm32mp1-default:nil b/group/tf-l1-build-plat/stm32mp1-default:nil
index a4176fb..68bc82b 100644
--- a/group/tf-l1-build-plat/stm32mp1-default:nil
+++ b/group/tf-l1-build-plat/stm32mp1-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l1-check-docs/build-docs:nil b/group/tf-l1-check-docs/build-docs:nil
index 904c1fb..8354760 100644
--- a/group/tf-l1-check-docs/build-docs:nil
+++ b/group/tf-l1-check-docs/build-docs:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-default,fvp-pauth:fvp-tftf-fip.tftf-aemva.8_6-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug b/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-mte-tsp,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.8_5+mte-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-ctx-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-leaf-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-pac-ret-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5 b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
index 215448a..2a68e93 100644
--- a/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
+++ b/group/tf-l2-boot-tests-misc/fvp-pauth-standard-tsp-romlib,fvp-pauth:fvp-tftf-fip.tftf-aemv8a.8_5-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min-enable-runtime-instr:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min-enable-runtime-instr:coverity-tf-misra.diff
index 2a38382..e74dddd 100644
--- a/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min-enable-runtime-instr:coverity-tf-misra.diff
+++ b/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min-enable-runtime-instr:coverity-tf-misra.diff
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min:coverity-tf-misra.diff b/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min:coverity-tf-misra.diff
index e73229c..954de21 100644
--- a/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min:coverity-tf-misra.diff
+++ b/group/tf-l2-coverity-misra/juno-aarch32-rst-to-sp-min:coverity-tf-misra.diff
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug b/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug
index 004428e..eb9800a 100644
--- a/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug
+++ b/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tftf-l1-build/nil,hikey960-default:nil b/group/tftf-l1-build/nil,hikey960-default:nil
index 4299af5..321ccd5 100644
--- a/group/tftf-l1-build/nil,hikey960-default:nil
+++ b/group/tftf-l1-build/nil,hikey960-default:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/group/tftf-l1-check-docs/nil,build-docs:nil b/group/tftf-l1-check-docs/nil,build-docs:nil
index c2a7067..ece8967 100644
--- a/group/tftf-l1-check-docs/nil,build-docs:nil
+++ b/group/tftf-l1-check-docs/nil,build-docs:nil
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/job/clean_filer_ws.sh b/job/clean_filer_ws.sh
index 2056cb6..0a17526 100755
--- a/job/clean_filer_ws.sh
+++ b/job/clean_filer_ws.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-build-for-lava/build_test.sh b/job/tf-build-for-lava/build_test.sh
index c16128e..bcc98d0 100755
--- a/job/tf-build-for-lava/build_test.sh
+++ b/job/tf-build-for-lava/build_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-ci-gateway/generate_report.sh b/job/tf-ci-gateway/generate_report.sh
index c48e38b..458c8b0 100755
--- a/job/tf-ci-gateway/generate_report.sh
+++ b/job/tf-ci-gateway/generate_report.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-ci-gateway/generate_tests.sh b/job/tf-ci-gateway/generate_tests.sh
index cc71b0b..32b8106 100755
--- a/job/tf-ci-gateway/generate_tests.sh
+++ b/job/tf-ci-gateway/generate_tests.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-coverity/should_run_tf_coverity.sh b/job/tf-coverity/should_run_tf_coverity.sh
index f7ad382..8d2f9ee 100755
--- a/job/tf-coverity/should_run_tf_coverity.sh
+++ b/job/tf-coverity/should_run_tf_coverity.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-gerrit-bot/run_gerrit_bot.sh b/job/tf-gerrit-bot/run_gerrit_bot.sh
index 796e29a..7d3d954 100755
--- a/job/tf-gerrit-bot/run_gerrit_bot.sh
+++ b/job/tf-gerrit-bot/run_gerrit_bot.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-github-autoreply/run_github_autoreply.sh b/job/tf-github-autoreply/run_github_autoreply.sh
index 63c4466..fec34d2 100755
--- a/job/tf-github-autoreply/run_github_autoreply.sh
+++ b/job/tf-github-autoreply/run_github_autoreply.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-github-pr/should_run_nominations.sh b/job/tf-github-pr/should_run_nominations.sh
index c2caab1..e619d5d 100755
--- a/job/tf-github-pr/should_run_nominations.sh
+++ b/job/tf-github-pr/should_run_nominations.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-main/run_fast_forward_master.sh b/job/tf-main/run_fast_forward_master.sh
index 33e2486..1610986 100755
--- a/job/tf-main/run_fast_forward_master.sh
+++ b/job/tf-main/run_fast_forward_master.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-main/should_execute_static.sh b/job/tf-main/should_execute_static.sh
index fccde1c..0f0ac76 100755
--- a/job/tf-main/should_execute_static.sh
+++ b/job/tf-main/should_execute_static.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-merge-watcher/check_scratch.sh b/job/tf-merge-watcher/check_scratch.sh
index 173a742..8a5fd85 100755
--- a/job/tf-merge-watcher/check_scratch.sh
+++ b/job/tf-merge-watcher/check_scratch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-merge-watcher/update_reference_repo.sh b/job/tf-merge-watcher/update_reference_repo.sh
index 65fff79..833ccf9 100755
--- a/job/tf-merge-watcher/update_reference_repo.sh
+++ b/job/tf-merge-watcher/update_reference_repo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-optee-build/build_optee.sh b/job/tf-optee-build/build_optee.sh
index bbb032d..f8c755f 100755
--- a/job/tf-optee-build/build_optee.sh
+++ b/job/tf-optee-build/build_optee.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-static-checks/run_static_checks.sh b/job/tf-static-checks/run_static_checks.sh
index b2d3a48..9146948 100644
--- a/job/tf-static-checks/run_static_checks.sh
+++ b/job/tf-static-checks/run_static_checks.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-sync-repos/sync.sh b/job/tf-sync-repos/sync.sh
index 8269768..0ba9316 100755
--- a/job/tf-sync-repos/sync.sh
+++ b/job/tf-sync-repos/sync.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-worker/generate_yaml.sh b/job/tf-worker/generate_yaml.sh
index 60ae846..56d0867 100755
--- a/job/tf-worker/generate_yaml.sh
+++ b/job/tf-worker/generate_yaml.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-worker/is_juno_config.sh b/job/tf-worker/is_juno_config.sh
index 0d8f1c8..c1514c2 100755
--- a/job/tf-worker/is_juno_config.sh
+++ b/job/tf-worker/is_juno_config.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-worker/manage_artefacts.sh b/job/tf-worker/manage_artefacts.sh
index dbfc4eb..63fac83 100755
--- a/job/tf-worker/manage_artefacts.sh
+++ b/job/tf-worker/manage_artefacts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-worker/parse_test.sh b/job/tf-worker/parse_test.sh
index fead3a7..98a8030 100755
--- a/job/tf-worker/parse_test.sh
+++ b/job/tf-worker/parse_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-worker/run_fvp_test.sh b/job/tf-worker/run_fvp_test.sh
index 4ec3912..48a83e4 100755
--- a/job/tf-worker/run_fvp_test.sh
+++ b/job/tf-worker/run_fvp_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/job/tf-worker/should_build_local.sh b/job/tf-worker/should_build_local.sh
index b3fde29..3328cef 100755
--- a/job/tf-worker/should_build_local.sh
+++ b/job/tf-worker/should_build_local.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/job/trusted-firmware-main/should_execute_static.sh b/job/trusted-firmware-main/should_execute_static.sh
index fccde1c..0f0ac76 100755
--- a/job/trusted-firmware-main/should_execute_static.sh
+++ b/job/trusted-firmware-main/should_execute_static.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/juno_utils.sh b/juno_utils.sh
index 780054d..e75fe04 100644
--- a/juno_utils.sh
+++ b/juno_utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/base-aemv8a-latest-revb.sh b/model/base-aemv8a-latest-revb.sh
index 64688de..9047477 100644
--- a/model/base-aemv8a-latest-revb.sh
+++ b/model/base-aemv8a-latest-revb.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/base-aemv8a-quad.sh b/model/base-aemv8a-quad.sh
index 9dfeb4b..6ba94f2 100644
--- a/model/base-aemv8a-quad.sh
+++ b/model/base-aemv8a-quad.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/base-aemv8a-revb.sh b/model/base-aemv8a-revb.sh
index 3e9a174..3c6e9f5 100644
--- a/model/base-aemv8a-revb.sh
+++ b/model/base-aemv8a-revb.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index 305613f..931f034 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 00cc756..3fe1a9a 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index 7bea9cc..729b4c4 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a32x4.sh b/model/cortex-a32x4.sh
index 3296b16..482c6b7 100644
--- a/model/cortex-a32x4.sh
+++ b/model/cortex-a32x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a35x4.sh b/model/cortex-a35x4.sh
index 5f95339..56ba9d5 100644
--- a/model/cortex-a35x4.sh
+++ b/model/cortex-a35x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a53x4.sh b/model/cortex-a53x4.sh
index c953437..399591b 100644
--- a/model/cortex-a53x4.sh
+++ b/model/cortex-a53x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a55x4-a75x4.sh b/model/cortex-a55x4-a75x4.sh
index 707e9ff..4f28d2a 100644
--- a/model/cortex-a55x4-a75x4.sh
+++ b/model/cortex-a55x4-a75x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a55x4-a76x2.sh b/model/cortex-a55x4-a76x2.sh
index 770987a..51e358a 100644
--- a/model/cortex-a55x4-a76x2.sh
+++ b/model/cortex-a55x4-a76x2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a55x4.sh b/model/cortex-a55x4.sh
index 0a4b619..3d0aa00 100644
--- a/model/cortex-a55x4.sh
+++ b/model/cortex-a55x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a57x1-a53x1.sh b/model/cortex-a57x1-a53x1.sh
index f046b2a..53befa6 100644
--- a/model/cortex-a57x1-a53x1.sh
+++ b/model/cortex-a57x1-a53x1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a57x2-a53x4.sh b/model/cortex-a57x2-a53x4.sh
index 024c8de..a4a67d9 100644
--- a/model/cortex-a57x2-a53x4.sh
+++ b/model/cortex-a57x2-a53x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a57x4-a53x4.sh b/model/cortex-a57x4-a53x4.sh
index fd5e277..b69c62a 100644
--- a/model/cortex-a57x4-a53x4.sh
+++ b/model/cortex-a57x4-a53x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a57x4.sh b/model/cortex-a57x4.sh
index 2b5b73c..bd7774e 100644
--- a/model/cortex-a57x4.sh
+++ b/model/cortex-a57x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a65aex8.sh b/model/cortex-a65aex8.sh
index 5ae60bf..e017626 100644
--- a/model/cortex-a65aex8.sh
+++ b/model/cortex-a65aex8.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a65x4.sh b/model/cortex-a65x4.sh
index dd0dc30..dd6a552 100644
--- a/model/cortex-a65x4.sh
+++ b/model/cortex-a65x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a72x4-a53x4.sh b/model/cortex-a72x4-a53x4.sh
index d0d0c7c..80b9049 100644
--- a/model/cortex-a72x4-a53x4.sh
+++ b/model/cortex-a72x4-a53x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a72x4.sh b/model/cortex-a72x4.sh
index 609c183..9564c5c 100644
--- a/model/cortex-a72x4.sh
+++ b/model/cortex-a72x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a73x4-a53x4.sh b/model/cortex-a73x4-a53x4.sh
index 9ce32cd..2bdb72c 100644
--- a/model/cortex-a73x4-a53x4.sh
+++ b/model/cortex-a73x4-a53x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a73x4.sh b/model/cortex-a73x4.sh
index 802def2..34df01b 100644
--- a/model/cortex-a73x4.sh
+++ b/model/cortex-a73x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a75x4.sh b/model/cortex-a75x4.sh
index b075d9f..d1f5d04 100644
--- a/model/cortex-a75x4.sh
+++ b/model/cortex-a75x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a76aex4.sh b/model/cortex-a76aex4.sh
index 4de43bb..0de31a6 100644
--- a/model/cortex-a76aex4.sh
+++ b/model/cortex-a76aex4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a76x4.sh b/model/cortex-a76x4.sh
index 635fbf0..c86efb2 100644
--- a/model/cortex-a76x4.sh
+++ b/model/cortex-a76x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/cortex-a77x4.sh b/model/cortex-a77x4.sh
index 3173abe..5baddb3 100644
--- a/model/cortex-a77x4.sh
+++ b/model/cortex-a77x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/css-rde1edge.sh b/model/css-rde1edge.sh
index 84c0a12..32709de 100644
--- a/model/css-rde1edge.sh
+++ b/model/css-rde1edge.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/css-rdn1edge.sh b/model/css-rdn1edge.sh
index 3c994ee..d8879ae 100644
--- a/model/css-rdn1edge.sh
+++ b/model/css-rdn1edge.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/css-sgi575.sh b/model/css-sgi575.sh
index 89bbc78..9022dc7 100644
--- a/model/css-sgi575.sh
+++ b/model/css-sgi575.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/css-sgm775.sh b/model/css-sgm775.sh
index e8fa9f5..768954f 100644
--- a/model/css-sgm775.sh
+++ b/model/css-sgm775.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/foundationv8.sh b/model/foundationv8.sh
index 40b41e8..136ef07 100644
--- a/model/foundationv8.sh
+++ b/model/foundationv8.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/hercules.sh b/model/hercules.sh
index dadb4c0..bcb598d 100644
--- a/model/hercules.sh
+++ b/model/hercules.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Herculesx4"
 
diff --git a/model/neoverse_e1x1.sh b/model/neoverse_e1x1.sh
index 4d3c354..064eb5b 100644
--- a/model/neoverse_e1x1.sh
+++ b/model/neoverse_e1x1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/model/neoverse_e1x2.sh b/model/neoverse_e1x2.sh
index 175db2c..c413a05 100644
--- a/model/neoverse_e1x2.sh
+++ b/model/neoverse_e1x2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/model/neoverse_e1x4.sh b/model/neoverse_e1x4.sh
index 261595f..4e165c0 100644
--- a/model/neoverse_e1x4.sh
+++ b/model/neoverse_e1x4.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/model/neoverse_n1.sh b/model/neoverse_n1.sh
index cbe655b..514aa25 100644
--- a/model/neoverse_n1.sh
+++ b/model/neoverse_n1.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/model/tc0.sh b/model/tc0.sh
index 04576b3..cb4bf64 100644
--- a/model/tc0.sh
+++ b/model/tc0.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/model/zeus.sh b/model/zeus.sh
index 2cb8b12..452205c 100644
--- a/model/zeus.sh
+++ b/model/zeus.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/rde1edge_utils.sh b/rde1edge_utils.sh
index e0c3bb4..f53ed0a 100644
--- a/rde1edge_utils.sh
+++ b/rde1edge_utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/rdn1edge_utils.sh b/rdn1edge_utils.sh
index dd0b1ce..52677d8 100644
--- a/rdn1edge_utils.sh
+++ b/rdn1edge_utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/coverity-misra.diff b/run_config/coverity-misra.diff
index d053250..aaf436a 100644
--- a/run_config/coverity-misra.diff
+++ b/run_config/coverity-misra.diff
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/coverity-misra.full b/run_config/coverity-misra.full
index 0efabfa..76a4705 100644
--- a/run_config/coverity-misra.full
+++ b/run_config/coverity-misra.full
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/coverity-tf b/run_config/coverity-tf
index eba0d0b..5095459 100644
--- a/run_config/coverity-tf
+++ b/run_config/coverity-tf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/debug b/run_config/debug
index 4924c43..69d24f5 100644
--- a/run_config/debug
+++ b/run_config/debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fip.dummy b/run_config/fip.dummy
index 5c0a556..e13167f 100644
--- a/run_config/fip.dummy
+++ b/run_config/fip.dummy
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aem8a.singlecluster b/run_config/fvp-aem8a.singlecluster
index e38dadd..4e14a91 100755
--- a/run_config/fvp-aem8a.singlecluster
+++ b/run_config/fvp-aem8a.singlecluster
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a b/run_config/fvp-aemv8a
index a40b921..bbf501d 100644
--- a/run_config/fvp-aemv8a
+++ b/run_config/fvp-aemv8a
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.64only b/run_config/fvp-aemv8a.64only
index 92d4ad5..af084c3 100644
--- a/run_config/fvp-aemv8a.64only
+++ b/run_config/fvp-aemv8a.64only
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.8_3 b/run_config/fvp-aemv8a.8_3
index e0b6c56..49c549e 100644
--- a/run_config/fvp-aemv8a.8_3
+++ b/run_config/fvp-aemv8a.8_3
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.8_4 b/run_config/fvp-aemv8a.8_4
index 13f733d..b26e41e 100644
--- a/run_config/fvp-aemv8a.8_4
+++ b/run_config/fvp-aemv8a.8_4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.8_5 b/run_config/fvp-aemv8a.8_5
index e2922fe..a787847 100644
--- a/run_config/fvp-aemv8a.8_5
+++ b/run_config/fvp-aemv8a.8_5
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.8_5+mte b/run_config/fvp-aemv8a.8_5+mte
index 3663550..26a328b 100644
--- a/run_config/fvp-aemv8a.8_5+mte
+++ b/run_config/fvp-aemv8a.8_5+mte
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.8_5.bmcov b/run_config/fvp-aemv8a.8_5.bmcov
index 038db14..67bb75c 100644
--- a/run_config/fvp-aemv8a.8_5.bmcov
+++ b/run_config/fvp-aemv8a.8_5.bmcov
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.NVM_reboot b/run_config/fvp-aemv8a.NVM_reboot
index cca71c2..35006f2 100644
--- a/run_config/fvp-aemv8a.NVM_reboot
+++ b/run_config/fvp-aemv8a.NVM_reboot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32 b/run_config/fvp-aemv8a.aarch32
index aacf028..71b9572 100644
--- a/run_config/fvp-aemv8a.aarch32
+++ b/run_config/fvp-aemv8a.aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32+8_4 b/run_config/fvp-aemv8a.aarch32+8_4
index 1e15bf6..2e16d74 100644
--- a/run_config/fvp-aemv8a.aarch32+8_4
+++ b/run_config/fvp-aemv8a.aarch32+8_4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32+bl2_el3 b/run_config/fvp-aemv8a.aarch32+bl2_el3
index 1567d7d..f082488 100644
--- a/run_config/fvp-aemv8a.aarch32+bl2_el3
+++ b/run_config/fvp-aemv8a.aarch32+bl2_el3
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32+memprotect b/run_config/fvp-aemv8a.aarch32+memprotect
index 83b4422..1779b3f 100644
--- a/run_config/fvp-aemv8a.aarch32+memprotect
+++ b/run_config/fvp-aemv8a.aarch32+memprotect
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32+regreset b/run_config/fvp-aemv8a.aarch32+regreset
index 9e54b20..e8501d1 100644
--- a/run_config/fvp-aemv8a.aarch32+regreset
+++ b/run_config/fvp-aemv8a.aarch32+regreset
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32.8_3 b/run_config/fvp-aemv8a.aarch32.8_3
index d38f0f0..bb38aec 100644
--- a/run_config/fvp-aemv8a.aarch32.8_3
+++ b/run_config/fvp-aemv8a.aarch32.8_3
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32.NVM_reboot b/run_config/fvp-aemv8a.aarch32.NVM_reboot
index c3b3621..edf5dc9 100644
--- a/run_config/fvp-aemv8a.aarch32.NVM_reboot
+++ b/run_config/fvp-aemv8a.aarch32.NVM_reboot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32.nocache b/run_config/fvp-aemv8a.aarch32.nocache
index 7464390..07a05d1 100644
--- a/run_config/fvp-aemv8a.aarch32.nocache
+++ b/run_config/fvp-aemv8a.aarch32.nocache
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic b/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
index 727d97d..9fbe1df 100644
--- a/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
+++ b/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.amu b/run_config/fvp-aemv8a.amu
index a329d76..2b5e3c7 100644
--- a/run_config/fvp-aemv8a.amu
+++ b/run_config/fvp-aemv8a.amu
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 post_fetch_tf_resource() {
 	model="base-aemv8a" \
diff --git a/run_config/fvp-aemv8a.amu.aarch32 b/run_config/fvp-aemv8a.amu.aarch32
index 32f635e..613acbd 100644
--- a/run_config/fvp-aemv8a.amu.aarch32
+++ b/run_config/fvp-aemv8a.amu.aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 post_fetch_tf_resource() {
 	model="base-aemv8a" \
diff --git a/run_config/fvp-aemv8a.amu.bmcov b/run_config/fvp-aemv8a.amu.bmcov
index 3fb574e..9daabf9 100644
--- a/run_config/fvp-aemv8a.amu.bmcov
+++ b/run_config/fvp-aemv8a.amu.bmcov
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 post_fetch_tf_resource() {
 	bmcov_plugin=1 bmcov_plugin_path="${coverage_trace_plugin}" \
diff --git a/run_config/fvp-aemv8a.assymetric b/run_config/fvp-aemv8a.assymetric
index c374237..8866769 100644
--- a/run_config/fvp-aemv8a.assymetric
+++ b/run_config/fvp-aemv8a.assymetric
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.assymetric.bmcov b/run_config/fvp-aemv8a.assymetric.bmcov
index 5a608cc..6a50881 100644
--- a/run_config/fvp-aemv8a.assymetric.bmcov
+++ b/run_config/fvp-aemv8a.assymetric.bmcov
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.bl2_el3 b/run_config/fvp-aemv8a.bl2_el3
index 33f2873..522f82c 100644
--- a/run_config/fvp-aemv8a.bl2_el3
+++ b/run_config/fvp-aemv8a.bl2_el3
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.bmcov b/run_config/fvp-aemv8a.bmcov
index dc2e984..1b65f93 100644
--- a/run_config/fvp-aemv8a.bmcov
+++ b/run_config/fvp-aemv8a.bmcov
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.crash b/run_config/fvp-aemv8a.crash
index edf3058..92a00a8 100644
--- a/run_config/fvp-aemv8a.crash
+++ b/run_config/fvp-aemv8a.crash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.el3payload b/run_config/fvp-aemv8a.el3payload
index ec7e1e8..d5ff5ed 100644
--- a/run_config/fvp-aemv8a.el3payload
+++ b/run_config/fvp-aemv8a.el3payload
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.fi b/run_config/fvp-aemv8a.fi
index 4d5b58a..229c787 100644
--- a/run_config/fvp-aemv8a.fi
+++ b/run_config/fvp-aemv8a.fi
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.gicv3_spi b/run_config/fvp-aemv8a.gicv3_spi
index d1250d5..8c1083c 100644
--- a/run_config/fvp-aemv8a.gicv3_spi
+++ b/run_config/fvp-aemv8a.gicv3_spi
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.gicv4 b/run_config/fvp-aemv8a.gicv4
index d847f7a..85c5325 100644
--- a/run_config/fvp-aemv8a.gicv4
+++ b/run_config/fvp-aemv8a.gicv4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.invalid_nvcounter b/run_config/fvp-aemv8a.invalid_nvcounter
index bca24e0..458ad50 100644
--- a/run_config/fvp-aemv8a.invalid_nvcounter
+++ b/run_config/fvp-aemv8a.invalid_nvcounter
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.memprotect b/run_config/fvp-aemv8a.memprotect
index 027e9ce..34bc63b 100644
--- a/run_config/fvp-aemv8a.memprotect
+++ b/run_config/fvp-aemv8a.memprotect
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.nocm b/run_config/fvp-aemv8a.nocm
index 37595fd..363e941 100644
--- a/run_config/fvp-aemv8a.nocm
+++ b/run_config/fvp-aemv8a.nocm
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.nvcounter_v1 b/run_config/fvp-aemv8a.nvcounter_v1
index b416faf..0e0e399 100644
--- a/run_config/fvp-aemv8a.nvcounter_v1
+++ b/run_config/fvp-aemv8a.nvcounter_v1
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.pl33 b/run_config/fvp-aemv8a.pl33
index 4504ad4..4cabc44 100644
--- a/run_config/fvp-aemv8a.pl33
+++ b/run_config/fvp-aemv8a.pl33
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.pl33.bmcov b/run_config/fvp-aemv8a.pl33.bmcov
index a0b51d5..54a8251 100644
--- a/run_config/fvp-aemv8a.pl33.bmcov
+++ b/run_config/fvp-aemv8a.pl33.bmcov
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.quad b/run_config/fvp-aemv8a.quad
index 25e7294..13c11e6 100644
--- a/run_config/fvp-aemv8a.quad
+++ b/run_config/fvp-aemv8a.quad
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.roxlattables.bl31_panic b/run_config/fvp-aemv8a.roxlattables.bl31_panic
index 6ad697d..bf48dd9 100644
--- a/run_config/fvp-aemv8a.roxlattables.bl31_panic
+++ b/run_config/fvp-aemv8a.roxlattables.bl31_panic
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.roxlattables.tspd_panic b/run_config/fvp-aemv8a.roxlattables.tspd_panic
index 31a47af..29e3d3c 100644
--- a/run_config/fvp-aemv8a.roxlattables.tspd_panic
+++ b/run_config/fvp-aemv8a.roxlattables.tspd_panic
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.rst31 b/run_config/fvp-aemv8a.rst31
index 46464b3..ba74868 100644
--- a/run_config/fvp-aemv8a.rst31
+++ b/run_config/fvp-aemv8a.rst31
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.rstspmin b/run_config/fvp-aemv8a.rstspmin
index 32c84ad..4db3880 100644
--- a/run_config/fvp-aemv8a.rstspmin
+++ b/run_config/fvp-aemv8a.rstspmin
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.singlecore b/run_config/fvp-aemv8a.singlecore
index faf8615..1c3c6ee 100644
--- a/run_config/fvp-aemv8a.singlecore
+++ b/run_config/fvp-aemv8a.singlecore
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.singlecore.bmcov b/run_config/fvp-aemv8a.singlecore.bmcov
index 2701771..cae34c8 100644
--- a/run_config/fvp-aemv8a.singlecore.bmcov
+++ b/run_config/fvp-aemv8a.singlecore.bmcov
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.sve b/run_config/fvp-aemv8a.sve
index 6740613..dbb4306 100644
--- a/run_config/fvp-aemv8a.sve
+++ b/run_config/fvp-aemv8a.sve
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.sve.bmcov b/run_config/fvp-aemv8a.sve.bmcov
index e7ec951..69a0482 100644
--- a/run_config/fvp-aemv8a.sve.bmcov
+++ b/run_config/fvp-aemv8a.sve.bmcov
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.tbb.disable_dyn_auth b/run_config/fvp-aemv8a.tbb.disable_dyn_auth
index feda3f3..c978292 100644
--- a/run_config/fvp-aemv8a.tbb.disable_dyn_auth
+++ b/run_config/fvp-aemv8a.tbb.disable_dyn_auth
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a.ubsan_test b/run_config/fvp-aemv8a.ubsan_test
index ac2da46..4fd7e5b 100644
--- a/run_config/fvp-aemv8a.ubsan_test
+++ b/run_config/fvp-aemv8a.ubsan_test
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a_revb b/run_config/fvp-aemv8a_revb
index 077dda7..a3a1f96 100644
--- a/run_config/fvp-aemv8a_revb
+++ b/run_config/fvp-aemv8a_revb
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a_revb.aarch32 b/run_config/fvp-aemv8a_revb.aarch32
index 4155941..f9d9077 100644
--- a/run_config/fvp-aemv8a_revb.aarch32
+++ b/run_config/fvp-aemv8a_revb.aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a_revb.aarch32.gicv2 b/run_config/fvp-aemv8a_revb.aarch32.gicv2
index 0b4a5fa..df2e67f 100644
--- a/run_config/fvp-aemv8a_revb.aarch32.gicv2
+++ b/run_config/fvp-aemv8a_revb.aarch32.gicv2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a_revb.asymetric b/run_config/fvp-aemv8a_revb.asymetric
index b02577f..2b5b024 100644
--- a/run_config/fvp-aemv8a_revb.asymetric
+++ b/run_config/fvp-aemv8a_revb.asymetric
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a_revb.gicv2 b/run_config/fvp-aemv8a_revb.gicv2
index d628d5f..d5a4060 100644
--- a/run_config/fvp-aemv8a_revb.gicv2
+++ b/run_config/fvp-aemv8a_revb.gicv2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemv8a_revb.latest b/run_config/fvp-aemv8a_revb.latest
index 2dfa674..00a56c9 100644
--- a/run_config/fvp-aemv8a_revb.latest
+++ b/run_config/fvp-aemv8a_revb.latest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemva b/run_config/fvp-aemva
index 89f9a71..6de47a1 100644
--- a/run_config/fvp-aemva
+++ b/run_config/fvp-aemva
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemva.8_6 b/run_config/fvp-aemva.8_6
index cd8f285..f9649f1 100644
--- a/run_config/fvp-aemva.8_6
+++ b/run_config/fvp-aemva.8_6
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-aemva.aarch32 b/run_config/fvp-aemva.aarch32
index ebf9443..84042a8 100644
--- a/run_config/fvp-aemva.aarch32
+++ b/run_config/fvp-aemva.aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa32x4 b/run_config/fvp-cortexa32x4
index d758385..d41a5d6 100644
--- a/run_config/fvp-cortexa32x4
+++ b/run_config/fvp-cortexa32x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa32x4.rstspmin b/run_config/fvp-cortexa32x4.rstspmin
index 8329e32..f1dfd46 100644
--- a/run_config/fvp-cortexa32x4.rstspmin
+++ b/run_config/fvp-cortexa32x4.rstspmin
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa35x4 b/run_config/fvp-cortexa35x4
index 799d704..0e33a77 100644
--- a/run_config/fvp-cortexa35x4
+++ b/run_config/fvp-cortexa35x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa53x4 b/run_config/fvp-cortexa53x4
index d90f05a..6c55d7f 100644
--- a/run_config/fvp-cortexa53x4
+++ b/run_config/fvp-cortexa53x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa55x4 b/run_config/fvp-cortexa55x4
index ed6529a..decd0eb 100644
--- a/run_config/fvp-cortexa55x4
+++ b/run_config/fvp-cortexa55x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa55x4a75x4 b/run_config/fvp-cortexa55x4a75x4
index 96b5e1f..3578386 100644
--- a/run_config/fvp-cortexa55x4a75x4
+++ b/run_config/fvp-cortexa55x4a75x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa55x4a76x2 b/run_config/fvp-cortexa55x4a76x2
index fbb13c5..92af6f5 100644
--- a/run_config/fvp-cortexa55x4a76x2
+++ b/run_config/fvp-cortexa55x4a76x2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa57x1a53x1 b/run_config/fvp-cortexa57x1a53x1
index 29e6430..51bb016 100644
--- a/run_config/fvp-cortexa57x1a53x1
+++ b/run_config/fvp-cortexa57x1a53x1
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa57x2a53x4 b/run_config/fvp-cortexa57x2a53x4
index 6dc4c5a..27ad8de 100644
--- a/run_config/fvp-cortexa57x2a53x4
+++ b/run_config/fvp-cortexa57x2a53x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa57x4 b/run_config/fvp-cortexa57x4
index 8fbae44..e72e3d1 100644
--- a/run_config/fvp-cortexa57x4
+++ b/run_config/fvp-cortexa57x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa57x4a53x4 b/run_config/fvp-cortexa57x4a53x4
index 2647a86..b638943 100644
--- a/run_config/fvp-cortexa57x4a53x4
+++ b/run_config/fvp-cortexa57x4a53x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa57x4a53x4.rst31 b/run_config/fvp-cortexa57x4a53x4.rst31
index 3f2f118..9ab33d9 100644
--- a/run_config/fvp-cortexa57x4a53x4.rst31
+++ b/run_config/fvp-cortexa57x4a53x4.rst31
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa65aex8 b/run_config/fvp-cortexa65aex8
index 5881038..4547d2a 100644
--- a/run_config/fvp-cortexa65aex8
+++ b/run_config/fvp-cortexa65aex8
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa65x4 b/run_config/fvp-cortexa65x4
index 20bc423..9a30103 100644
--- a/run_config/fvp-cortexa65x4
+++ b/run_config/fvp-cortexa65x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa72x4 b/run_config/fvp-cortexa72x4
index ed02b14..019d297 100644
--- a/run_config/fvp-cortexa72x4
+++ b/run_config/fvp-cortexa72x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa72x4a53x4 b/run_config/fvp-cortexa72x4a53x4
index 6ea2326..cf75541 100644
--- a/run_config/fvp-cortexa72x4a53x4
+++ b/run_config/fvp-cortexa72x4a53x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa73x4 b/run_config/fvp-cortexa73x4
index 2696682..083f55b 100644
--- a/run_config/fvp-cortexa73x4
+++ b/run_config/fvp-cortexa73x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa73x4a53x4 b/run_config/fvp-cortexa73x4a53x4
index fd60505..cc176fb 100644
--- a/run_config/fvp-cortexa73x4a53x4
+++ b/run_config/fvp-cortexa73x4a53x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa75x4 b/run_config/fvp-cortexa75x4
index 110834b..748aeef 100644
--- a/run_config/fvp-cortexa75x4
+++ b/run_config/fvp-cortexa75x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa76aex4 b/run_config/fvp-cortexa76aex4
index a376978..bc70c6f 100644
--- a/run_config/fvp-cortexa76aex4
+++ b/run_config/fvp-cortexa76aex4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa76x4 b/run_config/fvp-cortexa76x4
index 196cd5e..fb3cdc6 100644
--- a/run_config/fvp-cortexa76x4
+++ b/run_config/fvp-cortexa76x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-cortexa77x4 b/run_config/fvp-cortexa77x4
index 8bbf9c4..c02e812 100644
--- a/run_config/fvp-cortexa77x4
+++ b/run_config/fvp-cortexa77x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb b/run_config/fvp-dtb
index 509c591..5ea5618 100644
--- a/run_config/fvp-dtb
+++ b/run_config/fvp-dtb
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.1t b/run_config/fvp-dtb.1t
index 90560f6..6be45eb 100644
--- a/run_config/fvp-dtb.1t
+++ b/run_config/fvp-dtb.1t
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.aarch32 b/run_config/fvp-dtb.aarch32
index 420d166..1718bba 100644
--- a/run_config/fvp-dtb.aarch32
+++ b/run_config/fvp-dtb.aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.aarch32.1t b/run_config/fvp-dtb.aarch32.1t
index 9b2e983..a8d2808 100644
--- a/run_config/fvp-dtb.aarch32.1t
+++ b/run_config/fvp-dtb.aarch32.1t
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.aarch32.gicv2 b/run_config/fvp-dtb.aarch32.gicv2
index 20cbbc3..e3386a5 100644
--- a/run_config/fvp-dtb.aarch32.gicv2
+++ b/run_config/fvp-dtb.aarch32.gicv2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.dyn b/run_config/fvp-dtb.dyn
index 45461ef..26bf93e 100644
--- a/run_config/fvp-dtb.dyn
+++ b/run_config/fvp-dtb.dyn
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.dyn.2t b/run_config/fvp-dtb.dyn.2t
index a852003..34142ce 100644
--- a/run_config/fvp-dtb.dyn.2t
+++ b/run_config/fvp-dtb.dyn.2t
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.foundation b/run_config/fvp-dtb.foundation
index e162ec2..8057bb2 100644
--- a/run_config/fvp-dtb.foundation
+++ b/run_config/fvp-dtb.foundation
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.gicv2 b/run_config/fvp-dtb.gicv2
index 3e7ef15..074d370 100644
--- a/run_config/fvp-dtb.gicv2
+++ b/run_config/fvp-dtb.gicv2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.quad b/run_config/fvp-dtb.quad
index f81c81b..6a3a4e5 100644
--- a/run_config/fvp-dtb.quad
+++ b/run_config/fvp-dtb.quad
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-dtb.sgm775 b/run_config/fvp-dtb.sgm775
index b1fa3fc..76aa88e 100644
--- a/run_config/fvp-dtb.sgm775
+++ b/run_config/fvp-dtb.sgm775
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-el3payload b/run_config/fvp-el3payload
index 2310ec5..344b6e9 100644
--- a/run_config/fvp-el3payload
+++ b/run_config/fvp-el3payload
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.sgi b/run_config/fvp-fip.sgi
index 468a188..55f0bfd 100644
--- a/run_config/fvp-fip.sgi
+++ b/run_config/fvp-fip.sgi
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.sgm b/run_config/fvp-fip.sgm
index 2e64845..3b9cf8b 100644
--- a/run_config/fvp-fip.sgm
+++ b/run_config/fvp-fip.sgm
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.tc0 b/run_config/fvp-fip.tc0
index d3096f7..d1b1368 100644
--- a/run_config/fvp-fip.tc0
+++ b/run_config/fvp-fip.tc0
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.tftf b/run_config/fvp-fip.tftf
index 5dc907d..6ceb289 100644
--- a/run_config/fvp-fip.tftf
+++ b/run_config/fvp-fip.tftf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.tftf+bl32 b/run_config/fvp-fip.tftf+bl32
index c3c6ce7..bb61612 100644
--- a/run_config/fvp-fip.tftf+bl32
+++ b/run_config/fvp-fip.tftf+bl32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.uboot b/run_config/fvp-fip.uboot
index 34bc4e8..9fa1159 100644
--- a/run_config/fvp-fip.uboot
+++ b/run_config/fvp-fip.uboot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.uboot+bl32 b/run_config/fvp-fip.uboot+bl32
index 35b6ad3..849d537 100644
--- a/run_config/fvp-fip.uboot+bl32
+++ b/run_config/fvp-fip.uboot+bl32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.uboot32 b/run_config/fvp-fip.uboot32
index 4e5a03b..d1534af 100644
--- a/run_config/fvp-fip.uboot32
+++ b/run_config/fvp-fip.uboot32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.uefi b/run_config/fvp-fip.uefi
index 294c585..1fd2b2f 100644
--- a/run_config/fvp-fip.uefi
+++ b/run_config/fvp-fip.uefi
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-fip.uefi.debug b/run_config/fvp-fip.uefi.debug
index d88f9b6..ea5ba3e 100644
--- a/run_config/fvp-fip.uefi.debug
+++ b/run_config/fvp-fip.uefi.debug
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-foundationv8 b/run_config/fvp-foundationv8
index cb68a31..5716975 100644
--- a/run_config/fvp-foundationv8
+++ b/run_config/fvp-foundationv8
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-foundationv8.8_0 b/run_config/fvp-foundationv8.8_0
index f30d208..68c8970 100644
--- a/run_config/fvp-foundationv8.8_0
+++ b/run_config/fvp-foundationv8.8_0
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-foundationv8.8_1 b/run_config/fvp-foundationv8.8_1
index cd53de2..924d440 100644
--- a/run_config/fvp-foundationv8.8_1
+++ b/run_config/fvp-foundationv8.8_1
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-foundationv8.8_2 b/run_config/fvp-foundationv8.8_2
index fb8d965..dafdf84 100644
--- a/run_config/fvp-foundationv8.8_2
+++ b/run_config/fvp-foundationv8.8_2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-foundationv8.8_3 b/run_config/fvp-foundationv8.8_3
index 54eaee4..ab6eeea 100644
--- a/run_config/fvp-foundationv8.8_3
+++ b/run_config/fvp-foundationv8.8_3
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-foundationv8.8_4 b/run_config/fvp-foundationv8.8_4
index e3b7b7e..862d9ff 100644
--- a/run_config/fvp-foundationv8.8_4
+++ b/run_config/fvp-foundationv8.8_4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-foundationv8.bmcov b/run_config/fvp-foundationv8.bmcov
index 528d638..ab01283 100644
--- a/run_config/fvp-foundationv8.bmcov
+++ b/run_config/fvp-foundationv8.bmcov
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-hercules b/run_config/fvp-hercules
index 746bb16..966adbe 100644
--- a/run_config/fvp-hercules
+++ b/run_config/fvp-hercules
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 post_fetch_tf_resource() {
 	model="hercules" \
diff --git a/run_config/fvp-linux b/run_config/fvp-linux
index a94c46a..ec823c6 100644
--- a/run_config/fvp-linux
+++ b/run_config/fvp-linux
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.quad b/run_config/fvp-linux.quad
index a2b4edc..83939c9 100644
--- a/run_config/fvp-linux.quad
+++ b/run_config/fvp-linux.quad
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.rootfs b/run_config/fvp-linux.rootfs
index ea3fff5..2fe21af 100644
--- a/run_config/fvp-linux.rootfs
+++ b/run_config/fvp-linux.rootfs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.rootfs+rst31 b/run_config/fvp-linux.rootfs+rst31
index 282170d..ae07ab4 100644
--- a/run_config/fvp-linux.rootfs+rst31
+++ b/run_config/fvp-linux.rootfs+rst31
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.rst31 b/run_config/fvp-linux.rst31
index c68a06a..d286fd4 100644
--- a/run_config/fvp-linux.rst31
+++ b/run_config/fvp-linux.rst31
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.sgi b/run_config/fvp-linux.sgi
index 24d34dc..b6aaf18 100644
--- a/run_config/fvp-linux.sgi
+++ b/run_config/fvp-linux.sgi
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.sgm b/run_config/fvp-linux.sgm
index f93ad3e..256cb16 100644
--- a/run_config/fvp-linux.sgm
+++ b/run_config/fvp-linux.sgm
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.stress b/run_config/fvp-linux.stress
index 793cdeb..26efbd4 100644
--- a/run_config/fvp-linux.stress
+++ b/run_config/fvp-linux.stress
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.tc0 b/run_config/fvp-linux.tc0
index 4d2f607..e8039a8 100644
--- a/run_config/fvp-linux.tc0
+++ b/run_config/fvp-linux.tc0
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux.uefi.busybox b/run_config/fvp-linux.uefi.busybox
index 50199fe..f6ef5fb 100644
--- a/run_config/fvp-linux.uefi.busybox
+++ b/run_config/fvp-linux.uefi.busybox
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux32 b/run_config/fvp-linux32
index b81f0a0..215e2f5 100644
--- a/run_config/fvp-linux32
+++ b/run_config/fvp-linux32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux32.rstspmin b/run_config/fvp-linux32.rstspmin
index a827471..f51aa19 100644
--- a/run_config/fvp-linux32.rstspmin
+++ b/run_config/fvp-linux32.rstspmin
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-linux32.stress b/run_config/fvp-linux32.stress
index 1cc37a8..e981c2e 100644
--- a/run_config/fvp-linux32.stress
+++ b/run_config/fvp-linux32.stress
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-neoverse_e1x1 b/run_config/fvp-neoverse_e1x1
index 2df5db3..30c31f7 100644
--- a/run_config/fvp-neoverse_e1x1
+++ b/run_config/fvp-neoverse_e1x1
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-neoverse_e1x2 b/run_config/fvp-neoverse_e1x2
index c48e798..6695062 100644
--- a/run_config/fvp-neoverse_e1x2
+++ b/run_config/fvp-neoverse_e1x2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-neoverse_e1x4 b/run_config/fvp-neoverse_e1x4
index 938a025..c0c2836 100644
--- a/run_config/fvp-neoverse_e1x4
+++ b/run_config/fvp-neoverse_e1x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-neoverse_n1x4 b/run_config/fvp-neoverse_n1x4
index e990f30..9f50b89 100644
--- a/run_config/fvp-neoverse_n1x4
+++ b/run_config/fvp-neoverse_n1x4
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-optee b/run_config/fvp-optee
index 6b5964d..7eab331 100644
--- a/run_config/fvp-optee
+++ b/run_config/fvp-optee
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-rde1edge b/run_config/fvp-rde1edge
index 3487603..186cdbb 100644
--- a/run_config/fvp-rde1edge
+++ b/run_config/fvp-rde1edge
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-rdn1edge b/run_config/fvp-rdn1edge
index d1e5112..1dc2231 100644
--- a/run_config/fvp-rdn1edge
+++ b/run_config/fvp-rdn1edge
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-romlib b/run_config/fvp-romlib
index 3b47119..b54ff10 100644
--- a/run_config/fvp-romlib
+++ b/run_config/fvp-romlib
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-sgi575 b/run_config/fvp-sgi575
index ddaad2d..702cc35 100644
--- a/run_config/fvp-sgi575
+++ b/run_config/fvp-sgi575
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-sgm775 b/run_config/fvp-sgm775
index 1a3286f..1a3a95e 100644
--- a/run_config/fvp-sgm775
+++ b/run_config/fvp-sgm775
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-spm b/run_config/fvp-spm
index 50ab24b..dc4103f 100644
--- a/run_config/fvp-spm
+++ b/run_config/fvp-spm
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-spm.edk2 b/run_config/fvp-spm.edk2
index 244f6f4..60b5547 100644
--- a/run_config/fvp-spm.edk2
+++ b/run_config/fvp-spm.edk2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index feffea5..f3e8b91 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-spm.optee b/run_config/fvp-spm.optee
index b5d12fb..520313c 100644
--- a/run_config/fvp-spm.optee
+++ b/run_config/fvp-spm.optee
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-spm.optee.sp b/run_config/fvp-spm.optee.sp
index 3c963e0..698bcc1 100644
--- a/run_config/fvp-spm.optee.sp
+++ b/run_config/fvp-spm.optee.sp
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index 13cc6ac..24b9722 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-tc0 b/run_config/fvp-tc0
index 31be770..316edcd 100644
--- a/run_config/fvp-tc0
+++ b/run_config/fvp-tc0
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-tftf b/run_config/fvp-tftf
index 1fc7594..cbf5086 100644
--- a/run_config/fvp-tftf
+++ b/run_config/fvp-tftf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-tftf.aarch32 b/run_config/fvp-tftf.aarch32
index ec91d56..0a55b97 100644
--- a/run_config/fvp-tftf.aarch32
+++ b/run_config/fvp-tftf.aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-tftf.aarch32+fwu b/run_config/fvp-tftf.aarch32+fwu
index 9d43a9c..690c4b2 100644
--- a/run_config/fvp-tftf.aarch32+fwu
+++ b/run_config/fvp-tftf.aarch32+fwu
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-tftf.cactus_mm b/run_config/fvp-tftf.cactus_mm
index 2e98024..dc6b9b2 100644
--- a/run_config/fvp-tftf.cactus_mm
+++ b/run_config/fvp-tftf.cactus_mm
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-tftf.fault b/run_config/fvp-tftf.fault
index 3baba73..8d86533 100644
--- a/run_config/fvp-tftf.fault
+++ b/run_config/fvp-tftf.fault
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-tftf.fwu b/run_config/fvp-tftf.fwu
index 05da538..403d095 100644
--- a/run_config/fvp-tftf.fwu
+++ b/run_config/fvp-tftf.fwu
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-tspd b/run_config/fvp-tspd
index 66ee01d..b2951cc 100644
--- a/run_config/fvp-tspd
+++ b/run_config/fvp-tspd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/fvp-zeus b/run_config/fvp-zeus
index 122fdfd..2cc6f86 100644
--- a/run_config/fvp-zeus
+++ b/run_config/fvp-zeus
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-linux.optee b/run_config/juno-linux.optee
index 960b113..4b1a2ad 100644
--- a/run_config/juno-linux.optee
+++ b/run_config/juno-linux.optee
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-linux.reboot b/run_config/juno-linux.reboot
index a4f3ee6..ac416db 100644
--- a/run_config/juno-linux.reboot
+++ b/run_config/juno-linux.reboot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-linux.reboot+aarch32 b/run_config/juno-linux.reboot+aarch32
index e1452a7..b325518 100644
--- a/run_config/juno-linux.reboot+aarch32
+++ b/run_config/juno-linux.reboot+aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-linux.uboot b/run_config/juno-linux.uboot
index e638b7f..ff12199 100644
--- a/run_config/juno-linux.uboot
+++ b/run_config/juno-linux.uboot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-linux.uboot+aarch32 b/run_config/juno-linux.uboot+aarch32
index 6422c65..92942f6 100644
--- a/run_config/juno-linux.uboot+aarch32
+++ b/run_config/juno-linux.uboot+aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-manual.linuxshutdown b/run_config/juno-manual.linuxshutdown
index a2ba962..e6191c3 100644
--- a/run_config/juno-manual.linuxshutdown
+++ b/run_config/juno-manual.linuxshutdown
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-manual.linuxshutdown+aarch32 b/run_config/juno-manual.linuxshutdown+aarch32
index 97877b3..0553574 100644
--- a/run_config/juno-manual.linuxshutdown+aarch32
+++ b/run_config/juno-manual.linuxshutdown+aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-manual.tftf b/run_config/juno-manual.tftf
index ba5845b..30d6228 100644
--- a/run_config/juno-manual.tftf
+++ b/run_config/juno-manual.tftf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-manual.tftf+aarch32 b/run_config/juno-manual.tftf+aarch32
index 2fab409..b58033c 100644
--- a/run_config/juno-manual.tftf+aarch32
+++ b/run_config/juno-manual.tftf+aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-r1 b/run_config/juno-r1
index e3e29cf..1ff465b 100644
--- a/run_config/juno-r1
+++ b/run_config/juno-r1
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-r2 b/run_config/juno-r2
index 79298b8..3c0513d 100644
--- a/run_config/juno-r2
+++ b/run_config/juno-r2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-romlib b/run_config/juno-romlib
index af0974a..fc163ce 100644
--- a/run_config/juno-romlib
+++ b/run_config/juno-romlib
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-rt32 b/run_config/juno-rt32
index fa63ad8..f466ed2 100644
--- a/run_config/juno-rt32
+++ b/run_config/juno-rt32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-rt32.instr b/run_config/juno-rt32.instr
index 6ebb193..768fb81 100644
--- a/run_config/juno-rt32.instr
+++ b/run_config/juno-rt32.instr
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-scmi b/run_config/juno-scmi
index b9187eb..e88e189 100644
--- a/run_config/juno-scmi
+++ b/run_config/juno-scmi
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-tftf b/run_config/juno-tftf
index 04b4ab9..85d8b55 100644
--- a/run_config/juno-tftf
+++ b/run_config/juno-tftf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-tftf+aarch32 b/run_config/juno-tftf+aarch32
index 29cdfa7..6e64331 100644
--- a/run_config/juno-tftf+aarch32
+++ b/run_config/juno-tftf+aarch32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-tftf+aarch32.reboot b/run_config/juno-tftf+aarch32.reboot
index b1a01e7..31a71b5 100644
--- a/run_config/juno-tftf+aarch32.reboot
+++ b/run_config/juno-tftf+aarch32.reboot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-tftf.fwu b/run_config/juno-tftf.fwu
index f1de31a..3edb526 100644
--- a/run_config/juno-tftf.fwu
+++ b/run_config/juno-tftf.fwu
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/juno-tftf.reboot b/run_config/juno-tftf.reboot
index 0c5e758..8d949fe 100644
--- a/run_config/juno-tftf.reboot
+++ b/run_config/juno-tftf.reboot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/norun b/run_config/norun
index 290130c..1f1a683 100644
--- a/run_config/norun
+++ b/run_config/norun
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/scan_build-tf b/run_config/scan_build-tf
index 6136b35..153d390 100644
--- a/run_config/scan_build-tf
+++ b/run_config/scan_build-tf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/run_config/scp_juno-linux.uboot b/run_config/scp_juno-linux.uboot
index 939a482..d7acd93 100644
--- a/run_config/scp_juno-linux.uboot
+++ b/run_config/scp_juno-linux.uboot
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/run_config/scp_juno-tftf b/run_config/scp_juno-tftf
index 58e5b25..1b854e8 100644
--- a/run_config/scp_juno-tftf
+++ b/run_config/scp_juno-tftf
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/script/backup_external_repo.sh b/script/backup_external_repo.sh
index 78b36df..4226762 100755
--- a/script/backup_external_repo.sh
+++ b/script/backup_external_repo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/build_bmcov.sh b/script/build_bmcov.sh
index 3923ab8..0ba1d29 100755
--- a/script/build_bmcov.sh
+++ b/script/build_bmcov.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
@@ -103,7 +103,7 @@
     fi
     # to be run on the user locally
     cat <<EOF > "server.sh"
-#!/bin/bash
+#!/usr/bin/env bash
 
 echo "Running server..."
 type -a firefox || (echo "Please install Firefox..." && exit 1)
diff --git a/script/build_package.sh b/script/build_package.sh
index 6ed52b0..829b3ec 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/clone_repos.sh b/script/clone_repos.sh
index 8c7f33c..38e2eab 100755
--- a/script/clone_repos.sh
+++ b/script/clone_repos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/coverity_wrapper.sh b/script/coverity_wrapper.sh
index 626232d..374e7fa 100644
--- a/script/coverity_wrapper.sh
+++ b/script/coverity_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/script/download_linaro_release.sh b/script/download_linaro_release.sh
index 1829d6e..bed6596 100755
--- a/script/download_linaro_release.sh
+++ b/script/download_linaro_release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/find_fragment_users.sh b/script/find_fragment_users.sh
index 8a35b93..95272e4 100755
--- a/script/find_fragment_users.sh
+++ b/script/find_fragment_users.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/gen_juno_linux_reboot_yaml.sh b/script/gen_juno_linux_reboot_yaml.sh
index f1254eb..9ca8523 100755
--- a/script/gen_juno_linux_reboot_yaml.sh
+++ b/script/gen_juno_linux_reboot_yaml.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/gen_juno_linux_yaml.sh b/script/gen_juno_linux_yaml.sh
index d7946de..5413806 100755
--- a/script/gen_juno_linux_yaml.sh
+++ b/script/gen_juno_linux_yaml.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/gen_juno_scp_tests_scmi_yaml.sh b/script/gen_juno_scp_tests_scmi_yaml.sh
index 2422ef5..a09907f 100755
--- a/script/gen_juno_scp_tests_scmi_yaml.sh
+++ b/script/gen_juno_scp_tests_scmi_yaml.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/script/gen_juno_tftf_yaml.sh b/script/gen_juno_tftf_yaml.sh
index 2b0b7b6..1611001 100755
--- a/script/gen_juno_tftf_yaml.sh
+++ b/script/gen_juno_tftf_yaml.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/gen_merge_report.sh b/script/gen_merge_report.sh
index 431b37a..9967ed6 100644
--- a/script/gen_merge_report.sh
+++ b/script/gen_merge_report.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/script/id_tf_processes.sh b/script/id_tf_processes.sh
index 9c2b4f6..f3952b3 100755
--- a/script/id_tf_processes.sh
+++ b/script/id_tf_processes.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/make_stress_test_image.sh b/script/make_stress_test_image.sh
index 5defc9f..52b99f2 100755
--- a/script/make_stress_test_image.sh
+++ b/script/make_stress_test_image.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/parse_test.sh b/script/parse_test.sh
index 03e828b..5eb026f 100755
--- a/script/parse_test.sh
+++ b/script/parse_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/run_local_ci.sh b/script/run_local_ci.sh
index 42fd99c..ce69876 100755
--- a/script/run_local_ci.sh
+++ b/script/run_local_ci.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/script/run_package.sh b/script/run_package.sh
index 8c1b57a..ec11737 100755
--- a/script/run_package.sh
+++ b/script/run_package.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/script/run_tools_through_valgrind.sh b/script/run_tools_through_valgrind.sh
index 47f8b11..290a6b5 100755
--- a/script/run_tools_through_valgrind.sh
+++ b/script/run_tools_through_valgrind.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/script/scan_build_wrapper.sh b/script/scan_build_wrapper.sh
index 5b52d5f..bae7a27 100644
--- a/script/scan_build_wrapper.sh
+++ b/script/scan_build_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/delete_old_workspaces.sh b/script/scratch_scripts/delete_old_workspaces.sh
index d34873e..c5d2b95 100755
--- a/script/scratch_scripts/delete_old_workspaces.sh
+++ b/script/scratch_scripts/delete_old_workspaces.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/deploy_scratch.sh b/script/scratch_scripts/deploy_scratch.sh
index 0c39ab8..cfe612c 100755
--- a/script/scratch_scripts/deploy_scratch.sh
+++ b/script/scratch_scripts/deploy_scratch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/fast-forward-master.sh b/script/scratch_scripts/fast-forward-master.sh
index 176712d..a05c8f0 100755
--- a/script/scratch_scripts/fast-forward-master.sh
+++ b/script/scratch_scripts/fast-forward-master.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/initial_clone.sh b/script/scratch_scripts/initial_clone.sh
index 3f96e36..b8166f2 100755
--- a/script/scratch_scripts/initial_clone.sh
+++ b/script/scratch_scripts/initial_clone.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/initial_clone_temp.sh b/script/scratch_scripts/initial_clone_temp.sh
index b0858bf..25ad576 100755
--- a/script/scratch_scripts/initial_clone_temp.sh
+++ b/script/scratch_scripts/initial_clone_temp.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/initial_clone_v2.5.sh b/script/scratch_scripts/initial_clone_v2.5.sh
index 7c112d2..d7ed3f4 100755
--- a/script/scratch_scripts/initial_clone_v2.5.sh
+++ b/script/scratch_scripts/initial_clone_v2.5.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/initial_clone_v2.6.sh b/script/scratch_scripts/initial_clone_v2.6.sh
index a7cb826..ebcfbd2 100755
--- a/script/scratch_scripts/initial_clone_v2.6.sh
+++ b/script/scratch_scripts/initial_clone_v2.6.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/initial_clone_v2.sh b/script/scratch_scripts/initial_clone_v2.sh
index 29e996d..0036eae 100755
--- a/script/scratch_scripts/initial_clone_v2.sh
+++ b/script/scratch_scripts/initial_clone_v2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/initial_clone_v3.sh b/script/scratch_scripts/initial_clone_v3.sh
index 5f4e3fc..a1f9e59 100755
--- a/script/scratch_scripts/initial_clone_v3.sh
+++ b/script/scratch_scripts/initial_clone_v3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/post_build_setup.sh b/script/scratch_scripts/post_build_setup.sh
index 02741b3..1790b8c 100644
--- a/script/scratch_scripts/post_build_setup.sh
+++ b/script/scratch_scripts/post_build_setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/scratch_scripts/post_build_setup_v2.sh b/script/scratch_scripts/post_build_setup_v2.sh
index 9bf719a..2fd9dbe 100644
--- a/script/scratch_scripts/post_build_setup_v2.sh
+++ b/script/scratch_scripts/post_build_setup_v2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/send_artefacts.sh b/script/send_artefacts.sh
index b9c90e4..463697a 100755
--- a/script/send_artefacts.sh
+++ b/script/send_artefacts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/static-checks/static-checks-check-copyright.sh b/script/static-checks/static-checks-check-copyright.sh
index 837e721..e204dd6 100755
--- a/script/static-checks/static-checks-check-copyright.sh
+++ b/script/static-checks/static-checks-check-copyright.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/static-checks/static-checks-coding-style-entire-src-tree.sh b/script/static-checks/static-checks-coding-style-entire-src-tree.sh
index 1d066ae..3c808f0 100755
--- a/script/static-checks/static-checks-coding-style-entire-src-tree.sh
+++ b/script/static-checks/static-checks-coding-style-entire-src-tree.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/static-checks/static-checks-coding-style-line-endings.sh b/script/static-checks/static-checks-coding-style-line-endings.sh
index 5442f7d..570b6b5 100755
--- a/script/static-checks/static-checks-coding-style-line-endings.sh
+++ b/script/static-checks/static-checks-coding-style-line-endings.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/static-checks/static-checks-coding-style.sh b/script/static-checks/static-checks-coding-style.sh
index 5341e34..377646e 100755
--- a/script/static-checks/static-checks-coding-style.sh
+++ b/script/static-checks/static-checks-coding-style.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/static-checks/static-checks-cppcheck.sh b/script/static-checks/static-checks-cppcheck.sh
index 40d161f..bb87440 100755
--- a/script/static-checks/static-checks-cppcheck.sh
+++ b/script/static-checks/static-checks-cppcheck.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/static-checks/static-checks-include-order.sh b/script/static-checks/static-checks-include-order.sh
index 0f2b46c..f5c1d78 100755
--- a/script/static-checks/static-checks-include-order.sh
+++ b/script/static-checks/static-checks-include-order.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/static-checks/static-checks.sh b/script/static-checks/static-checks.sh
index 882e9e1..321c06e 100755
--- a/script/static-checks/static-checks.sh
+++ b/script/static-checks/static-checks.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/script/test_definitions.sh b/script/test_definitions.sh
index ec03c89..7e26118 100644
--- a/script/test_definitions.sh
+++ b/script/test_definitions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
diff --git a/script/tf-coverity/common-def.sh b/script/tf-coverity/common-def.sh
index 746e9bc..ea54d18 100644
--- a/script/tf-coverity/common-def.sh
+++ b/script/tf-coverity/common-def.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/sgi575_utils.sh b/sgi575_utils.sh
index 4564875..b7c2657 100644
--- a/sgi575_utils.sh
+++ b/sgi575_utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/sgm775_utils.sh b/sgm775_utils.sh
index 2c0b8d6..f9e0dd9 100644
--- a/sgm775_utils.sh
+++ b/sgm775_utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019, Arm Limited. All rights reserved.
 #
diff --git a/tc0_utils.sh b/tc0_utils.sh
index 7fe37e1..895ec87 100644
--- a/tc0_utils.sh
+++ b/tc0_utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
diff --git a/utils.sh b/utils.sh
index 4b60e7a..1643543 100644
--- a/utils.sh
+++ b/utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #