diff --git a/JeOS.kiwi b/JeOS.kiwi
index 1c0cbfe..b79655d 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -273,7 +273,6 @@
         <package name="parted"/>
         <package name="systemd-sysvinit"/>
         <package name="timezone"/>
-        <package name="wicked"/>
         <package name="iproute2"/> 
         <package name="openssh"/>
         <package name="rsync"/>
@@ -295,15 +294,19 @@
         <package name="snapper"/>
 
         <!-- Only if not cloud-init -->
-        <package name="jeos-firstboot"/>
+        <!-- Require 1.2.0.0 for proper NM support.
+             Not sure whether this syntax is intentionally supported but it appears to work. -->
+        <package name="jeos-firstboot &gt;= 1.2.0.0"/>
         <package name="fbiterm"/> <!-- Optionally used by jeos-firstboot for non-latin fonts -->
+        <!-- NM everywhere except that cloud-init needs wicked -->
+        <package name="NetworkManager"/>
 
         <!-- Not useful with OpenStack --> 
         <package name="firewalld"/>
     </packages>
 
-    <!-- Shim for secure boot everywhere except for RPi -->
     <packages type="image" profiles="kvm-and-xen,VMware,MS-HyperV,OpenStack-Cloud">
+        <!-- Shim for secure boot everywhere except for RPi -->
         <package name="shim" arch="aarch64,x86_64"/>
     </packages>
 
@@ -338,7 +341,8 @@
         <package name="dracut-kiwi-oem-repart"/>
         <package name="kernel-default"/>
         <!-- For WiFi: -->
-        <package name="jeos-firstboot-rpiwifi"/>
+        <package name="wireless-tools"/>
+        <package name="wpa_supplicant"/>
         <package name="bcm43xx-firmware"/>
         <package name="kernel-firmware"/><!-- Fix choice between kernel-firmware and kernel-firmware-all -->
         <package name="u-boot-rpiarm64" arch="aarch64"/>
diff --git a/config.sh b/config.sh
index 7e20da1..3b2b18b 100644
--- a/config.sh
+++ b/config.sh
@@ -83,6 +83,11 @@ if [ -x /usr/sbin/firewalld ]; then
         systemctl enable firewalld.service
 fi
 
+# Enable NetworkManager if installed
+if rpm -q --whatprovides NetworkManager >/dev/null; then
+        systemctl enable NetworkManager.service
+fi
+
 #======================================
 # Add repos from control.xml
 #--------------------------------------
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 0d23fb7..e24bc72 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 14 12:32:44 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Switch to NetworkManager except for OpenStack-Cloud
+
 -------------------------------------------------------------------
 Fri Jan 28 15:27:59 UTC 2022 - Ivan Ivanov <ivan.ivanov@suse.com>