diff --git a/jobs/harbor/templates/bin/ctl.erb b/jobs/harbor/templates/bin/ctl.erb
index 6a7c1d4..199a711 100644
--- a/jobs/harbor/templates/bin/ctl.erb
+++ b/jobs/harbor/templates/bin/ctl.erb
@@ -17,7 +17,7 @@ DOCKER_PACKAGE_DIR=${PACKAGE_DIR}/docker
 HARBOR_YAML=${HARBOR_PACKAGE_DIR}/docker-compose.yml
 HARBOR_CLAIR_YAML=${HARBOR_PACKAGE_DIR}/docker-compose.clair.yml
 HARBOR_NOTARY_YAML=${HARBOR_PACKAGE_DIR}/docker-compose.notary.yml
-IMAGES_TAR_PATH=${HARBOR_PACKAGE_DIR}/harbor*.tar.gz
+IMAGES_TAR_PATH=${HARBOR_PACKAGE_DIR}/harbor*.tar
 
 CTL_CMD=/sbin/start-stop-daemon
 COMPOSE_CMD=${COMPOSE_PACKAGE_DIR}/bin/docker-compose
diff --git a/packages/docker/packaging b/packages/docker/packaging
index b37a3dc..c51fbb0 100644
--- a/packages/docker/packaging
+++ b/packages/docker/packaging
@@ -6,9 +6,8 @@ DOCKER_VERSION=`ls -r docker/docker-*.tgz | sed 's/docker\/docker-\(.*\)\.tgz/\1
 
 # Extract docker package
 echo "Extracting docker ${DOCKER_VERSION}..."
-tar xzvf ${BOSH_COMPILE_TARGET}/docker/docker-${DOCKER_VERSION}.tgz
-if [[ $? != 0 ]] ; then
-  echo "Failed extracting docker ${DOCKER_VERSION}"
+if ! tar -xzvf ${BOSH_COMPILE_TARGET}/docker/docker-${DOCKER_VERSION}.tgz ; then
+  echo "Failed to extract docker ${DOCKER_VERSION} tarball"
   exit 1
 fi
 
@@ -16,4 +15,3 @@ echo "Copying docker ${DOCKER_VERSION} binaries..."
 mkdir -p ${BOSH_INSTALL_TARGET}/bin
 cp docker/* ${BOSH_INSTALL_TARGET}/bin
 chmod +x ${BOSH_INSTALL_TARGET}/bin/*
-
diff --git a/packages/harbor-app/packaging b/packages/harbor-app/packaging
index 1034151..397fcc4 100644
--- a/packages/harbor-app/packaging
+++ b/packages/harbor-app/packaging
@@ -5,14 +5,15 @@ source /var/vcap/packages/harbor-common/common.sh
 
 #Extract harbor package to the destination folder
 echo "Extracting Harbor ${HARBOR_FULL_VERSION}..."
-tar xzvf ${BOSH_COMPILE_TARGET}/harbor/harbor-offline-installer-*.tgz
-if [[ $? != 0 ]] ; then
-  echo "Failed to extract Harbor ${HARBOR_FULL_VERSION}"
+file=`ls ${BOSH_COMPILE_TARGET}/harbor/harbor-offline-installer-*.tgz`
+if ! tar -xzvf $file --strip 1 -C ${BOSH_INSTALL_TARGET} ; then
+  echo "Failed to extract Harbor ${HARBOR_FULL_VERSION} tarball"
   exit 1
 fi
 
-#Copy the Harbor files to destination folder
-cp -a ${BOSH_COMPILE_TARGET}/harbor/* ${BOSH_INSTALL_TARGET}/
 chmod +x ${BOSH_INSTALL_TARGET}/*.sh
 chmod +x ${BOSH_INSTALL_TARGET}/prepare
 
+#Unzip the harbor images tgz file to a tar file,
+#then docker loading images in 'ctl start' could be faster.
+gunzip ${BOSH_INSTALL_TARGET}/harbor*.tar.gz