diff --git a/salt/debian-minimal/create.sls b/salt/debian-minimal/create.sls
index c7524ee..9725ff8 100644
--- a/salt/debian-minimal/create.sls
+++ b/salt/debian-minimal/create.sls
@@ -43,7 +43,7 @@ features:
 {{ load(defaults) }}
 
 {% load_yaml as defaults -%}
-name: {{ template.template_clean }}
+name: {{ template.template }}
 force: True
 require:
 - sls: {{ template.template_clean }}.clone
@@ -65,3 +65,5 @@ features:
 "{{ slsdotpath }}-set-default_template":
   cmd.run:
     - name: qubes-prefs default_template {{ template.template }}
+    - require:
+      - sls: {{ template.template_clean }}.clone
diff --git a/salt/debian/create.sls b/salt/debian/create.sls
index f03fee2..42dd63d 100644
--- a/salt/debian/create.sls
+++ b/salt/debian/create.sls
@@ -43,7 +43,7 @@ features:
 {{ load(defaults) }}
 
 {% load_yaml as defaults -%}
-name: {{ template.template_clean }}
+name: {{ template.template }}
 force: True
 require:
 - sls: {{ slsdotpath }}.clone
diff --git a/salt/fedora-minimal/create.sls b/salt/fedora-minimal/create.sls
index 52098c1..34f6fc9 100644
--- a/salt/fedora-minimal/create.sls
+++ b/salt/fedora-minimal/create.sls
@@ -43,7 +43,7 @@ features:
 {{ load(defaults) }}
 
 {% load_yaml as defaults -%}
-name: {{ template.template_clean }}
+name: {{ template.template }}
 force: True
 require:
 - sls: {{ template.template_clean }}.clone
diff --git a/salt/fedora/create.sls b/salt/fedora/create.sls
index 52098c1..34f6fc9 100644
--- a/salt/fedora/create.sls
+++ b/salt/fedora/create.sls
@@ -43,7 +43,7 @@ features:
 {{ load(defaults) }}
 
 {% load_yaml as defaults -%}
-name: {{ template.template_clean }}
+name: {{ template.template }}
 force: True
 require:
 - sls: {{ template.template_clean }}.clone