diff --git a/salt/qubes-builder/create.sls b/salt/qubes-builder/create.sls
index e81b29a..66e2456 100644
--- a/salt/qubes-builder/create.sls
+++ b/salt/qubes-builder/create.sls
@@ -106,3 +106,14 @@ features:
     - name: salt-patch.sh
     - source: salt://fedora-minimal/files/admin/bin/salt-patch.sh
     - args: tpl-{{ slsdotpath }}
+
+## TODO: Remove when template with patch reaches upstream or updates enforce
+## salt-deps to be installed.
+## https://github.com/QubesOS/qubes-issues/issues/8806
+"{{ slsdotpath }}-shutdown-template":
+  qvm.shutdown:
+    - require:
+      - qvm: "{{ slsdotpath }}-set-management_dispvm-to-default"
+    - name: tpl-{{ slsdotpath }}
+    - flags:
+      - force
diff --git a/salt/qubes-builder/prefs.sls b/salt/qubes-builder/prefs.sls
index 74627a7..9650569 100644
--- a/salt/qubes-builder/prefs.sls
+++ b/salt/qubes-builder/prefs.sls
@@ -4,6 +4,10 @@ SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
+## TODO: Remove when template with patch reaches upstream or updates enforce
+## salt-deps to be installed.
+## https://github.com/QubesOS/qubes-issues/issues/8806
+
 include:
   - .create
 
@@ -14,14 +18,3 @@ include:
     - name: tpl-{{ slsdotpath }}
     - prefs:
       - management_dispvm: "*default*"
-
-## TODO: Remove when template with patch reaches upstream or updates enforce
-## salt-deps to be installed.
-## https://github.com/QubesOS/qubes-issues/issues/8806
-"{{ slsdotpath }}-shutdown-template":
-  qvm.shutdown:
-    - require:
-      - qvm: "{{ slsdotpath }}-set-management_dispvm-to-default"
-    - name: tpl-{{ slsdotpath }}
-    - flags:
-      - force