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.
 #