diff --git a/hooks/centos-4/20-setup-yum b/hooks/centos-4/20-setup-yum
index b3a41ea..96c1f14 100755
--- a/hooks/centos-4/20-setup-yum
+++ b/hooks/centos-4/20-setup-yum
@@ -31,20 +31,15 @@ logMessage Script $0 starting
 #
 cp /etc/resolv.conf ${prefix}/etc
 
-
-#
-# Transform yum so that it works.
-#
-#perl -pi.bak -e 's/enabled=0/enabled=1/g'     ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/gpgcheck=1/gpgcheck=0/g'   ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/^\#baseurl/baseurl/g'      ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/^mirrorlist/#mirrorlist/g' ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/\$releasever/4/g' ${prefix}/etc/yum.repos.d/*.repo
-    
 #
 # Update yum
 #
-chroot ${prefix} /usr/bin/yum update
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
+chroot ${prefix} /usr/bin/yum  update
+umount ${prefix}/proc
 
 #
 #  Log our finish
diff --git a/hooks/centos-4/70-install-ssh b/hooks/centos-4/70-install-ssh
index a51e528..11dccfa 100755
--- a/hooks/centos-4/70-install-ssh
+++ b/hooks/centos-4/70-install-ssh
@@ -28,9 +28,12 @@ logMessage Script $0 starting
 #
 # Install the OpenSSH server.
 #
-chroot ${prefix} /bin/mount /proc
-chroot ${prefix} /usr/bin/yum -y install openssh-server
-chroot ${prefix} /bin/umount /proc
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
+chroot ${prefix} /usr/bin/yum  -y install openssh-server passwd
+umount ${prefix}/proc
 
 
 #
diff --git a/hooks/centos-4/99-clean-image b/hooks/centos-4/99-clean-image
index c068a94..105b5e9 100755
--- a/hooks/centos-4/99-clean-image
+++ b/hooks/centos-4/99-clean-image
@@ -36,7 +36,12 @@ find ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \;
 #  Clean yum
 #
 logMessage Cleaning Yum Repository
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
 chroot ${prefix} /usr/bin/yum clean all
+umount ${prefix}/proc
 
 #
 #  Log our finish
diff --git a/hooks/centos-5/20-setup-yum b/hooks/centos-5/20-setup-yum
index b3a41ea..a962f7e 100755
--- a/hooks/centos-5/20-setup-yum
+++ b/hooks/centos-5/20-setup-yum
@@ -32,19 +32,16 @@ logMessage Script $0 starting
 cp /etc/resolv.conf ${prefix}/etc
 
 
-#
-# Transform yum so that it works.
-#
-#perl -pi.bak -e 's/enabled=0/enabled=1/g'     ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/gpgcheck=1/gpgcheck=0/g'   ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/^\#baseurl/baseurl/g'      ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/^mirrorlist/#mirrorlist/g' ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/\$releasever/4/g' ${prefix}/etc/yum.repos.d/*.repo
-    
 #
 # Update yum
 #
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
 chroot ${prefix} /usr/bin/yum update
+umount ${prefix}/proc
+
 
 #
 #  Log our finish
diff --git a/hooks/centos-5/70-install-ssh b/hooks/centos-5/70-install-ssh
index a51e528..11dccfa 100755
--- a/hooks/centos-5/70-install-ssh
+++ b/hooks/centos-5/70-install-ssh
@@ -28,9 +28,12 @@ logMessage Script $0 starting
 #
 # Install the OpenSSH server.
 #
-chroot ${prefix} /bin/mount /proc
-chroot ${prefix} /usr/bin/yum -y install openssh-server
-chroot ${prefix} /bin/umount /proc
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
+chroot ${prefix} /usr/bin/yum  -y install openssh-server passwd
+umount ${prefix}/proc
 
 
 #
diff --git a/hooks/centos-5/99-clean-image b/hooks/centos-5/99-clean-image
index c068a94..46ce844 100755
--- a/hooks/centos-5/99-clean-image
+++ b/hooks/centos-5/99-clean-image
@@ -36,7 +36,14 @@ find ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \;
 #  Clean yum
 #
 logMessage Cleaning Yum Repository
-chroot ${prefix} /usr/bin/yum clean all
+
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
+chroot ${prefix} /usr/bin/yum  clean all
+umount ${prefix}/proc
+
 
 #
 #  Log our finish
diff --git a/hooks/fedora-core-6/20-setup-yum b/hooks/fedora-core-6/20-setup-yum
index b3a41ea..dfbf5e9 100755
--- a/hooks/fedora-core-6/20-setup-yum
+++ b/hooks/fedora-core-6/20-setup-yum
@@ -32,19 +32,16 @@ logMessage Script $0 starting
 cp /etc/resolv.conf ${prefix}/etc
 
 
-#
-# Transform yum so that it works.
-#
-#perl -pi.bak -e 's/enabled=0/enabled=1/g'     ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/gpgcheck=1/gpgcheck=0/g'   ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/^\#baseurl/baseurl/g'      ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/^mirrorlist/#mirrorlist/g' ${prefix}/etc/yum.repos.d/*.repo
-#perl -pi.bak -e 's/\$releasever/4/g' ${prefix}/etc/yum.repos.d/*.repo
     
 #
 # Update yum
 #
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
 chroot ${prefix} /usr/bin/yum update
+umount ${prefix}/proc
 
 #
 #  Log our finish
diff --git a/hooks/fedora-core-6/70-install-ssh b/hooks/fedora-core-6/70-install-ssh
index a51e528..dc64e76 100755
--- a/hooks/fedora-core-6/70-install-ssh
+++ b/hooks/fedora-core-6/70-install-ssh
@@ -28,9 +28,14 @@ logMessage Script $0 starting
 #
 # Install the OpenSSH server.
 #
-chroot ${prefix} /bin/mount /proc
-chroot ${prefix} /usr/bin/yum -y install openssh-server
-chroot ${prefix} /bin/umount /proc
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
+chroot ${prefix} /usr/bin/yum  -y install openssh-server passwd
+umount ${prefix}/proc
+
+
 
 
 #
diff --git a/hooks/fedora-core-6/99-clean-image b/hooks/fedora-core-6/99-clean-image
index c068a94..17ce0a6 100755
--- a/hooks/fedora-core-6/99-clean-image
+++ b/hooks/fedora-core-6/99-clean-image
@@ -36,7 +36,14 @@ find ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \;
 #  Clean yum
 #
 logMessage Cleaning Yum Repository
+
+if [ ! -d ${prefix}/proc ]; then
+    mkdir -p ${prefix}/proc
+fi
+mount -o bind /proc ${prefix}/proc
 chroot ${prefix} /usr/bin/yum clean all
+umount ${prefix}/proc
+
 
 #
 #  Log our finish