diff --git a/setup/so-functions b/setup/so-functions
index 7468ec01b..2d16cdc60 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -942,6 +942,15 @@ install_cleanup() {
 
 }
 
+import_registry_docker() {
+	if [ -f /nsm/docker-registry/docker/registry_image.tar ]; then
+	  service docker start
+	  docker import /nsm/docker-registry/docker/registry_image.tar registry:2
+	else
+	  echo "Need to download registry"
+	fi
+}
+
 manager_pillar() {
 
 	local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls
diff --git a/setup/so-setup b/setup/so-setup
index 7d9320b02..45b08433f 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -543,7 +543,7 @@ fi
 		else
 			set_progress_str 26 'Downloading containers from the internet'
 		fi
-
+        import_registry_docker >> $setup_log 2>&1
 		salt-call state.apply -l info registry >> $setup_log 2>&1
 		docker_seed_registry  2>> "$setup_log" # ~ 60% when finished