diff --git a/buildroot-external/board/raspberrypi/uboot-boot.sh b/buildroot-external/board/raspberrypi/uboot-boot.sh
index 6a3ed9f81..8b0b6649d 100644
--- a/buildroot-external/board/raspberrypi/uboot-boot.sh
+++ b/buildroot-external/board/raspberrypi/uboot-boot.sh
@@ -36,12 +36,12 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
 done
 
 if test -n "${bootargs}"; then
-  saveenv
+  #saveenv
 else
   echo "No valid slot found, resetting tries to 3"
   setenv BOOT_A_LEFT 3
   setenv BOOT_B_LEFT 3
-  saveenv
+  #saveenv
   reset
 fi
 
diff --git a/buildroot-external/board/raspberrypi/uboot.config b/buildroot-external/board/raspberrypi/uboot.config
index 00cf88bf2..acc0e2a45 100644
--- a/buildroot-external/board/raspberrypi/uboot.config
+++ b/buildroot-external/board/raspberrypi/uboot.config
@@ -7,7 +7,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_OF_EMBED=y
-CONFIG_ENV_EXT4_INTERFACE="mmc"
 CONFIG_DM_KEYBOARD=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
diff --git a/buildroot-patches/0006-NetworkManager-allow-to-wait-on-boot.patch b/buildroot-patches/0006-NetworkManager-allow-to-wait-on-boot.patch
deleted file mode 100644
index 667065f09..000000000
--- a/buildroot-patches/0006-NetworkManager-allow-to-wait-on-boot.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 590565bc07f563f978004727dc817dc89527377a Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Sat, 31 Mar 2018 16:58:14 +0200
-Subject: [PATCH 1/1] NetworkManager: allow to wait on boot
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- package/network-manager/network-manager.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
-index a520aad..fb2012a 100644
---- a/package/network-manager/network-manager.mk
-+++ b/package/network-manager/network-manager.mk
-@@ -93,6 +93,7 @@ endef
- 
- define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
- 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-+	mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants
- 
- 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
- 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
-@@ -100,6 +101,9 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
- 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
- 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
- 
-+	ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
-+		$(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
-+
- 	ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
- 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
- endef
--- 
-2.7.4
-
diff --git a/buildroot-patches/0007-Pump-raspberry-pi-firmware-for-kernel-4.14.patch b/buildroot-patches/0006-Pump-raspberry-pi-firmware-for-kernel-4.14.patch
similarity index 100%
rename from buildroot-patches/0007-Pump-raspberry-pi-firmware-for-kernel-4.14.patch
rename to buildroot-patches/0006-Pump-raspberry-pi-firmware-for-kernel-4.14.patch
diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk
index fb2012ac0..a520aad9c 100644
--- a/buildroot/package/network-manager/network-manager.mk
+++ b/buildroot/package/network-manager/network-manager.mk
@@ -93,7 +93,6 @@ endef
 
 define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/network-online.target.wants
 
 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
@@ -101,9 +100,6 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
 	ln -sf /usr/lib/systemd/system/NetworkManager.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
 
-	ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
-		$(TARGET_DIR)/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service
-
 	ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
 endef