diff --git a/quickstart/docker/README.md b/quickstart/docker/README.md
index 96707368c..1bea586a7 100644
--- a/quickstart/docker/README.md
+++ b/quickstart/docker/README.md
@@ -22,6 +22,5 @@ Build Docker Image For Publication
 2. 
 Push Docker Image to dockerhub
 ------------------
-1. retag the image locally to match the expected version: `docker push openziti/quickstart:0.19.3`
-1. push the latest: `docker push openziti/quickstart`
-1. push the versioned tag: `docker push openziti/quickstart:0.19.3`
+1. source `./image/ziti-cli-functions.sh`
+1. just run `./pushLatestDocker.sh`
\ No newline at end of file
diff --git a/quickstart/docker/attach.container.to.compose.sh b/quickstart/docker/attach.container.to.compose.sh
index ae92d8bde..869485d01 100644
--- a/quickstart/docker/attach.container.to.compose.sh
+++ b/quickstart/docker/attach.container.to.compose.sh
@@ -1 +1 @@
-docker run --network docker_zitiblue --rm -it openziti/quickstart /bin/bash
+docker run -v docker_ziti-fs:/openziti --network docker_zitiblue --rm -it openziti/quickstart /bin/bash
diff --git a/quickstart/docker/image/run-router.sh b/quickstart/docker/image/run-router.sh
index bb92f3595..ce98e425a 100755
--- a/quickstart/docker/image/run-router.sh
+++ b/quickstart/docker/image/run-router.sh
@@ -42,12 +42,16 @@ if [[ "$1" == "private" ]]; then
 fi
 
 echo "----------  Creating edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
-"${ZITI_BIN_DIR}/ziti" edge delete edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}"
-"${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" -t -a "${ZITI_EDGE_ROUTER_ROLES}"
-sleep 1
-echo "---------- Enrolling edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
-"${ZITI_BIN_DIR}/ziti-router" enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt"
-echo ""
+found=$(ziti edge list edge-routers 'name = "'"${ZITI_EDGE_ROUTER_HOSTNAME}"'"' | grep -c "${ZITI_EDGE_ROUTER_HOSTNAME}")
+if [[ found -gt 0 ]]; then
+  echo "----------  Found existing edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
+else
+  "${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" -t -a "${ZITI_EDGE_ROUTER_ROLES}"
+  sleep 1
+  echo "---------- Enrolling edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
+  "${ZITI_BIN_DIR}/ziti-router" enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt"
+  echo ""
+fi
 
 "${ZITI_BIN_DIR}/ziti-router" run "${ZITI_HOME}/${ZITI_EDGE_ROUTER_RAWNAME}.yaml" > "${ZITI_HOME}/ziti-${ZITI_EDGE_ROUTER_HOSTNAME}.log"
 
diff --git a/quickstart/docker/pushLatestDocker.sh b/quickstart/docker/pushLatestDocker.sh
index 1a26f561f..17da18e70 100755
--- a/quickstart/docker/pushLatestDocker.sh
+++ b/quickstart/docker/pushLatestDocker.sh
@@ -16,7 +16,7 @@ if [ -d "${ZITI_BIN_ROOT}/image/ziti.ignore" ]; then
   rm -rf "${ZITI_BIN_ROOT}/image/ziti.ignore"
 fi
 
-getLatestZiti
+getZiti
 
 mv "${ZITI_BIN_DIR}" "${SCRIPT_DIR}/image/ziti.ignore/"
 docker build "${SCRIPT_DIR}/image" -t openziti/quickstart