diff --git a/weaver/core/relay/docker/entrypoint-client.sh b/weaver/core/relay/docker/entrypoint-client.sh
index b0317a50df..350187c813 100755
--- a/weaver/core/relay/docker/entrypoint-client.sh
+++ b/weaver/core/relay/docker/entrypoint-client.sh
@@ -1,10 +1,9 @@
+#!/bin/sh
+
 # Copyright IBM Corp. All Rights Reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
-#!/bin/sh
-
-
 if [ "${ENABLE_TLS}" == "true" ]; then
   BINARY="$(pwd)/client-tls"
 else
diff --git a/weaver/core/relay/docker/entrypoint-driver.sh b/weaver/core/relay/docker/entrypoint-driver.sh
index 55719135f0..2fbce3b1aa 100755
--- a/weaver/core/relay/docker/entrypoint-driver.sh
+++ b/weaver/core/relay/docker/entrypoint-driver.sh
@@ -1,9 +1,9 @@
+#!/bin/sh
+
 # Copyright IBM Corp. All Rights Reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
-#!/bin/sh
-
 DRIVER_CONFIG_TEMPLATE=${DRIVER_CONFIG_TEMPLATE:-$(pwd)/config/driver.template.toml}
 
 # We need to export this variable because it needs to be visible
diff --git a/weaver/core/relay/docker/entrypoint-server.sh b/weaver/core/relay/docker/entrypoint-server.sh
index 6fb87640a9..fc806f469e 100755
--- a/weaver/core/relay/docker/entrypoint-server.sh
+++ b/weaver/core/relay/docker/entrypoint-server.sh
@@ -1,9 +1,9 @@
+#!/bin/sh
+
 # Copyright IBM Corp. All Rights Reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
-#!/bin/sh
-
 RELAY_DNS_CONFIG=${RELAY_DNS_CONFIG:-$(pwd)/config/relays}
 RELAY_CONFIG_TEMPLATE=${RELAY_CONFIG_TEMPLATE:-$(pwd)/config/server.template.toml}
 
diff --git a/weaver/core/relay/docker/entrypoint.sh b/weaver/core/relay/docker/entrypoint.sh
index 7eee5585fa..455e048516 100755
--- a/weaver/core/relay/docker/entrypoint.sh
+++ b/weaver/core/relay/docker/entrypoint.sh
@@ -1,9 +1,9 @@
+#!/bin/sh
+
 # Copyright IBM Corp. All Rights Reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 
-#!/bin/sh
-
 BINARY=${1:-server}
 
 case $BINARY in