diff --git a/builder/data/etc/NetworkManager/NetworkManager.conf b/builder/data/etc/NetworkManager/NetworkManager.conf
new file mode 100644
index 00000000..a5a1b8b1
--- /dev/null
+++ b/builder/data/etc/NetworkManager/NetworkManager.conf
@@ -0,0 +1,3 @@
+[main]
+plugins=keyfile
+dhcp=dhcpcd
\ No newline at end of file
diff --git a/builder/data/etc/dhcpcd.conf b/builder/data/etc/dhcpcd.conf
deleted file mode 100644
index 90444ad0..00000000
--- a/builder/data/etc/dhcpcd.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# A sample configuration for dhcpcd.
-# See dhcpcd.conf(5) for details.
-
-# Allow users of this group to interact with dhcpcd via the control socket.
-#controlgroup wheel
-
-# Inform the DHCP server of our hostname for DDNS.
-hostname
-
-# Use the hardware address of the interface for the Client ID.
-clientid
-# or
-# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361.
-# Some non-RFC compliant DHCP servers do not reply with this set.
-# In this case, comment out duid and enable clientid above.
-#duid
-
-# Persist interface configuration when dhcpcd exits.
-persistent
-
-# Rapid commit support.
-# Safe to enable by default because it requires the equivalent option set
-# on the server to actually work.
-option rapid_commit
-
-# A list of options to request from the DHCP server.
-option domain_name_servers, domain_name, domain_search, host_name
-option classless_static_routes
-# Respect the network MTU. This is applied to DHCP routes.
-option interface_mtu
-
-# Most distributions have NTP support.
-#option ntp_servers
-
-# A ServerID is required by RFC2131.
-require dhcp_server_identifier
-
-# Generate SLAAC address using the Hardware Address of the interface
-#slaac hwaddr
-# OR generate Stable Private IPv6 Addresses based from the DUID
-slaac private
-
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# !! DO NOT EDIT THESE LINES BELOW PLEASE !!
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-# static IP configuration:
-denyinterfaces wlan0
-
-interface eth0
-static domain_name_servers=8.8.8.8 1.1.1.1
-metric 201
-
-interface usb0
-static ip_address=10.0.0.2/24
-static routers=10.0.0.1
-static domain_name_servers=10.0.0.1 8.8.8.8 1.1.1.1
-metric 202
-
-interface bnep0
-static domain_name_servers=8.8.8.8 1.1.1.1
-metric 203
\ No newline at end of file
diff --git a/builder/data/etc/network/interfaces.d/eth0-cfg b/builder/data/etc/network/interfaces.d/eth0-cfg
new file mode 100644
index 00000000..5562c477
--- /dev/null
+++ b/builder/data/etc/network/interfaces.d/eth0-cfg
@@ -0,0 +1,4 @@
+allow-hotplug eth0
+iface eth0 inet dhcp
+  dns-nameservers 1.1.1.1 8.8.8.8
+  metric 201
\ No newline at end of file
diff --git a/builder/data/etc/network/interfaces.d/lo-cfg b/builder/data/etc/network/interfaces.d/lo-cfg
new file mode 100644
index 00000000..18ff4764
--- /dev/null
+++ b/builder/data/etc/network/interfaces.d/lo-cfg
@@ -0,0 +1,2 @@
+auto lo
+iface lo inet loopback
\ No newline at end of file
diff --git a/builder/data/etc/network/interfaces.d/usb0-cfg b/builder/data/etc/network/interfaces.d/usb0-cfg
new file mode 100644
index 00000000..a055e619
--- /dev/null
+++ b/builder/data/etc/network/interfaces.d/usb0-cfg
@@ -0,0 +1,9 @@
+allow-hotplug usb0
+iface usb0 inet static
+  dns-nameservers 1.1.1.1 8.8.8.8
+  address 10.0.0.2
+  netmask 255.255.255.0
+  network 10.0.0.0
+  broadcast 10.0.0.255
+  gateway 10.0.0.1
+  metric 202
\ No newline at end of file
diff --git a/builder/data/etc/network/interfaces.d/wlan0-cfg b/builder/data/etc/network/interfaces.d/wlan0-cfg
new file mode 100644
index 00000000..f5425694
--- /dev/null
+++ b/builder/data/etc/network/interfaces.d/wlan0-cfg
@@ -0,0 +1,2 @@
+allow-hotplug wlan0
+iface wlan0 inet static
\ No newline at end of file
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 0ba24401..e70fd429 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -61,7 +61,6 @@
           - libpcap0.8-dbg
         remove:
           - avahi-daemon
-          - network-manager
           - nfs-common
           - triggerhappy
           - wpasupplicant
@@ -73,7 +72,6 @@
           - bluez
           - build-essential
           - curl
-          - dhcpcd5
           - dkms
           - dphys-swapfile
           - fbi