diff --git a/quickstart/docker/image/env.sh b/quickstart/docker/image/env.sh
index 55d571891..e38f6e95f 100755
--- a/quickstart/docker/image/env.sh
+++ b/quickstart/docker/image/env.sh
@@ -25,11 +25,11 @@ export ZITI_FAB_CTRL_PORT="6262"
 if [[ "${ZITI_CONTROLLER_RAWNAME}" == "" ]]; then export ZITI_CONTROLLER_RAWNAME="${ZITI_NETWORK}-controller"; fi
 if [[ "${ZITI_EDGE_CONTROLLER_RAWNAME}" == "" ]]; then export ZITI_EDGE_CONTROLLER_RAWNAME="${ZITI_NETWORK}-edge-controller"; fi
 if [[ "${ZITI_EDGE_ROUTER_RAWNAME}" == "" ]]; then export ZITI_EDGE_ROUTER_RAWNAME="${ZITI_NETWORK}-edge-router"; fi
-if [[ "${ZITI_EDGE_WSS_ROUTER_RAWNAME}" == "" ]]; then export ZITI_EDGE_WSS_ROUTER_RAWNAME="${ZITI_NETWORK}-controller"; fi
-if [[ "${ZITI_ROUTER_BR_RAWNAME}" == "" ]]; then export ZITI_ROUTER_BR_RAWNAME="${ZITI_NETWORK}-controller"; fi
-if [[ "${ZITI_ROUTER_BLUE_RAWNAME}" == "" ]]; then export ZITI_ROUTER_BLUE_RAWNAME="${ZITI_NETWORK}-controller"; fi
-if [[ "${ZITI_ROUTER_RED_RAWNAME}" == "" ]]; then export ZITI_ROUTER_RED_RAWNAME="${ZITI_NETWORK}-controller"; fi
-if [[ "${ZITI_ZAC_RAWNAME}" == "" ]]; then export ZITI_ZAC_RAWNAME="${ZITI_NETWORK}-controller"; fi
+if [[ "${ZITI_EDGE_WSS_ROUTER_RAWNAME}" == "" ]]; then export ZITI_EDGE_WSS_ROUTER_RAWNAME="${ZITI_NETWORK}-wss-edge-router"; fi
+if [[ "${ZITI_ROUTER_BR_RAWNAME}" == "" ]]; then export ZITI_ROUTER_BR_RAWNAME="${ZITI_NETWORK}-edge-router-br"; fi
+if [[ "${ZITI_ROUTER_BLUE_RAWNAME}" == "" ]]; then export ZITI_ROUTER_BLUE_RAWNAME="${ZITI_NETWORK}-edge-router-blue"; fi
+if [[ "${ZITI_ROUTER_RED_RAWNAME}" == "" ]]; then export ZITI_ROUTER_RED_RAWNAME="${ZITI_NETWORK}-edge-router-red"; fi
+if [[ "${ZITI_ZAC_RAWNAME}" == "" ]]; then export ZITI_ZAC_RAWNAME="${ZITI_NETWORK}-zac"; fi
 
 export ZITI_PKI="${ZITI_HOME}/pki"
 export ZITI_EDGE_CONTROLLER_PORT="1280"