diff --git a/scripts/dev/git-version b/scripts/dev/git-version
index f0710e57..e83bfc22 100755
--- a/scripts/dev/git-version
+++ b/scripts/dev/git-version
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 # parse the current git commit hash
 COMMIT=`git rev-parse HEAD`
@@ -18,4 +19,4 @@ if [ -n "$(git diff --shortstat 2> /dev/null | tail -n1)" ]; then
     VERSION="${VERSION}-dirty"
 fi
 
-echo $VERSION
\ No newline at end of file
+echo $VERSION
diff --git a/scripts/dev/release-files b/scripts/dev/release-files
index 8d1d7d09..b309d109 100755
--- a/scripts/dev/release-files
+++ b/scripts/dev/release-files
@@ -1,5 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 # USAGE: ./release-files DEST
+set -e
 
 DEST=$1
 
diff --git a/scripts/dev/test b/scripts/dev/test
index f4b08690..48a5413e 100755
--- a/scripts/dev/test
+++ b/scripts/dev/test
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 PKGS=$(go list ./... | grep -v /vendor)
 FORMATTABLE=$(ls -d */ | grep -v -E '(vendor/|examples/)')
diff --git a/scripts/dev/travis-docker-push b/scripts/dev/travis-docker-push
index 05cd7968..56d86bdf 100755
--- a/scripts/dev/travis-docker-push
+++ b/scripts/dev/travis-docker-push
@@ -1,5 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 # Travis Deploy Docker Push
+set -e
 
 docker info
 GOOS=linux make build
diff --git a/scripts/devnet b/scripts/devnet
index 8a9cc331..852fdbc1 100755
--- a/scripts/devnet
+++ b/scripts/devnet
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Create a virtual bridge with PXE services and matchbox
 # USAGE: ./scripts/devnet create [example]
 # USAGE: ./scripts/devnet status
diff --git a/scripts/get-coreos b/scripts/get-coreos
index 8354aed9..390ecca7 100755
--- a/scripts/get-coreos
+++ b/scripts/get-coreos
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # USAGE: ./scripts/get-coreos
 # USAGE: ./scripts/get-coreos channel version dest
 #
diff --git a/scripts/libvirt b/scripts/libvirt
index 114c846a..0ab3117a 100755
--- a/scripts/libvirt
+++ b/scripts/libvirt
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Manage VM nodes which have a specific set of hardware attributes.
 
 VM_MEMORY=${VM_MEMORY:-2048}
diff --git a/scripts/tls/cert-gen b/scripts/tls/cert-gen
index 00dd4567..96dad96a 100755
--- a/scripts/tls/cert-gen
+++ b/scripts/tls/cert-gen
@@ -1,5 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 # note: Script uses -batch and -subj, instead of interactive prompts.
+set -e
 
 rm -f ca.key ca.crt server.key server.csr server.crt client.key client.csr client.crt index.* serial*
 rm -rf certs crl newcerts