diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 4a93c95..f24c3ce 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -1285,7 +1285,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UniFi-AP-AC-LR
     version: release
-    location: "Saal A"
+    location: "Auf Lager"
     radios:
       'platform/qca956x_wmac':
         channel: 9
@@ -1346,7 +1346,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UniFi-AP-AC-LR
     version: release
-    location: "Saal A"
+    location: "Auf Lager"
     radios:
       'platform/qca956x_wmac':
         channel: 5
@@ -1663,7 +1663,6 @@ cpe:
               -----END PGP MESSAGE-----
 
   ap39:
-    firstboot: True
     password: |
       -----BEGIN PGP MESSAGE-----
       
@@ -1767,7 +1766,6 @@ cpe:
               -----END PGP MESSAGE-----
 
   ap41:
-    firstboot: True
     password: |
       -----BEGIN PGP MESSAGE-----
       
@@ -1931,3 +1929,430 @@ cpe:
               haoihwoh
               =Kx8J
               -----END PGP MESSAGE-----
+  ap44:
+    firstboot: True
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf8C0p0fJEIiib95aBMAdrAsvlDm1VBYEgDbdkhIL+ERTkc
+      JCC+xJQ/fE7iIrhgKBr3oShMMp0mZ5fdDP35Q59pw7D2Ux0x9t2srvJ/oJlEIpfR
+      cYq6m0GxtuJuZCqNXpzlJfM1CCJx07Gxz+jRTHoifrQwtIz6GZdBt126whrf0A+y
+      JqnSGCZ4FHr8Traa7X3npFT2ZnAsM5LmukXd1KZsqEC9VM/B0Gj+dxea5SvHB52b
+      ErGP3BUa5a1tIj5psgH6QPP2Fx4qvsxCfMY7VEpLb8tJuaCpjjek4gsg6CLUBpqb
+      Boe5mB/7WZFDa9z4YUWtlBz1tDtSEHLatQnHJwVWS9JFAQ3Aafj8cTsFy6fJtpH1
+      5PtxztRrr/asqM01wKy0NtN1jDiGKAOomdsxqZFpLnguxbvZ2T2/HLwzun0Mlv+o
+      SRWSVEnm
+      =PSjs
+      -----END PGP MESSAGE-----
+    model: Ubnt-UAP-nanoHD
+    version: release
+    location: "Saal"
+    radios:
+      '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
+        channel: 9
+        htmode: HT40+
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage legacy':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+      '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
+        channel: 149
+        htmode: VHT80
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+  ap45:
+    firstboot: True
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf8C0p0fJEIiib95aBMAdrAsvlDm1VBYEgDbdkhIL+ERTkc
+      JCC+xJQ/fE7iIrhgKBr3oShMMp0mZ5fdDP35Q59pw7D2Ux0x9t2srvJ/oJlEIpfR
+      cYq6m0GxtuJuZCqNXpzlJfM1CCJx07Gxz+jRTHoifrQwtIz6GZdBt126whrf0A+y
+      JqnSGCZ4FHr8Traa7X3npFT2ZnAsM5LmukXd1KZsqEC9VM/B0Gj+dxea5SvHB52b
+      ErGP3BUa5a1tIj5psgH6QPP2Fx4qvsxCfMY7VEpLb8tJuaCpjjek4gsg6CLUBpqb
+      Boe5mB/7WZFDa9z4YUWtlBz1tDtSEHLatQnHJwVWS9JFAQ3Aafj8cTsFy6fJtpH1
+      5PtxztRrr/asqM01wKy0NtN1jDiGKAOomdsxqZFpLnguxbvZ2T2/HLwzun0Mlv+o
+      SRWSVEnm
+      =PSjs
+      -----END PGP MESSAGE-----
+    model: Ubnt-UAP-nanoHD
+    version: release
+    location: "Saal"
+    radios:
+      '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
+        channel: 9
+        htmode: HT40+
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage legacy':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+      '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
+        channel: 149
+        htmode: VHT80
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+  ap46:
+    firstboot: True
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf8C0p0fJEIiib95aBMAdrAsvlDm1VBYEgDbdkhIL+ERTkc
+      JCC+xJQ/fE7iIrhgKBr3oShMMp0mZ5fdDP35Q59pw7D2Ux0x9t2srvJ/oJlEIpfR
+      cYq6m0GxtuJuZCqNXpzlJfM1CCJx07Gxz+jRTHoifrQwtIz6GZdBt126whrf0A+y
+      JqnSGCZ4FHr8Traa7X3npFT2ZnAsM5LmukXd1KZsqEC9VM/B0Gj+dxea5SvHB52b
+      ErGP3BUa5a1tIj5psgH6QPP2Fx4qvsxCfMY7VEpLb8tJuaCpjjek4gsg6CLUBpqb
+      Boe5mB/7WZFDa9z4YUWtlBz1tDtSEHLatQnHJwVWS9JFAQ3Aafj8cTsFy6fJtpH1
+      5PtxztRrr/asqM01wKy0NtN1jDiGKAOomdsxqZFpLnguxbvZ2T2/HLwzun0Mlv+o
+      SRWSVEnm
+      =PSjs
+      -----END PGP MESSAGE-----
+    model: Ubnt-UAP-nanoHD
+    version: release
+    location: "Saal"
+    radios:
+      '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
+        channel: 9
+        htmode: HT40+
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage legacy':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+      '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
+        channel: 149
+        htmode: VHT80
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+  ap47:
+    firstboot: True
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf8C0p0fJEIiib95aBMAdrAsvlDm1VBYEgDbdkhIL+ERTkc
+      JCC+xJQ/fE7iIrhgKBr3oShMMp0mZ5fdDP35Q59pw7D2Ux0x9t2srvJ/oJlEIpfR
+      cYq6m0GxtuJuZCqNXpzlJfM1CCJx07Gxz+jRTHoifrQwtIz6GZdBt126whrf0A+y
+      JqnSGCZ4FHr8Traa7X3npFT2ZnAsM5LmukXd1KZsqEC9VM/B0Gj+dxea5SvHB52b
+      ErGP3BUa5a1tIj5psgH6QPP2Fx4qvsxCfMY7VEpLb8tJuaCpjjek4gsg6CLUBpqb
+      Boe5mB/7WZFDa9z4YUWtlBz1tDtSEHLatQnHJwVWS9JFAQ3Aafj8cTsFy6fJtpH1
+      5PtxztRrr/asqM01wKy0NtN1jDiGKAOomdsxqZFpLnguxbvZ2T2/HLwzun0Mlv+o
+      SRWSVEnm
+      =PSjs
+      -----END PGP MESSAGE-----
+    model: Ubnt-UAP-nanoHD
+    version: release
+    location: "Saal"
+    radios:
+      '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
+        channel: 9
+        htmode: HT40+
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage legacy':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+      '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
+        channel: 149
+        htmode: VHT80
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+  ap48:
+    firstboot: True
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf8C0p0fJEIiib95aBMAdrAsvlDm1VBYEgDbdkhIL+ERTkc
+      JCC+xJQ/fE7iIrhgKBr3oShMMp0mZ5fdDP35Q59pw7D2Ux0x9t2srvJ/oJlEIpfR
+      cYq6m0GxtuJuZCqNXpzlJfM1CCJx07Gxz+jRTHoifrQwtIz6GZdBt126whrf0A+y
+      JqnSGCZ4FHr8Traa7X3npFT2ZnAsM5LmukXd1KZsqEC9VM/B0Gj+dxea5SvHB52b
+      ErGP3BUa5a1tIj5psgH6QPP2Fx4qvsxCfMY7VEpLb8tJuaCpjjek4gsg6CLUBpqb
+      Boe5mB/7WZFDa9z4YUWtlBz1tDtSEHLatQnHJwVWS9JFAQ3Aafj8cTsFy6fJtpH1
+      5PtxztRrr/asqM01wKy0NtN1jDiGKAOomdsxqZFpLnguxbvZ2T2/HLwzun0Mlv+o
+      SRWSVEnm
+      =PSjs
+      -----END PGP MESSAGE-----
+    model: Ubnt-UAP-nanoHD
+    version: release
+    location: "Saal"
+    radios:
+      '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
+        channel: 9
+        htmode: HT40+
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage legacy':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+      '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
+        channel: 149
+        htmode: VHT80
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+  ap49:
+    firstboot: True
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf8C0p0fJEIiib95aBMAdrAsvlDm1VBYEgDbdkhIL+ERTkc
+      JCC+xJQ/fE7iIrhgKBr3oShMMp0mZ5fdDP35Q59pw7D2Ux0x9t2srvJ/oJlEIpfR
+      cYq6m0GxtuJuZCqNXpzlJfM1CCJx07Gxz+jRTHoifrQwtIz6GZdBt126whrf0A+y
+      JqnSGCZ4FHr8Traa7X3npFT2ZnAsM5LmukXd1KZsqEC9VM/B0Gj+dxea5SvHB52b
+      ErGP3BUa5a1tIj5psgH6QPP2Fx4qvsxCfMY7VEpLb8tJuaCpjjek4gsg6CLUBpqb
+      Boe5mB/7WZFDa9z4YUWtlBz1tDtSEHLatQnHJwVWS9JFAQ3Aafj8cTsFy6fJtpH1
+      5PtxztRrr/asqM01wKy0NtN1jDiGKAOomdsxqZFpLnguxbvZ2T2/HLwzun0Mlv+o
+      SRWSVEnm
+      =PSjs
+      -----END PGP MESSAGE-----
+    model: Ubnt-UAP-nanoHD
+    version: release
+    location: "Saal"
+    radios:
+      '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
+        channel: 9
+        htmode: HT40+
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage legacy':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+      '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
+        channel: 149
+        htmode: VHT80
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+  ap50:
+    firstboot: True
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf8C0p0fJEIiib95aBMAdrAsvlDm1VBYEgDbdkhIL+ERTkc
+      JCC+xJQ/fE7iIrhgKBr3oShMMp0mZ5fdDP35Q59pw7D2Ux0x9t2srvJ/oJlEIpfR
+      cYq6m0GxtuJuZCqNXpzlJfM1CCJx07Gxz+jRTHoifrQwtIz6GZdBt126whrf0A+y
+      JqnSGCZ4FHr8Traa7X3npFT2ZnAsM5LmukXd1KZsqEC9VM/B0Gj+dxea5SvHB52b
+      ErGP3BUa5a1tIj5psgH6QPP2Fx4qvsxCfMY7VEpLb8tJuaCpjjek4gsg6CLUBpqb
+      Boe5mB/7WZFDa9z4YUWtlBz1tDtSEHLatQnHJwVWS9JFAQ3Aafj8cTsFy6fJtpH1
+      5PtxztRrr/asqM01wKy0NtN1jDiGKAOomdsxqZFpLnguxbvZ2T2/HLwzun0Mlv+o
+      SRWSVEnm
+      =PSjs
+      -----END PGP MESSAGE-----
+    model: Ubnt-UAP-nanoHD
+    version: release
+    location: "Saal"
+    radios:
+      '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
+        channel: 9
+        htmode: HT40+
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage legacy':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+      '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
+        channel: 149
+        htmode: VHT80
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
diff --git a/salt/cpe/ap.sh b/salt/cpe/ap.sh
index ca945c0..40401e8 100644
--- a/salt/cpe/ap.sh
+++ b/salt/cpe/ap.sh
@@ -288,7 +288,7 @@ set network.{{ net }}.proto=static
 set network.{{ net }}.ifname='{{ ' '.join(ports) }}'
 {%-   endfor %}
 
-{%- elif conf['model'] == 'TL-WA901NDv3' or conf['model'] == 'Ubnt-UniFi-AP-AC-LR' %}
+{%- elif conf['model'] == 'TL-WA901NDv3' or conf['model'] == 'Ubnt-UniFi-AP-AC-LR' or conf['model'] == 'Ubnt-UAP-nanoHD' %}
 {# Only eth0 exists, no switch #}
 
 {{ uci_network_mgmt('eth0.1') }}