diff --git a/heat/cloudinit/config b/heat/cloudinit/config
index 173ed8cc0a..9ed9c89700 100644
--- a/heat/cloudinit/config
+++ b/heat/cloudinit/config
@@ -1,5 +1,5 @@
 runcmd:
- - setenforce 0 > /dev/null 2>&1 || :
+ - setenforce 0 > /dev/null 2>&1 || true
 
 user: ec2-user
 
@@ -11,3 +11,7 @@ cloud_config_modules:
  - update_etc_hosts
  - update_hostname
  - runcmd
+
+# Capture all subprocess output into a logfile
+# Useful for troubleshooting cloud-init issues
+output: {all: '| tee -a /var/log/cloud-init-output.log'}