diff --git a/salt/registry/init.sls b/salt/registry/init.sls
index 9ee44d1de..6e17d639e 100644
--- a/salt/registry/init.sls
+++ b/salt/registry/init.sls
@@ -40,7 +40,7 @@ dockerregistryconf:
 # Install the registry container
 so-dockerregistry:
   docker_container.running:
-    - image: registry:2
+    - image: registry:latest
     - hostname: so-registry
     - restart_policy: always
     - port_bindings:
diff --git a/setup/so-functions b/setup/so-functions
index b52868ca8..741929399 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -998,7 +998,7 @@ install_cleanup() {
 import_registry_docker() {
 	if [ -f /nsm/docker-registry/docker/registry_image.tar ]; then
 	  logCmd "service docker start"
-	  logCmd "docker import /nsm/docker-registry/docker/registry_image.tar registry:2" 
+	  logCmd "docker load -i /nsm/docker-registry/docker/registry_image.tar" 
 	else
 	  info "Need to download registry"
 	fi