diff --git a/init/bootstrap.go b/init/bootstrap.go
index 75d05897..11d4568d 100644
--- a/init/bootstrap.go
+++ b/init/bootstrap.go
@@ -77,7 +77,7 @@ outer:
 			"autoformat": {
 				Net:        "none",
 				Privileged: true,
-				Image:      "autoformat",
+				Image:      "rancher/os-autoformat:"+config.VERSION,
 				Command:    project.NewCommand(format),
 				Labels: project.NewSliceorMap(map[string]string{
 					config.DETACH: "false",
diff --git a/scripts/build-images b/scripts/build-images
index 8c1ca52e..b3bf970f 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -40,7 +40,7 @@ chmod +x ${INITRD_DIR}/docker                                               #ini
 
 ln -sf bin/rancheros ./ros
 
-for i in $(./ros c images -i os-config.yml); do
+for i in $(./ros c images -i os-config.yml) rancher/os-autoformat:${VERSION}; do
     docker pull ${i}
 done
-docker save $(./ros c images -i os-config.yml) > ${INITRD_DIR}/images.tar   #initrd2-images: /images.tar
+docker save $(./ros c images -i os-config.yml) rancher/os-autoformat:${VERSION} > ${INITRD_DIR}/images.tar   #initrd2-images: /images.tar