diff --git a/ziti/cmd/ziti/cmd/config_templates/router.yml b/ziti/cmd/ziti/cmd/config_templates/router.yml
index 7edeeca39..4676eb883 100644
--- a/ziti/cmd/ziti/cmd/config_templates/router.yml
+++ b/ziti/cmd/ziti/cmd/config_templates/router.yml
@@ -25,19 +25,19 @@ link:
 {{ if .Router.IsPrivate }}#{{ end }}      options:
 {{ if .Router.IsPrivate }}#{{ end }}        outQueueSize:   {{ .Router.Listener.OutQueueSize }}
 
-{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }}listeners:
+{{ if .Router.IsFabric }}#{{ end }}listeners:
 # bindings of edge and tunnel requires an "edge" section below
-{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }}  - binding: edge
-{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }}    address: {{ if .Router.IsWss }}ws{{ else }}tls{{end}}:0.0.0.0:{{ .Router.Edge.Port }}
-{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }}    options:
-{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }}      advertise: {{ .Router.Edge.Hostname }}:{{ if .Router.IsWss }}3023{{ else }}{{ .Router.Edge.Port }}{{ end }}
-{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }}      connectTimeoutMs: {{ .Router.Listener.ConnectTimeout.Milliseconds }}
-{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }}      getSessionTimeout: {{ .Router.Listener.GetSessionTimeout.Seconds }}s
-{{ 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|host
+{{ if .Router.IsFabric }}#{{ end }}  - binding: edge
+{{ if .Router.IsFabric }}#{{ end }}    address: {{ if .Router.IsWss }}ws{{ else }}tls{{end}}:0.0.0.0:{{ .Router.Edge.Port }}
+{{ if .Router.IsFabric }}#{{ end }}    options:
+{{ if .Router.IsFabric }}#{{ end }}      advertise: {{ .Router.Edge.Hostname }}:{{ if .Router.IsWss }}3023{{ else }}{{ .Router.Edge.Port }}{{ end }}
+{{ if .Router.IsFabric }}#{{ end }}      connectTimeoutMs: {{ .Router.Listener.ConnectTimeout.Milliseconds }}
+{{ if .Router.IsFabric }}#{{ end }}      getSessionTimeout: {{ .Router.Listener.GetSessionTimeout.Seconds }}s
+{{ if .Router.IsFabric }}#{{ end }}  - binding: tunnel
+{{ if .Router.IsFabric }}#{{ end }}    options:
+{{ if .Router.IsFabric }}#{{ end }}      mode: host #tproxy|host
 
-{{ if or .Router.IsFabric .Router.IsPrivate }}
+{{ if or .Router.IsFabric }}
 csr:
   country: US
   province: NC