diff --git a/salt/whonix/README.md b/salt/whonix/README.md
index dd17563..5e2423a 100644
--- a/salt/whonix/README.md
+++ b/salt/whonix/README.md
@@ -18,18 +18,15 @@ Template based on it.
 - Top:
 ```sh
 qubesctl top.enable whonix
-qubesctl state.apply
+qubesctl --targets=whonix-workstation-17,whonix-gateway-17 state.apply
 qubesctl top.disable whonix
-qubesctl state.apply qvm.anon-whonix
-qubesctl state.apply qvm.whonix-ws-dvm
 ```
 
 - State:
 <!-- pkg:begin:post-install -->
 ```sh
 qubesctl state.apply whonix.create
-qubesctl state.apply qvm.anon-whonix
-qubesctl state.apply qvm.whonix-ws-dvm
+qubesctl --skip-dom0 --targets=whonix-workstation-17,whonix-gateway-17 state.apply whonix.install
 ```
 <!-- pkg:end:post-install -->
 
diff --git a/salt/whonix/clone.sls b/salt/whonix/clone.sls
index f64c802..f6e5eb2 100644
--- a/salt/whonix/clone.sls
+++ b/salt/whonix/clone.sls
@@ -6,12 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 {%- import slsdotpath ~ "/template.jinja" as whonix -%}
 
-"{{ whonix.whonix_gw_template }}-installed":
+"{{ whonix.whonix_gateway_template }}-installed":
   qvm.template_installed:
-    - name: {{ whonix.whonix_gw_template }}
+    - name: {{ whonix.whonix_gateway_template }}
     - fromrepo: {{ whonix.whonix_repo }}
 
-"{{ whonix.whonix_ws_template }}-installed":
+"{{ whonix.whonix_workstation_template }}-installed":
   qvm.template_installed:
-    - name: whonix-ws-{{ whonix.whonix_ws_template }}
+    - name: whonix-workstation-{{ whonix.whonix_workstation_template }}
     - fromrepo: {{ whonix.whonix_repo }}
diff --git a/salt/whonix/create.sls b/salt/whonix/create.sls
index b09fb87..2a2685f 100644
--- a/salt/whonix/create.sls
+++ b/salt/whonix/create.sls
@@ -6,3 +6,5 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 include:
   - whonix.clone
+  - qvm.anon-whonix
+  - qvm.whonix-workstation-dvm
diff --git a/salt/whonix/install.top b/salt/whonix/install.top
index f620d0b..f36fd3b 100644
--- a/salt/whonix/install.top
+++ b/salt/whonix/install.top
@@ -5,6 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 #}
 
 base:
-  'dom0':
-    - match: nodegroup
+  'whonix-workstation-17,whonix-gateway-17':
+    - match: list
     - whonix.install
diff --git a/salt/whonix/template.jinja b/salt/whonix/template.jinja
index 7b98b77..fe1ac58 100644
--- a/salt/whonix/template.jinja
+++ b/salt/whonix/template.jinja
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 
 {% set whonix_version = salt['pillar.get']('qvm:whonix:version', '17') -%}
 {% set whonix_repo = salt['pillar.get']('qvm:whonix:repo', 'qubes-templates-community') -%}
-{% set whonix_ws_template = 'whonix-ws-' ~ whonix_version -%}
-{% set whonix_gw_template = 'whonix-gw-' ~ whonix_version -%}
-{% set whonix_ws_clean_template = 'whonix-ws' -%}
-{% set whonix_gw_clean_template = 'whonix-gw' -%}
+{% set whonix_workstation_template = 'whonix-workstation-' ~ whonix_version -%}
+{% set whonix_gateway_template = 'whonix-gateway-' ~ whonix_version -%}
+{% set whonix_workstation_clean_template = 'whonix-workstation' -%}
+{% set whonix_gateway_clean_template = 'whonix-gateway' -%}