diff --git a/ziti/cmd/ziti/cmd/config_templates/router.yml b/ziti/cmd/ziti/cmd/config_templates/router.yml
index 901ef74c4..f5451fc5c 100644
--- a/ziti/cmd/ziti/cmd/config_templates/router.yml
+++ b/ziti/cmd/ziti/cmd/config_templates/router.yml
@@ -28,7 +28,7 @@ link:
 
 listeners:
 {{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }}  - binding: transport
-{{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }}    address: tls:0.0.0.0:1{{ .Router.Edge.Port }}
+{{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }}    address: tls:0.0.0.0:{{ .Router.Edge.Port }}
 {{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }}  - binding: tunnel
 {{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }}    options:
 {{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }}      mode: host #tproxy|tun|host
diff --git a/ziti/cmd/ziti/cmd/create_config.go b/ziti/cmd/ziti/cmd/create_config.go
index 67713464c..602437fb6 100644
--- a/ziti/cmd/ziti/cmd/create_config.go
+++ b/ziti/cmd/ziti/cmd/create_config.go
@@ -60,8 +60,8 @@ type ControllerTemplateValues struct {
 	IdentityServerCert   string
 	IdentityKey          string
 	IdentityCA           string
-	EdgeIdentityDuration string
-	EdgeRouterDuration   string
+	EdgeIdentityDuration int
+	EdgeRouterDuration   int
 	Edge                 EdgeControllerValues
 	WebListener          ControllerWebListenerValues
 	HealthCheck          ControllerHealthCheckValues
@@ -244,8 +244,8 @@ func (data *ConfigTemplateValues) populateDefaults() {
 	data.Router.Listener.ConnectTimeoutMs = constants.DefaultConnectTimeoutMs
 	data.Router.Listener.GetSessionTimeoutS = constants.DefaultGetSessionTimeoutS
 	data.Controller.Edge.APISessionTimeoutMinutes = constants.DefaultEdgeAPISessionTimeoutMinutes
-	data.Controller.EdgeIdentityDuration = string(rune(constants.DefaultEdgeIdentityDurationMinutes))
-	data.Controller.EdgeRouterDuration = string(rune(constants.DefaultEdgeRouterDurationMinutes))
+	data.Controller.EdgeIdentityDuration = constants.DefaultEdgeIdentityDurationMinutes
+	data.Controller.EdgeRouterDuration = constants.DefaultEdgeRouterDurationMinutes
 	data.Controller.WebListener.IdleTimeoutMS = constants.DefaultWebListenerIdleTimeoutMs
 	data.Controller.WebListener.ReadTimeoutMS = constants.DefaultWebListenerReadTimeoutMs
 	data.Controller.WebListener.WriteTimeoutMS = constants.DefaultWebListenerWriteTimeoutMs