diff --git a/salt/states/hostapd/init.sls b/salt/states/hostapd/init.sls
index 3d06f51..80f7d00 100644
--- a/salt/states/hostapd/init.sls
+++ b/salt/states/hostapd/init.sls
@@ -6,7 +6,7 @@ Set {{ pillar['network']['wireless'] }} to not be managed by NetworkManager:
 Delete {{ pillar['network']['interface'] }} connection:
   cmd.run:
     - name: nmcli connection delete {{ pillar['network']['interface'] }}
-    - unless: nmcli connection show {{ pillar['network']['interface'] }} > /dev/null
+    - onlyif: nmcli connection show {{ pillar['network']['interface'] }} > /dev/null
 
 Install hostapd:
   pkg.installed:
diff --git a/salt/states/top.sls b/salt/states/top.sls
index ecfe57a..b4ccd67 100644
--- a/salt/states/top.sls
+++ b/salt/states/top.sls
@@ -2,6 +2,7 @@ base:
   '*':
     - hosts
     - vlan
+    - hostapd
     - firewalld
     - ssh
     - chrony
@@ -13,5 +14,4 @@ base:
     - podman
     - docker.registry
     - remote-desktop
-    - hostapd
     - wol
diff --git a/salt/states/vlan/init.sls b/salt/states/vlan/init.sls
index a931fc0..1b5ac85 100644
--- a/salt/states/vlan/init.sls
+++ b/salt/states/vlan/init.sls
@@ -8,12 +8,12 @@ create device {{ ifname }}:
 set ip address on {{ ifname }}:
   cmd.run:
     - name: nmcli connection modify {{ ifname }} ipv4.addresses {{ vlan['address'] }}/24
-    - unless: bash -c "if [[ \"$(nmcli connection show Wired\ connection\ 1 | sed -n 's/^ipv4.addresses.\s*\(.*\)$/\1/p')\" == "{{ vlan['address'] }}/24" ]]; then exit 0; else exit 1;fi"
+    - unless: bash -c "if [[ \"$(nmcli connection show {{ ifname }} | sed -n 's/^ipv4.addresses.\s*\(.*\)$/\1/p')\" == "{{ vlan['address'] }}/24" ]]; then exit 0; else exit 1;fi"
 
 set ip static on {{ ifname }}:
   cmd.run: 
     - name: nmcli connection modify {{ ifname }} ipv4.method manual
-    - unless: bash -c "if [[ \"$(nmcli connection show Wired\ connection\ 1 | sed -n 's/^ipv4.method.\s*\(.*\)$/\1/p')\" == "manual" ]]; then exit 0; else exit 1;fi"
+    - unless: bash -c "if [[ \"$(nmcli connection show {{ ifname }} | sed -n 's/^ipv4.method.\s*\(.*\)$/\1/p')\" == "manual" ]]; then exit 0; else exit 1;fi"
 
 bring up {{ ifname }}:
   cmd.run: