diff --git a/services/service/service_template.nomad b/services/service/service_template.nomad
index e7970d0..a546ece 100644
--- a/services/service/service_template.nomad
+++ b/services/service/service_template.nomad
@@ -312,27 +312,24 @@ PSKsecrets = {{ env "NOMAD_SECRETS_DIR" }}/ldap_stunnel_psk.txt
 
       %{~ if use_mysql }
       template {
-        # TODO: move psk to nomad/jobs/name/name/stunnel
         data = <<EOF
-{{- with nomadVar "nomad/jobs/${name}" }}{{ .mysql_stunnel_psk }}{{ end -}}
+{{- with nomadVar "nomad/jobs/${name}/${name}/stunnel" }}{{ .mysql_stunnel_psk }}{{ end -}}
 EOF
         destination = "$${NOMAD_SECRETS_DIR}/mysql_stunnel_psk.txt"
       }
       %{ endif }
       %{~ if use_redis }
       template {
-        # TODO: move psk to nomad/jobs/name/name/stunnel
         data = <<EOF
-{{- with nomadVar "nomad/jobs/${name}" }}{{ .redis_stunnel_psk }}{{ end -}}
+{{- with nomadVar "nomad/jobs/${name}/${name}/stunnel" }}{{ .redis_stunnel_psk }}{{ end -}}
 EOF
         destination = "$${NOMAD_SECRETS_DIR}/redis_stunnel_psk.txt"
       }
       %{~ endif }
       %{~ if use_ldap }
       template {
-        # TODO: move psk to nomad/jobs/name/name/stunnel
         data = <<EOF
-{{- with nomadVar "nomad/jobs/${name}" }}{{ .ldap_stunnel_psk }}{{ end -}}
+{{- with nomadVar "nomad/jobs/${name}/${name}/stunnel" }}{{ .ldap_stunnel_psk }}{{ end -}}
 EOF
         destination = "$${NOMAD_SECRETS_DIR}/ldap_stunnel_psk.txt"
       }