diff --git a/etc/ziti-ctrl.yml b/etc/prod/ziti-ctrl.yml
similarity index 94%
rename from etc/ziti-ctrl.yml
rename to etc/prod/ziti-ctrl.yml
index 09874bd4..3edcf4d3 100644
--- a/etc/ziti-ctrl.yml
+++ b/etc/prod/ziti-ctrl.yml
@@ -7,7 +7,7 @@ v: 3
 #  memory:
 #    path: ctrl.memprof
 
-db:                     "/home/ubuntu/local/etc/zrok.io/db/ctrl.db"
+db:                     "/home/ubuntu/local/etc/zrok.io/db/ziti-ctrl.db"
 
 identity:
   cert:                 "/home/ubuntu/local/etc/zrok.io/pki/intermediate/certs/ctrl-client.cert"
@@ -125,7 +125,7 @@ edge:
     # address - required
     # The default address (host:port) to use for enrollment for the Client API. This value must match one of the addresses
     # defined in this Controller.WebListener.'s bindPoints.
-    address: api.zrok.io:1280
+    address: ziti.zrok.io:1280
   # This section is used to define option that are used during enrollment of Edge Routers, Ziti Edge Identities.
   enrollment:
     # signingCert - required
@@ -152,24 +152,24 @@ edge:
 
 # web
 # Defines webListeners that will be hosted by the controller. Each webListener can host many APIs and be bound to many
-# backend points.
+# bind points.
 web:
   # name - required
   # Provides a name for this listener, used for logging output. Not required to be unique, but is highly suggested.
   - name: client-management
     # bindPoints - required
-    # One or more backend points are required. A backend point specifies an interface (interface:port string) that defines
-    # where on the host machine the webListener will frontend and the address (host:port) that should be used to
+    # One or more bind points are required. A bind point specifies an interface (interface:port string) that defines
+    # where on the host machine the webListener will listen and the address (host:port) that should be used to
     # publicly address the webListener(i.e. mydomain.com, localhost, 127.0.0.1). This public address may be used for
     # incoming address resolution as well as used in responses in the API.
     bindPoints:
       #interface - required
-      # A host:port string on which network interface to frontend on. 0.0.0.0 will frontend on all interfaces
+      # A host:port string on which network interface to listen on. 0.0.0.0 will listen on all interfaces
       - interface: 0.0.0.0:1280
         # address - required
         # The public address that external incoming requests will be able to resolve. Used in request processing and
         # response content that requires full host:port/path addresses.
-        address: api.zrok.io:1280
+        address: ziti.zrok.io:1280
     # identity - optional
     # Allows the webListener to have a specific identity instead of defaulting to the root 'identity' section.
     identity:
@@ -206,7 +206,7 @@ web:
     # Allows one or more APIs to be bound to this webListener
     apis:
       # binding - required
-      # Specifies an API to backend to this webListener. Built-in APIs are
+      # Specifies an API to bind to this webListener. Built-in APIs are
       #   - edge-management
       #   - edge-client
       #   - fabric-management
diff --git a/etc/router0.yml b/etc/prod/ziti-router0.yml
similarity index 96%
rename from etc/router0.yml
rename to etc/prod/ziti-router0.yml
index 6854e6f0..ea67ba95 100644
--- a/etc/router0.yml
+++ b/etc/prod/ziti-router0.yml
@@ -24,7 +24,7 @@ listeners:
   - binding: edge
     address: tls:0.0.0.0:3022
     options:
-      advertise: api.zrok.io:3022
+      advertise: ziti.zrok.io:3022
       connectTimeoutMs: 1000
       getSessionTimeout: 60s
   - binding: tunnel
@@ -41,7 +41,7 @@ edge:
     organizationalUnit: Ziti
     sans:
       dns:
-        - api.zrok.io
+        - ziti.zrok.io
         - localhost
       ip:
         - "10.0.0.41"
diff --git a/etc/zrok-ctrl.yml b/etc/prod/zrok-ctrl.yml
similarity index 70%
rename from etc/zrok-ctrl.yml
rename to etc/prod/zrok-ctrl.yml
index 4036c608..858839a6 100644
--- a/etc/zrok-ctrl.yml
+++ b/etc/prod/zrok-ctrl.yml
@@ -9,12 +9,12 @@ endpoint:
   port:             8080
 
 proxy:
-  url_template:     "http://{svcName}.in.zrok.io:8080/"
+  url_template:     "https://{svcName}.in.zrok.io/"
   identities:
-    - "yvnhjvzEd"
+    - "e6gMfeD4y"
 
 store:
-  path:             /home/ubuntu/local/etc/zrok.io/db/zrok.db
+  path:             /home/ubuntu/local/etc/zrok.io/db/zrok-ctrl.db
 
 ziti:
   api_endpoint:     "https://10.0.0.41:1280"