diff --git a/apps/files_external/tests/env/start-amazons3-ceph.sh b/apps/files_external/tests/env/start-amazons3-ceph.sh
index 5f274f10ca2d581ac3498eb36551f98e1d3015c5..ad0fedba9890c9a1dfa894ac73b3ab83a970cabe 100755
--- a/apps/files_external/tests/env/start-amazons3-ceph.sh
+++ b/apps/files_external/tests/env/start-amazons3-ceph.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-ftp-morrisjobke.sh b/apps/files_external/tests/env/start-ftp-morrisjobke.sh
index a082e6195fb762c3346b3c99e23d138f302d05fe..14112d7f803793ea42497e0f39e54ccc36f1890f 100755
--- a/apps/files_external/tests/env/start-ftp-morrisjobke.sh
+++ b/apps/files_external/tests/env/start-ftp-morrisjobke.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-sftp-atmoz.sh b/apps/files_external/tests/env/start-sftp-atmoz.sh
index 04b829add599814647834001cfbe23fac8710f64..91eb5747c54eabf8bc32392cc8d406a2e475a754 100755
--- a/apps/files_external/tests/env/start-sftp-atmoz.sh
+++ b/apps/files_external/tests/env/start-sftp-atmoz.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-smb-silvershell.sh b/apps/files_external/tests/env/start-smb-silvershell.sh
index afada44d4f7bca88c91abff8e5d1fb86c02ee6fa..c45807cc4c81fd0b442628ba0dd0fcf034e405a4 100755
--- a/apps/files_external/tests/env/start-smb-silvershell.sh
+++ b/apps/files_external/tests/env/start-smb-silvershell.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-smb-windows.sh b/apps/files_external/tests/env/start-smb-windows.sh
index a5a19ff1bcf21b4e2ab6a772bc3b895b0cfe90de..2143d7e74997082232ae3c54f13f2bde88f40bf5 100755
--- a/apps/files_external/tests/env/start-smb-windows.sh
+++ b/apps/files_external/tests/env/start-smb-windows.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-webdav-ownCloud.sh b/apps/files_external/tests/env/start-webdav-ownCloud.sh
index d6b36c8d90c5199878a020e55d02e08571c86b3f..6bf9142ee532c3a12adc9a2f28d0af9456ba8790 100755
--- a/apps/files_external/tests/env/start-webdav-ownCloud.sh
+++ b/apps/files_external/tests/env/start-webdav-ownCloud.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-amazons3-ceph.sh b/apps/files_external/tests/env/stop-amazons3-ceph.sh
index 01b39b4c680a9fcc36db21f6becf20d0c8d3598f..3f56a6f1e5d75c97c815ea9d4e605e5489cf3a54 100755
--- a/apps/files_external/tests/env/stop-amazons3-ceph.sh
+++ b/apps/files_external/tests/env/stop-amazons3-ceph.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
index 899b9a539716308c7f3d20a9053a23624466f166..e30ec2e594a89d8cf8fc94588d76321e1a4365f0 100755
--- a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
+++ b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-sftp-atmoz.sh b/apps/files_external/tests/env/stop-sftp-atmoz.sh
index 64570cfd68d53468f3d32659823bcc33acf0fb7e..0c2fd0b5bc6c55b1ee173f0f81b62ca06e01403b 100755
--- a/apps/files_external/tests/env/stop-sftp-atmoz.sh
+++ b/apps/files_external/tests/env/stop-sftp-atmoz.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-smb-silvershell.sh b/apps/files_external/tests/env/stop-smb-silvershell.sh
index aae954284e908d5e225afb8e41e1a0e0f6f623b7..40147b89106dadcc66d19f40e8a30279db020f75 100755
--- a/apps/files_external/tests/env/stop-smb-silvershell.sh
+++ b/apps/files_external/tests/env/stop-smb-silvershell.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-smb-windows.sh b/apps/files_external/tests/env/stop-smb-windows.sh
index 4f89451ce11d9e0a387ae621f6170be074cba821..39c49e2c505be4a4a43f8f3a866c68c2dbecf1c1 100755
--- a/apps/files_external/tests/env/stop-smb-windows.sh
+++ b/apps/files_external/tests/env/stop-smb-windows.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-webdav-ownCloud.sh b/apps/files_external/tests/env/stop-webdav-ownCloud.sh
index c87760a1052c677650ddb4136b9d827253a0e879..8eaf1ba754f67e524cdf5afb1bf5fd3b74043f96 100755
--- a/apps/files_external/tests/env/stop-webdav-ownCloud.sh
+++ b/apps/files_external/tests/env/stop-webdav-ownCloud.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/autotest-external.sh b/autotest-external.sh
index cb5a3dad503138d68de1266901a1d5dcfd9c8617..b738669b48ccac057de32e4ad8362cde0df64da0 100755
--- a/autotest-external.sh
+++ b/autotest-external.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/autotest-js.sh b/autotest-js.sh
index 99cc09f90858b74ac296bb6ce45d3f7285ab8ea2..2d8552811cfaafcc8a51d457f86386aeb48648d4 100755
--- a/autotest-js.sh
+++ b/autotest-js.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/autotest.sh b/autotest.sh
index cd36193cf6c955cfff3f58b4721ba6ed7758d411..f69a9b34a48c79f028faa2073f47982cd104d82e 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/buildjsdocs.sh b/buildjsdocs.sh
index ef18dc8c9a9dbb0a8bb4a223d2385a56463215c8..90562558f66ac8943148bc07108606ba479f8535 100755
--- a/buildjsdocs.sh
+++ b/buildjsdocs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/core/img/image-optimization.sh b/core/img/image-optimization.sh
index e6374c419b2181d755226e993c61157aa5a3349f..3fad080dc79e47948ee82c2a0ad6bdbc0b5d1196 100755
--- a/core/img/image-optimization.sh
+++ b/core/img/image-optimization.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function recursive_optimize_images() {
 cd $1;
diff --git a/l10n/rm-old.sh b/l10n/rm-old.sh
index 30e4509db2530915d75e95aef3b02739e0c47db1..e5e1348014b3d3b8b69255ef4e0ef825c1ae537b 100644
--- a/l10n/rm-old.sh
+++ b/l10n/rm-old.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 lang=(ach ady af_ZA ak am_ET ar ast az bal be bg_BG bn_BD bn_IN bs ca cs_CZ cy_GB da de de_AT de_DE el en_GB en@pirate eo es es_AR es_CL es_MX et_EE eu fa fi_FI fil fr fy_NL gl gu he hi hr hu_HU hy ia id io is it ja jv ka_GE km kn ko ku_IQ la lb lo lt_LT lv mg mk ml ml_IN mn mr ms_MY mt_MT my_MM nb_NO nds ne nl nn_NO nqo oc or_IN pa pl pt_BR pt_PT ro ru si_LK sk_SK sl sq sr sr@latin su sv sw_KE ta_IN ta_LK te tg_TJ th_TH tl_PH tr tzl tzm ug uk ur_PK uz vi yo zh_CN zh_HK zh_TW)