diff --git a/quickstart/local/prep-ziti.sh b/quickstart/local/prep-ziti.sh
index ec1bb789e..16f839d39 100644
--- a/quickstart/local/prep-ziti.sh
+++ b/quickstart/local/prep-ziti.sh
@@ -13,7 +13,8 @@ sleep 2
 
 ziti edge controller login "${ZITI_EDGE_API_HOSTNAME}" -u "${ZITI_USER}" -p "${ZITI_PWD}" -c "${ZITI_PKI}/${ZITI_EDGE_ROOTCA_NAME}/certs/${ZITI_EDGE_INTERMEDIATE_NAME}.cert"
 
-ziti edge controller create edge-router-policy all --edge-router-roles @all --identity-roles @all
+ziti edge controller create edge-router-policy all --edge-router-roles '#all' --identity-roles '#all'
+ziti edge controller create service-edge-router-policy all --edge-router-roles '#all' --service-roles '#all'
 
 ziti-fabric create router "${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_ROUTER_BR_HOSTNAME}-client.cert"
 ziti-fabric create router "${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_ROUTER_BLUE_HOSTNAME}-client.cert"
diff --git a/quickstart/local/test-ziti.sh b/quickstart/local/test-ziti.sh
index 6adf4de9e..06345a193 100644
--- a/quickstart/local/test-ziti.sh
+++ b/quickstart/local/test-ziti.sh
@@ -1,8 +1,10 @@
-ziti edge controller create service netcat7256 localhost 7256 "${ZITI_ROUTER_BR_HOSTNAME}" tcp://localhost:7256
+ziti edge controller create config netcat ziti-tunneler-client.v1 '{ "hostname" : "localhost", "port" : 7256 }'
+
+ziti edge controller create service netcat7256 "${ZITI_ROUTER_BR_HOSTNAME}" tcp://localhost:7256 --configs netcat
 
 ziti edge controller create identity device "test_identity" -o "${ZITI_HOME}/test_identity".jwt
 
-ziti edge controller create service-policy dial-all Dial --service-roles @all --identity-roles @all
+ziti edge controller create service-policy dial-all Dial --service-roles '#all' --identity-roles '#all'
 
 ziti-enroller --jwt "${ZITI_HOME}/test_identity".jwt -o "${ZITI_HOME}/test_identity".json