diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/ec2-ssh-key b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/ec2-ssh-key
index bdd50d4b23..65dfeaae55 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/ec2-ssh-key
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/ec2-ssh-key
@@ -1,6 +1,4 @@
-#!/bin/sh
-
-set -e
+#!/bin/sh -e
 
 KEY_URL="http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-setup-environment
index 4b93cb80ec..0ffd55d92f 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-setup-environment
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-setup-environment
@@ -1,4 +1,4 @@
-#!/bin/bash +x
+#!/bin/bash -e
 
 ENV=$1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-ssh-key b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-ssh-key
index f354b9260b..2820a99494 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-ssh-key
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/gce-ssh-key
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 set -e
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment
index 58119841da..2e5f9c1bd0 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/coreos-setup-environment
@@ -1,4 +1,4 @@
-#!/bin/bash +x
+#!/bin/bash -e
 
 ENV=$1