diff --git a/cmd/dkl-dir2config/render-context.go b/cmd/dkl-dir2config/render-context.go
index 045ae78..f30e98d 100644
--- a/cmd/dkl-dir2config/render-context.go
+++ b/cmd/dkl-dir2config/render-context.go
@@ -135,12 +135,22 @@ func (ctx *renderContext) templateFuncs(ctxMap map[string]interface{}) map[strin
 			return
 		}
 
+		key := name
 		if req.PerHost {
-			name = name + "/" + ctx.Host.Name
+			key += "/" + ctx.Host.Name
 		}
 
-		s = fmt.Sprintf("{{ %s %q %q %q %q %q %q }}", funcName,
-			cluster, req.CA, name, req.Profile, req.Label, buf.String())
+		if funcName == "tls_dir" {
+			// needs the dir name
+			dir := "/etc/tls/" + name
+
+			s = fmt.Sprintf("{{ %s %q %q %q %q %q %q %q }}", funcName,
+				dir, cluster, req.CA, key, req.Profile, req.Label, buf.String())
+
+		} else {
+			s = fmt.Sprintf("{{ %s %q %q %q %q %q %q }}", funcName,
+				cluster, req.CA, key, req.Profile, req.Label, buf.String())
+		}
 		return
 	}
 
diff --git a/cmd/dkl-local-server/render-context.go b/cmd/dkl-local-server/render-context.go
index c276d4c..6b0ecf8 100644
--- a/cmd/dkl-local-server/render-context.go
+++ b/cmd/dkl-local-server/render-context.go
@@ -201,7 +201,7 @@ func (ctx *renderContext) templateFuncs() map[string]interface{} {
 			return
 		},
 
-		"tls_dir": func(cluster, caName, name, profile, label, reqJson string) (s string, err error) {
+		"tls_dir": func(dir, cluster, caName, name, profile, label, reqJson string) (s string, err error) {
 			ca, err := secretData.CA(cluster, caName)
 			if err != nil {
 				return
@@ -212,8 +212,6 @@ func (ctx *renderContext) templateFuncs() map[string]interface{} {
 				return
 			}
 
-			dir := "/etc/tls/" + name
-
 			return asYaml([]config.FileDef{
 				{
 					Path:    path.Join(dir, "ca.crt"),