diff --git a/config/boards/orangepizero.conf b/config/boards/orangepizero.conf
index 0e254ec283..ca9b21daae 100644
--- a/config/boards/orangepizero.conf
+++ b/config/boards/orangepizero.conf
@@ -11,3 +11,44 @@ HAS_VIDEO_OUTPUT="yes"
 SERIALCON="ttyS0,ttyGS0"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
+CRUSTCONFIG="orangepi_zero_defconfig"
+
+function orange_pi_zero_enable_xradio_workarounds() {
+	/usr/bin/systemctl enable xradio_unload.service
+	/usr/bin/systemctl enable xradio_reload.service
+}
+
+function post_family_tweaks_bsp__fix_resume_after_suspend() {
+	# Adding systemd services to remove and reload xradio module on suspend and resume
+	# respectively. It will fix suspend resume using systemctl suspend, but rtcwake is
+	# still be broken.
+
+	run_host_command_logged cat <<- 'xradio_unload' > "${destination}"/etc/systemd/system/xradio_unload.service
+		[Unit]
+		Description=Unload xradio module on sleep
+		Before=sleep.target
+
+		[Service]
+		Type=simple
+		ExecStart=-/usr/sbin/rmmod xradio_wlan
+
+		[Install]
+		WantedBy=sleep.target
+	xradio_unload
+
+	run_host_command_logged cat <<- 'xradio_reload' > "${destination}"/etc/systemd/system/xradio_reload.service
+		[Unit]
+		Description=Reload xradio module on resume
+		After=suspend.target
+
+		[Service]
+		Type=simple
+		ExecStart=-/usr/sbin/modprobe xradio_wlan
+
+		[Install]
+		WantedBy=suspend.target
+	xradio_reload
+
+	# Enable workaround on apt upgrade of armbian-bsp-cli package
+	postinst_functions+=('orange_pi_zero_enable_xradio_workarounds')
+}