diff --git a/elements/bm-dnsmasq/install.d/75-filter-bootps-cronjob b/elements/bm-dnsmasq/install.d/75-filter-bootps-cronjob
index 6fa9abfbf..60e8fdbfc 100755
--- a/elements/bm-dnsmasq/install.d/75-filter-bootps-cronjob
+++ b/elements/bm-dnsmasq/install.d/75-filter-bootps-cronjob
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -ue
+
 install -m 0755 -o root -g root $(dirname $0)/../bin/filter-bootps /usr/local/bin/filter-bootps
 cat > /etc/cron.d/filter-bootps <<EOF
 # Ensure we don't answer BOOTP for bare metal nodes not registered with nova.
diff --git a/elements/glance/os-refresh-config/configure.d/10-glance-state b/elements/glance/os-refresh-config/configure.d/10-glance-state
index dce415246..cc5eef2b0 100755
--- a/elements/glance/os-refresh-config/configure.d/10-glance-state
+++ b/elements/glance/os-refresh-config/configure.d/10-glance-state
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -ue
+
 [ -d /mnt/state/var/lib/glance ] || install -d -D -m 0770 -o glance -g glance /mnt/state/var/lib/glance
 [ -d /mnt/state/var/lib/glance/images ] || install -d -D -m 0770 -o glance -g glance /mnt/state/var/lib/glance/images
 [ -d /mnt/state/var/log/glance ] || install -d -D -m 0755 -o glance -g glance /mnt/state/var/log/glance
diff --git a/elements/heat-api/os-refresh-config/post-configure.d/79-heat-api b/elements/heat-api/os-refresh-config/post-configure.d/79-heat-api
index 895c7c31a..e60c39281 100755
--- a/elements/heat-api/os-refresh-config/post-configure.d/79-heat-api
+++ b/elements/heat-api/os-refresh-config/post-configure.d/79-heat-api
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ue
 
 os-svc-enable -n heat-api
 os-svc-enable -n heat-api-cfn
diff --git a/elements/heat-engine/install.d/20-heat-crontab b/elements/heat-engine/install.d/20-heat-crontab
index e83c6d9b3..9332c2ac5 100755
--- a/elements/heat-engine/install.d/20-heat-crontab
+++ b/elements/heat-engine/install.d/20-heat-crontab
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -ue
+
 # If https://bugs.launchpad.net/heat/+bug/1239377 is ever fixed we can
 # configure heat to purge automatically and remove this.
 cat <<EOF > /etc/cron.d/heat
diff --git a/elements/mariadb-dev/environment.d/20-mariadb b/elements/mariadb-dev/environment.d/20-mariadb
index b099e45dc..a75d0f16b 100755
--- a/elements/mariadb-dev/environment.d/20-mariadb
+++ b/elements/mariadb-dev/environment.d/20-mariadb
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ue
 
 # The mariadb download url arch values are not the same as ours
 if [ $ARCH = "i386" ]; then
diff --git a/elements/mysql/environment.d/20-percona b/elements/mysql/environment.d/20-percona
index aa99ce117..891e61bb7 100755
--- a/elements/mysql/environment.d/20-percona
+++ b/elements/mysql/environment.d/20-percona
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ue
 
 # The percona download url arch values are not the same as ours
 if [ $ARCH = "amd64" ]; then
diff --git a/elements/neutron-openvswitch-agent/install.d/90-disable-upstart-network-interface-logging b/elements/neutron-openvswitch-agent/install.d/90-disable-upstart-network-interface-logging
index 5e27cfc1a..f834b51c9 100755
--- a/elements/neutron-openvswitch-agent/install.d/90-disable-upstart-network-interface-logging
+++ b/elements/neutron-openvswitch-agent/install.d/90-disable-upstart-network-interface-logging
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -ue
+
 # potentially thousands of network interfaces on the system, we don't
 # want to overwhelm upstart with log pipes. This sends all of it to the
 # system console.
diff --git a/elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup b/elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup
index e1f3ad046..6c00e6c99 100755
--- a/elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup
+++ b/elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ue
 set -x
 
 SCRIPTDIR=$(dirname $0)
diff --git a/elements/neutron-server/install.d/neutron-source-install/80-neutron-server b/elements/neutron-server/install.d/neutron-source-install/80-neutron-server
index b5f4d9d0f..0651502f4 100755
--- a/elements/neutron-server/install.d/neutron-source-install/80-neutron-server
+++ b/elements/neutron-server/install.d/neutron-source-install/80-neutron-server
@@ -1,3 +1,5 @@
 #!/bin/bash
+set -ue
+
 os-svc-daemon -i "$NEUTRON_VENV_DIR" neutron-server neutron neutron-server \
     "--config-file /etc/neutron/neutron.conf  --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron"
diff --git a/elements/nova/os-refresh-config/configure.d/10-nova-state b/elements/nova/os-refresh-config/configure.d/10-nova-state
index d30464621..72a773546 100755
--- a/elements/nova/os-refresh-config/configure.d/10-nova-state
+++ b/elements/nova/os-refresh-config/configure.d/10-nova-state
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -ue
+
 [ -d /mnt/state/var/lib/nova ] && exit 0
 install -D -d -o nova -g nova -m 0775 /mnt/state/var/lib/nova
 [ -d /mnt/state/var/log/nova ] && exit 0
diff --git a/elements/ntp/install.d/50-ntp b/elements/ntp/install.d/50-ntp
index 2d6b39dad..4f97ae4b9 100755
--- a/elements/ntp/install.d/50-ntp
+++ b/elements/ntp/install.d/50-ntp
@@ -1,3 +1,5 @@
 #!/bin/bash
+set -ue
+
 # ntpdate is used when the network is brought up to correct any large time skew
 install-packages ntp ntpdate
diff --git a/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash b/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
index f84d80d1e..d5219b25e 100644
--- a/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
+++ b/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ue
 
 # ceilometerclient
 if [ -z "${CEILOMETERCLIENT_VENV_DIR:-}" ]; then
diff --git a/elements/os-apply-config/os-refresh-config/configure.d/50-os-config-applier b/elements/os-apply-config/os-refresh-config/configure.d/50-os-config-applier
index d23b68272..8dd2012a2 100755
--- a/elements/os-apply-config/os-refresh-config/configure.d/50-os-config-applier
+++ b/elements/os-apply-config/os-refresh-config/configure.d/50-os-config-applier
@@ -1,2 +1,4 @@
 #!/bin/bash
+set -ue
+
 exec os-apply-config
diff --git a/elements/qpidd/install.d/20-qpidd b/elements/qpidd/install.d/20-qpidd
index 5dbb4f140..91a539bfb 100755
--- a/elements/qpidd/install.d/20-qpidd
+++ b/elements/qpidd/install.d/20-qpidd
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -ue
 
 install-packages qpidd qpid-tools qpid-client
 
diff --git a/elements/tripleo-cd/configs/te_commonrc b/elements/tripleo-cd/configs/te_commonrc
index cdeb342c3..20a9f01ed 100644
--- a/elements/tripleo-cd/configs/te_commonrc
+++ b/elements/tripleo-cd/configs/te_commonrc
@@ -1,4 +1,5 @@
 #!/bin/bash
+# dib-lint: disable=sete
 
 source $TRIPLEO_ROOT/tripleo-incubator/scripts/set-os-type
 if [ $TRIPLEO_OS_DISTRO = "fedora" ] ; then
diff --git a/elements/tripleo-cd/configs/te_hp1rc b/elements/tripleo-cd/configs/te_hp1rc
index 8347a2951..c6b951dc4 100644
--- a/elements/tripleo-cd/configs/te_hp1rc
+++ b/elements/tripleo-cd/configs/te_hp1rc
@@ -1,4 +1,5 @@
 #!/bin/bash
+# dib-lint: disable=sete
 
 export TRIPLEO_ROOT="$(readlink -f $(dirname $0)/../../../..)"
 source $(dirname ${BASH_SOURCE})/te_commonrc
diff --git a/elements/tripleo-cd/configs/te_localrc b/elements/tripleo-cd/configs/te_localrc
index 7889e1c51..44618437a 100644
--- a/elements/tripleo-cd/configs/te_localrc
+++ b/elements/tripleo-cd/configs/te_localrc
@@ -1,4 +1,5 @@
 #!/bin/bash
+# dib-lint: disable=sete
 
 export TRIPLEO_ROOT="$(readlink -f $(dirname $0)/../../../..)"
 source $(dirname ${BASH_SOURCE})/te_commonrc
diff --git a/elements/tripleo-cd/configs/te_rh1rc b/elements/tripleo-cd/configs/te_rh1rc
index 35f2f7e79..97dd28c00 100644
--- a/elements/tripleo-cd/configs/te_rh1rc
+++ b/elements/tripleo-cd/configs/te_rh1rc
@@ -1,4 +1,5 @@
 #!/bin/bash
+# dib-lint: disable=sete
 
 export TRIPLEO_ROOT="$(readlink -f $(dirname $0)/../../../..)"
 source $(dirname ${BASH_SOURCE})/te_commonrc