diff --git a/quickstart/docker/image/create-controller-config.sh b/quickstart/docker/image/create-controller-config.sh
index f5c9af918..6e99737d1 100755
--- a/quickstart/docker/image/create-controller-config.sh
+++ b/quickstart/docker/image/create-controller-config.sh
@@ -143,9 +143,5 @@ web:
         options: { }
       - binding: edge-client
         options: { }
-    apis:
-      - binding: edge-management
-        options: { }
-      - binding: edge-client
-        options: { }
+
 HereDocForEdgeConfiguration
diff --git a/quickstart/docker/image/create-edge-router-config.sh b/quickstart/docker/image/create-edge-router-config.sh
index 16b1e64ec..6ab147e10 100755
--- a/quickstart/docker/image/create-edge-router-config.sh
+++ b/quickstart/docker/image/create-edge-router-config.sh
@@ -3,10 +3,10 @@ cat > ${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml <<HereDocForEdgeRouter
 v: 3
 
 identity:
-  cert:                 ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-client.cert
-  server_cert:          ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.cert
-  key:                  ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/keys/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.key
-  ca:                   ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.chain.pem
+  cert:                 ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-client.cert
+  server_cert:          ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-server.cert
+  key:                  ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/keys/${ZITI_EDGE_ROUTER_HOSTNAME}-server.key
+  ca:                   ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-server.chain.pem
 
 ctrl:
   endpoint:             tls:${ZITI_CONTROLLER_HOSTNAME}:${ZITI_FAB_CTRL_PORT}
diff --git a/quickstart/docker/image/create-edge-router-wss-config.sh b/quickstart/docker/image/create-edge-router-wss-config.sh
index f42e92f0a..2f9c49a49 100755
--- a/quickstart/docker/image/create-edge-router-wss-config.sh
+++ b/quickstart/docker/image/create-edge-router-wss-config.sh
@@ -3,10 +3,10 @@ cat > ${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml <<HereDocForEdgeRouter
 v: 3
 
 identity:
-  cert:                 ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-client.cert
-  server_cert:          ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.cert
-  key:                  ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/keys/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.key
-  ca:                   ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.chain.pem
+  cert:                 ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-client.cert
+  server_cert:          ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-server.cert
+  key:                  ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/keys/${ZITI_EDGE_ROUTER_HOSTNAME}-server.key
+  ca:                   ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-server.chain.pem
 
 ctrl:
   endpoint:             tls:${ZITI_CONTROLLER_HOSTNAME}:${ZITI_FAB_CTRL_PORT}
diff --git a/quickstart/docker/image/create-pki.sh b/quickstart/docker/image/create-pki.sh
index 370c181f3..c6193a303 100755
--- a/quickstart/docker/image/create-pki.sh
+++ b/quickstart/docker/image/create-pki.sh
@@ -1,60 +1,6 @@
 #!/bin/bash
-function pki_client_server {
-  name_local=$1
-  ZITI_CA_NAME_local=$2
-  ip_local=$3
 
-  if [[ "${ip_local}" == "" ]]; then
-    ip_local="127.0.0.1"
-  fi
-
-  if ! test -f "${ZITI_PKI}/${ZITI_CA_NAME_local}/keys/${name_local}-server.key"; then
-    echo "Creating server cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
-    ziti pki create server --pki-root="${ZITI_PKI}" --ca-name "${ZITI_CA_NAME_local}" \
-          --server-file "${name_local}-server" \
-          --dns "${name_local},localhost" --ip "${ip_local}" \
-          --server-name "${name_local} server certificate"
-  else
-    echo "Creating server cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
-    echo "key exists"
-  fi
-
-  if ! test -f "${ZITI_PKI}/${ZITI_CA_NAME_local}/keys/${name_local}-client.key"; then
-    echo "Creating client cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
-    ziti pki create client --pki-root="${ZITI_PKI}" --ca-name "${ZITI_CA_NAME_local}" \
-          --client-file "${name_local}-client" \
-          --key-file "${name_local}-server" \
-          --client-name "${name_local}"
-  else
-    echo "Creating client cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
-    echo "key exists"
-  fi
-  echo " "
-}
-
-function pki_create_ca {
-  if ! test -f "${ZITI_PKI}/${1}/keys/${1}.key"; then
-    echo "Creating CA: ${1}"
-    ziti pki create ca --pki-root="${ZITI_PKI}" --ca-file="${1}" --ca-name="${1} Root CA"
-  else
-    echo "Creating CA: ${1}"
-    echo "key exists"
-  fi
-  echo " "
-}
-
-function pki_create_intermediate {
-  if ! test -f "${ZITI_PKI}/${2}/keys/${2}.key"; then
-    echo "Creating intermediate: ${1} ${2} ${3}"
-    ziti pki create intermediate --pki-root "${ZITI_PKI}" --ca-name "${1}" \
-          --intermediate-name "${2}" \
-          --intermediate-file "${2}" --max-path-len ${3}
-  else
-    echo "Creating intermediate: ${1} ${2} ${3}"
-    echo "key exists"
-  fi
-  echo " "
-}
+source ./pki-functions.sh
 
 pki_create_ca "${ZITI_CONTROLLER_ROOTCA_NAME}"
 pki_create_ca "${ZITI_EDGE_CONTROLLER_ROOTCA_NAME}"
diff --git a/quickstart/docker/image/create-private-router-config.sh b/quickstart/docker/image/create-private-router-config.sh
index 3816ca2ed..ba11057c1 100755
--- a/quickstart/docker/image/create-private-router-config.sh
+++ b/quickstart/docker/image/create-private-router-config.sh
@@ -3,10 +3,10 @@ cat > ${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml <<HereDocForEdgeRouter
 v: 3
 
 identity:
-  cert:                 ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-client.cert
-  server_cert:          ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.cert
-  key:                  ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/keys/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.key
-  ca:                   ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-router-server.chain.pem
+  cert:                 ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-client.cert
+  server_cert:          ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-server.cert
+  key:                  ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/keys/${ZITI_EDGE_ROUTER_HOSTNAME}-server.key
+  ca:                   ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_EDGE_ROUTER_HOSTNAME}-server.chain.pem
 
 ctrl:
   endpoint:             tls:${ZITI_CONTROLLER_HOSTNAME}:${ZITI_FAB_CTRL_PORT}
diff --git a/quickstart/docker/image/create-router-pki.sh b/quickstart/docker/image/create-router-pki.sh
index 620ed1b5b..64f22c0ea 100755
--- a/quickstart/docker/image/create-router-pki.sh
+++ b/quickstart/docker/image/create-router-pki.sh
@@ -1,30 +1,5 @@
 #!/bin/bash
-function pki_client_server {
-  name_local=$1
-  ZITI_CA_NAME_local=$2
 
-  if ! test -f "${ZITI_PKI}/${ZITI_CA_NAME_local}/keys/${name_local}-server.key"; then
-    echo "Creating server cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
-    ziti pki create server --pki-root="${ZITI_PKI}" --ca-name "${ZITI_CA_NAME_local}" \
-          --server-file "${name_local}-server" \
-          --dns "${name_local},localhost" --ip 127.0.0.1 \
-          --server-name "${name_local} server certificate"
-  else
-    echo "Creating server cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
-    echo "key exists"
-  fi
-
-  if ! test -f "${ZITI_PKI}/${ZITI_CA_NAME_local}/keys/${name_local}-client.key"; then
-    echo "Creating client cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
-    ziti pki create client --pki-root="${ZITI_PKI}" --ca-name "${ZITI_CA_NAME_local}" \
-          --client-file "${name_local}-client" \
-          --key-file "${name_local}-server" \
-          --client-name "${name_local}"
-  else
-    echo "Creating client cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
-    echo "key exists"
-  fi
-  echo " "
-}
+source ./pki-functions.sh
 
 pki_client_server "${ZITI_EDGE_ROUTER_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}" "${ZITI_EDGE_ROUTER_IP_OVERRIDE}"
diff --git a/quickstart/docker/image/pki-functions.sh b/quickstart/docker/image/pki-functions.sh
new file mode 100644
index 000000000..0675af57c
--- /dev/null
+++ b/quickstart/docker/image/pki-functions.sh
@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+
+function pki_client_server {
+  name_local=$1
+  ZITI_CA_NAME_local=$2
+  ip_local=$3
+
+  if [[ "${ip_local}" == "" ]]; then
+    ip_local="127.0.0.1"
+  fi
+
+  if ! test -f "${ZITI_PKI}/${ZITI_CA_NAME_local}/keys/${name_local}-server.key"; then
+    echo "Creating server cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
+    ziti pki create server --pki-root="${ZITI_PKI}" --ca-name "${ZITI_CA_NAME_local}" \
+          --server-file "${name_local}-server" \
+          --dns "${name_local},localhost" --ip "${ip_local}" \
+          --server-name "${name_local} server certificate"
+  else
+    echo "Creating server cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
+    echo "key exists"
+  fi
+
+  if ! test -f "${ZITI_PKI}/${ZITI_CA_NAME_local}/keys/${name_local}-client.key"; then
+    echo "Creating client cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
+    ziti pki create client --pki-root="${ZITI_PKI}" --ca-name "${ZITI_CA_NAME_local}" \
+          --client-file "${name_local}-client" \
+          --key-file "${name_local}-server" \
+          --client-name "${name_local}"
+  else
+    echo "Creating client cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
+    echo "key exists"
+  fi
+  echo " "
+}
+
+function pki_create_ca {
+  if ! test -f "${ZITI_PKI}/${1}/keys/${1}.key"; then
+    echo "Creating CA: ${1}"
+    ziti pki create ca --pki-root="${ZITI_PKI}" --ca-file="${1}" --ca-name="${1} Root CA"
+  else
+    echo "Creating CA: ${1}"
+    echo "key exists"
+  fi
+  echo " "
+}
+
+function pki_create_intermediate {
+  if ! test -f "${ZITI_PKI}/${2}/keys/${2}.key"; then
+    echo "Creating intermediate: ${1} ${2} ${3}"
+    ziti pki create intermediate --pki-root "${ZITI_PKI}" --ca-name "${1}" \
+          --intermediate-name "${2}" \
+          --intermediate-file "${2}" --max-path-len ${3}
+  else
+    echo "Creating intermediate: ${1} ${2} ${3}"
+    echo "key exists"
+  fi
+  echo " "
+}
+function yaml2json()
+{
+    ruby -ryaml -rjson -e 'puts JSON.pretty_generate(YAML.load(ARGF))' $*
+}
+
+function printUsage()
+{
+    echo "Usage: $1 [cert to test] [ca pool to use]"
+}
+
+function verifyCertAgainstPool()
+{
+    if [[ "" == "$1" ]]
+    then
+        printUsage "verifyCertAgainstPool"
+        return 1
+    fi
+
+    if [[ "" == "$2" ]]
+    then
+        printUsage "verifyCertAgainstPool"
+        return 1
+    fi
+
+    echo "    Verifying that this certificate:"
+    echo "        - $1"
+    echo "    is valid for this ca pool:"
+    echo "        - $2"
+    echo ""
+    openssl verify -partial_chain -CAfile "$2" "$1"
+    if [ $? -eq 0 ]; then
+        echo ""
+        echo "============      SUCCESS!      ============"
+    else
+        echo ""
+        echo "============ FAILED TO VALIDATE ============"
+    fi
+}
+
+function showIssuerAndSubjectForPEM()
+{
+    echo "Displaying Issuer and Subject for cert pool:"
+    echo "    $1"
+    openssl crl2pkcs7 -nocrl -certfile $1 | openssl pkcs7 -print_certs -text -noout | grep -E "(Subject|Issuer)"
+}
diff --git a/quickstart/local/create-router-pki.sh b/quickstart/local/create-router-pki.sh
new file mode 120000
index 000000000..e91745423
--- /dev/null
+++ b/quickstart/local/create-router-pki.sh
@@ -0,0 +1 @@
+../docker/image/create-router-pki.sh
\ No newline at end of file
diff --git a/quickstart/local/express/express-dev-env.sh b/quickstart/local/express/express-dev-env.sh
index 5ab688a93..2449071dc 100755
--- a/quickstart/local/express/express-dev-env.sh
+++ b/quickstart/local/express/express-dev-env.sh
@@ -84,17 +84,12 @@ function expressConfiguration {
   else
     nw="$1"
   fi
-  export ZITI_EDGE_ROUTER_RAWNAME="public-edge-router"
-  export ZITI_EDGE_ROUTER_HOSTNAME="${ZITI_EDGE_ROUTER_RAWNAME}${ZITI_DOMAIN_SUFFIX}"
-  if [[ "${ZITI_EDGE_ROUTER_HOSTNAME}" == "" ]]; then export ZITI_EDGE_ROUTER_HOSTNAME="${ZITI_EDGE_ROUTER_RAWNAME}${ZITI_DOMAIN_SUFFIX}"; fi
-  if [[ "${ZITI_EDGE_ROUTER_PORT}" == "" ]]; then export ZITI_EDGE_ROUTER_PORT="3022"; fi
 
   generateEnvFile "${nw}"
   #checkHostsFile
   getLatestZiti "yes"
   generatePki
   generateControllerConfig
-  generateEdgeRouterConfig
   initializeController
   startZitiController
   echo "starting the ziti controller to enroll the edge router"
@@ -109,6 +104,12 @@ function expressConfiguration {
   unused=$(ziti edge delete service-edge-router-policy allSvcPublicRouters)
   unused=$(ziti edge create service-edge-router-policy allSvcPublicRouters --edge-router-roles '#public' --service-roles '#all')
 
+  if [[ "${ZITI_EDGE_ROUTER_HOSTNAME}" == "" ]]; then export ZITI_EDGE_ROUTER_HOSTNAME="${ZITI_EDGE_ROUTER_RAWNAME}${ZITI_DOMAIN_SUFFIX}"; fi
+  if [[ "${ZITI_EDGE_ROUTER_PORT}" == "" ]]; then export ZITI_EDGE_ROUTER_PORT="3022"; fi
+
+  "${ZITI_SCRIPTS}/create-router-pki.sh"
+  generateEdgeRouterConfig
+
   echo "----------  Creating edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
   unused=$(ziti edge delete edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}")
   unused=$(ziti edge create edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" -t)
@@ -117,7 +118,7 @@ function expressConfiguration {
   unused=$(ziti-router enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" &> "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.enrollment.log")
   echo ""
   sleep 1
-  unused=$(ziti-router run "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" > "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.log" 2>&1 &)
+  unused=$(ziti-router run "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" > "${ZITI_HOME}/ziti-edge-router-${ZITI_EDGE_ROUTER_HOSTNAME}.log" 2>&1 &)
 }
 
 function decideOperation {
diff --git a/quickstart/local/pki-functions.sh b/quickstart/local/pki-functions.sh
deleted file mode 100755
index c8a8bb8ed..000000000
--- a/quickstart/local/pki-functions.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-function yaml2json()
-{
-    ruby -ryaml -rjson -e 'puts JSON.pretty_generate(YAML.load(ARGF))' $*
-}
-
-function printUsage()
-{
-    echo "Usage: $1 [cert to test] [ca pool to use]"
-}
-
-function verifyCertAgainstPool()
-{
-    if [[ "" == "$1" ]]
-    then
-        printUsage "verifyCertAgainstPool"
-        return 1
-    fi
-    
-    if [[ "" == "$2" ]]
-    then
-        printUsage "verifyCertAgainstPool"
-        return 1
-    fi
-
-    echo "    Verifying that this certificate:"
-    echo "        - $1"
-    echo "    is valid for this ca pool:"
-    echo "        - $2"
-    echo ""
-    openssl verify -partial_chain -CAfile "$2" "$1"
-    if [ $? -eq 0 ]; then
-        echo ""
-        echo "============      SUCCESS!      ============"
-    else
-        echo ""
-        echo "============ FAILED TO VALIDATE ============"
-    fi
-}
-
-function showIssuerAndSubjectForPEM()
-{
-    echo "Displaying Issuer and Subject for cert pool:"
-    echo "    $1"
-    openssl crl2pkcs7 -nocrl -certfile $1 | openssl pkcs7 -print_certs -text -noout | grep -E "(Subject|Issuer)"
-}
diff --git a/quickstart/local/pki-functions.sh b/quickstart/local/pki-functions.sh
new file mode 120000
index 000000000..6d7173816
--- /dev/null
+++ b/quickstart/local/pki-functions.sh
@@ -0,0 +1 @@
+../docker/image/pki-functions.sh
\ No newline at end of file
diff --git a/quickstart/local/restart-ziti.sh b/quickstart/local/restart-ziti.sh
index 3d4ab4c83..f4cba1056 100755
--- a/quickstart/local/restart-ziti.sh
+++ b/quickstart/local/restart-ziti.sh
@@ -14,7 +14,7 @@ source ${curdir}/env.sh
 DIRNAME=$(dirname $0)
 [[ ${USE_DNSMASQ:-} -eq 1 ]] && source ${DIRNAME}/run-dns.sh
 
-ziti-controller -v run "${ZITI_HOME}/controller.yaml" > "${ZITI_HOME}/ziti-controller.log" 2>&1 &
+ziti-controller -v run "${ZITI_HOME}/controller.yaml" > "${ZITI_HOME}/ziti_edge-controller.log" 2>&1 &
 # sleep 2
 # ziti-router run "${ZITI_HOME}/${ZITI_ROUTER_BR_NAME}.yaml" > "${ZITI_HOME}/ziti-${ZITI_ROUTER_BR_NAME}.log" 2>&1 &
 # sleep 1
diff --git a/quickstart/ziti-cli-functions.sh b/quickstart/ziti-cli-functions.sh
index 97667c859..162be681a 100644
--- a/quickstart/ziti-cli-functions.sh
+++ b/quickstart/ziti-cli-functions.sh
@@ -57,8 +57,8 @@ function initializeController {
   echo -e "ziti-controller initialized. see $(BLUE ${ZITI_HOME}/controller-init.log) for details"
 }
 function startZitiController {
-  unused=$(ziti-controller run "${ZITI_HOME}/controller.yaml" > "${ZITI_HOME}/ziti-controller.log" 2>&1 &)
-  echo -e "ziti-controller started. log located at: $(BLUE ${ZITI_HOME}/ziti-controller.log)"
+  unused=$(ziti-controller run "${ZITI_HOME}/controller.yaml" > "${ZITI_HOME}/ziti-edge-controller.log" 2>&1 &)
+  echo -e "ziti-controller started. log located at: $(BLUE ${ZITI_HOME}/ziti-edge-controller.log)"
 }
 function stopZitiController {
   killall ziti-controller