diff --git a/build.sh b/build.sh
index 7939780..c36d727 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 # FIXME: Use system Packer if possible
 #PACKER=$(which packer)
diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh
index 3861e2b..f018ec9 100644
--- a/scripts/installSoftware.sh
+++ b/scripts/installSoftware.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 echo "--- Current environment:"
 /usr/bin/env