diff --git a/jeos/CentOS-6.3-x86_64-cfntools.tdl b/jeos/CentOS-6.3-x86_64-cfntools.tdl
index 3f2eeccb..3c8e6270 100644
--- a/jeos/CentOS-6.3-x86_64-cfntools.tdl
+++ b/jeos/CentOS-6.3-x86_64-cfntools.tdl
@@ -10,6 +10,9 @@
CentOS 6.3
+
+passwd -l root
+
cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
DEVICE="eth0"
diff --git a/jeos/F16-i386-cfntools.tdl b/jeos/F16-i386-cfntools.tdl
index b24c0310..eb08ff43 100644
--- a/jeos/F16-i386-cfntools.tdl
+++ b/jeos/F16-i386-cfntools.tdl
@@ -10,6 +10,9 @@
Fedora 16
+
+passwd -l root
+
yum -y update fedora-release
yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-pip
diff --git a/jeos/F16-x86_64-cfntools-openshift.tdl b/jeos/F16-x86_64-cfntools-openshift.tdl
index ea0f8cbf..c83f715c 100644
--- a/jeos/F16-x86_64-cfntools-openshift.tdl
+++ b/jeos/F16-x86_64-cfntools-openshift.tdl
@@ -10,6 +10,9 @@
Fedora 16 base OpenShift Install
+
+passwd -l root
+
yum -y update fedora-release
yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-boto
diff --git a/jeos/F16-x86_64-cfntools.tdl b/jeos/F16-x86_64-cfntools.tdl
index 43e94263..86395aeb 100644
--- a/jeos/F16-x86_64-cfntools.tdl
+++ b/jeos/F16-x86_64-cfntools.tdl
@@ -10,6 +10,9 @@
Fedora 16
+
+passwd -l root
+
yum -y update fedora-release
yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-pip
diff --git a/jeos/F17-i386-cfntools.tdl b/jeos/F17-i386-cfntools.tdl
index 08b9824b..5a341ff7 100644
--- a/jeos/F17-i386-cfntools.tdl
+++ b/jeos/F17-i386-cfntools.tdl
@@ -10,6 +10,9 @@
Fedora 17
+
+passwd -l root
+
yum -y update fedora-release
yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-pip
diff --git a/jeos/F17-x86_64-cfntools.tdl b/jeos/F17-x86_64-cfntools.tdl
index 1d0a0f8c..90e787b2 100644
--- a/jeos/F17-x86_64-cfntools.tdl
+++ b/jeos/F17-x86_64-cfntools.tdl
@@ -10,6 +10,9 @@
Fedora 17
+
+passwd -l root
+
yum -y update fedora-release
yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-pip
diff --git a/jeos/F18-i386-cfntools.tdl b/jeos/F18-i386-cfntools.tdl
index 634fbba5..11c5f0ff 100644
--- a/jeos/F18-i386-cfntools.tdl
+++ b/jeos/F18-i386-cfntools.tdl
@@ -10,6 +10,9 @@
Fedora 18
+
+passwd -l root
+
yum -y update fedora-release
yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-pip python-boto
diff --git a/jeos/F18-x86_64-cfntools.tdl b/jeos/F18-x86_64-cfntools.tdl
index 9065dc57..103f5139 100644
--- a/jeos/F18-x86_64-cfntools.tdl
+++ b/jeos/F18-x86_64-cfntools.tdl
@@ -10,6 +10,9 @@
Fedora 18
+
+passwd -l root
+
yum -y update fedora-release
yum -y install yum-plugin-fastestmirror cloud-init python-psutil python-pip python-boto
diff --git a/jeos/U10-amd64-cfntools.tdl b/jeos/U10-amd64-cfntools.tdl
index 95e4e5bf..4f2d0d9a 100644
--- a/jeos/U10-amd64-cfntools.tdl
+++ b/jeos/U10-amd64-cfntools.tdl
@@ -10,6 +10,9 @@
Ubuntu 10.04
+
+passwd -l root
+
apt-get -y update
apt-get -y upgrade
diff --git a/jeos/U12.10-amd64-cfntools.tdl b/jeos/U12.10-amd64-cfntools.tdl
index 83aabfeb..4ca4a78b 100644
--- a/jeos/U12.10-amd64-cfntools.tdl
+++ b/jeos/U12.10-amd64-cfntools.tdl
@@ -10,6 +10,9 @@
Ubuntu 12.10
+
+passwd -l root
+
apt-get -y update
apt-get -y upgrade
diff --git a/jeos/U12.10-i386-cfntools.tdl b/jeos/U12.10-i386-cfntools.tdl
index 8d899aaa..57e8b7ef 100644
--- a/jeos/U12.10-i386-cfntools.tdl
+++ b/jeos/U12.10-i386-cfntools.tdl
@@ -10,6 +10,9 @@
Ubuntu 12.10
+
+passwd -l root
+
apt-get -y update
apt-get -y upgrade
diff --git a/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl b/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl
index 247994cc..70b872d5 100644
--- a/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl
+++ b/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl
@@ -34,6 +34,9 @@ gpgcheck=0
+
+passwd -l root
+
/usr/sbin/useradd ec2-user
echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
diff --git a/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl b/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl
index ef97675c..4c46fa8a 100644
--- a/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl
+++ b/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl
@@ -34,6 +34,9 @@ gpgcheck=0
+
+passwd -l root
+
/usr/sbin/useradd ec2-user
echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers