diff --git a/stage3/03-crankshaft-base/02-run-chroot.sh b/stage3/03-crankshaft-base/02-run-chroot.sh
index eba69884..ddb0b471 100755
--- a/stage3/03-crankshaft-base/02-run-chroot.sh
+++ b/stage3/03-crankshaft-base/02-run-chroot.sh
@@ -193,7 +193,7 @@ sed -i 's/#Banner none/Banner \/etc\/issue.net/' /etc/ssh/sshd_config
 sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' /etc/ssh/sshd_config
 
 # OS Name
-STRING="Welcome to Crankshaft CarOS (${IMG_DATE} / Build ${BUILDHASH})"
+STRING="Welcome to Crankshaft CarOS (${IMG_DATE} / Build ${GIT_HASH})"
 #sed -i "s/PRETTY_NAME=.*/PRETTY_NAME=${STRING}/g" /usr/lib/os-release
 cp /usr/lib/os-release /usr/lib/os-release.bak
 sed -i '/PRETTY_NAME=/d' /usr/lib/os-release.bak
diff --git a/stage3/03-crankshaft-base/05-run-chroot.sh b/stage3/03-crankshaft-base/05-run-chroot.sh
index 15d1ea13..df844ea5 100644
--- a/stage3/03-crankshaft-base/05-run-chroot.sh
+++ b/stage3/03-crankshaft-base/05-run-chroot.sh
@@ -1,13 +1,13 @@
 #!/bin/bash -e
 
 cat > /etc/crankshaft.date << EOF
-${BUILDDATE}
+${IMG_DATE}
 EOF
 
 cat > /etc/crankshaft.build << EOF
-${BUILDHASH}
+${GIT_HASH}
 EOF
 
 cat > /etc/crankshaft.branch << EOF
-${BUILDBRANCH}
+${GIT_BRANCH}
 EOF