diff --git a/contrib/images/digitalocean/in_parts/011-docker b/contrib/images/digitalocean/in_parts/011-docker
index 65d2955e3..31942d492 100755
--- a/contrib/images/digitalocean/in_parts/011-docker
+++ b/contrib/images/digitalocean/in_parts/011-docker
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+set -o errexit
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/contrib/images/digitalocean/in_parts/011-ssh-message b/contrib/images/digitalocean/in_parts/011-ssh-message
index da7a0b5df..83db94286 100755
--- a/contrib/images/digitalocean/in_parts/011-ssh-message
+++ b/contrib/images/digitalocean/in_parts/011-ssh-message
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+set -o errexit
 
 echo '--> Prevent login until after setup is complete'
 # Be a bit of a dork about login in
diff --git a/contrib/images/digitalocean/in_parts/012-dokku-packages b/contrib/images/digitalocean/in_parts/012-dokku-packages
index 251c6df9f..3f2834e08 100755
--- a/contrib/images/digitalocean/in_parts/012-dokku-packages
+++ b/contrib/images/digitalocean/in_parts/012-dokku-packages
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+set -o errexit
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/contrib/images/digitalocean/in_parts/012-grub-opts b/contrib/images/digitalocean/in_parts/012-grub-opts
index 72b471c77..fbb043cb5 100755
--- a/contrib/images/digitalocean/in_parts/012-grub-opts
+++ b/contrib/images/digitalocean/in_parts/012-grub-opts
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+set -o errexit
 
 echo '--> Update grub boot loader'
 sed -e 's|GRUB_CMDLINE_LINUX="|GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1|g' \
diff --git a/contrib/images/digitalocean/in_parts/014-docker-dns b/contrib/images/digitalocean/in_parts/014-docker-dns
index acd43f6ba..e3b509edc 100755
--- a/contrib/images/digitalocean/in_parts/014-docker-dns
+++ b/contrib/images/digitalocean/in_parts/014-docker-dns
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+set -o errexit
 
 echo '--> Enable Google DNS for Docker'
 sed -e 's|#DOCKER_OPTS|DOCKER_OPTS|g' \
diff --git a/contrib/images/digitalocean/in_parts/014-ufw-rules b/contrib/images/digitalocean/in_parts/014-ufw-rules
index 0488f0d1e..957728b28 100755
--- a/contrib/images/digitalocean/in_parts/014-ufw-rules
+++ b/contrib/images/digitalocean/in_parts/014-ufw-rules
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+set -o errexit
 
 echo '--> Enable and configure UFW'
 sed -e 's|DEFAULT_FORWARD_POLICY=.*|DEFAULT_FORWARD_POLICY="ACCEPT"|g' \
diff --git a/contrib/images/digitalocean/in_parts/099-application_tag b/contrib/images/digitalocean/in_parts/099-application_tag
index 9bd9bff61..97a1f1617 100755
--- a/contrib/images/digitalocean/in_parts/099-application_tag
+++ b/contrib/images/digitalocean/in_parts/099-application_tag
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+set -o errexit
 
 echo '--> Write the application info'
 application_version="$DOKKU_VERSION"
diff --git a/contrib/images/digitalocean/in_parts/099-cleanup b/contrib/images/digitalocean/in_parts/099-cleanup
index afb21bdfa..8c449f928 100755
--- a/contrib/images/digitalocean/in_parts/099-cleanup
+++ b/contrib/images/digitalocean/in_parts/099-cleanup
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+set -o errexit
 
 echo '--> Cleaning up'
 rm -rf /tmp/* /var/tmp/*