diff --git a/config/boards/odroidn2.conf b/config/boards/odroidn2.conf
index 7531292955..7236152734 100644
--- a/config/boards/odroidn2.conf
+++ b/config/boards/odroidn2.conf
@@ -5,3 +5,4 @@ BOOTCONFIG="odroidn2_config"
 MODULES_LEGACY="media_clock firmware #decoder_common #stream_input #amvdec_mh264 #amvdec_h264 #amvdec_h264mvc #amvdec_h265 #amvdec_mmjpeg #amvdec_mpeg12 #amvdec_mmpeg4 #amvdec_mpeg4 #amvdec_vc1 #amvdec_vp9"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+FORCE_BOOTSCRIPT_UPDATE="yes"
diff --git a/config/kernel/linux-meson64-current.config b/config/kernel/linux-meson64-current.config
index b3db4055bd..37d9e2f01c 100644
--- a/config/kernel/linux-meson64-current.config
+++ b/config/kernel/linux-meson64-current.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.25 Kernel Configuration
+# Linux/arm64 5.4.27 Kernel Configuration
 #
 
 #
@@ -3046,7 +3046,6 @@ CONFIG_WLCORE=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
 CONFIG_RTL8821CU=m
diff --git a/config/kernel/linux-meson64-legacy.config b/config/kernel/linux-meson64-legacy.config
index c2e65d9187..f608aab096 100644
--- a/config/kernel/linux-meson64-legacy.config
+++ b/config/kernel/linux-meson64-legacy.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.9.210 Kernel Configuration
+# Linux/arm64 4.9.216 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -2531,7 +2531,7 @@ CONFIG_WLAN_VENDOR_TI=y
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
 CONFIG_RTL8821CU=m
-CONFIG_RTL8812AU=m
+CONFIG_88XXAU=m
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
diff --git a/config/targets.conf b/config/targets.conf
index 85cc966f3d..8a5c652cb4 100644
--- a/config/targets.conf
+++ b/config/targets.conf
@@ -352,10 +352,10 @@ odroidn2			legacy			buster		cli			stable	yes
 odroidn2			legacy			buster		desktop			stable	yes
 odroidn2			legacy			stretch		cli			stable	yes
 odroidn2			legacy			bionic		desktop			stable	yes
-odroidn2			current			bionic		desktop			stable	yes
 odroidn2			current			buster		cli			stable	yes
-odroidn2			current			bionic		minimal			stable	yes
-odroidn2			dev			bullseye	minimal			beta	yes
+odroidn2			current			buster		desktop			stable	yes
+odroidn2			current			stretch		cli			stable	yes
+odroidn2			current			bionic		desktop			stable	yes
 
 # Odroid XU4