diff --git a/.build/images/U-Boot/boot.cmd b/.build/images/U-Boot/boot.cmd
index 5dfbb64fc3..601f377d92 100644
--- a/.build/images/U-Boot/boot.cmd
+++ b/.build/images/U-Boot/boot.cmd
@@ -28,7 +28,7 @@ fi
 setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 coherent_pool=2M usb-storage.quirks=${usbstoragequirks} ${extraargs}"
 
 # Add bootargs for Docker
-if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory swapaccount=1"; fi
+if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory"; fi
 
 # Load kernel, initramfs and device tree
 load "${devtype}" "${devnum}" "${kernel_addr_r}" "${prefix}Image"
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 49f6fdaed5..bafafa3508 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -14,6 +14,7 @@ Removed software:
 Bug fixes:
 - Orange Pi 5 Max | Resolved an issue where onboard WiFi was not working. Many thanks to @diego-hsp for reporting this issue: https://github.com/MichaIng/DietPi/issues/7338
 - DietPi-Software | Sonarr: Resolved an issue where the internal updater did not work due to permission limits in the systemd unit. Many thanks to @tellice for reporting this issue: https://github.com/MichaIng/DietPi/issues/7321
+- DietPi-Software | Sonarr: Resolved an issue where configs were lost during Sonarr v3 => v4 migration/reinstall.
 - DietPi-Software | Fail2Ban: Resolved an issue where a fixed Dropbear filter could not be installed, because the directory did not exist yet. Many thanks to @augustresende for reporting this issue: https://github.com/MichaIng/DietPi/issues/7325
 - DietPi-Software | Raspotify: Resolved an issue where the service failed to start, if Avahi-Daemon was not installed. librespot has it as new default DNS discovery backend, and official pre-compiled Raspotify binaries are not compiled with the old DNS-SD backend anymore. Avahi-Daemon is hence installed now by DietPi-Software as well. Many thanks to @gergokis for reporting this issue: https://github.com/MichaIng/DietPi/issues/7323
 - DietPi-Software | Navidrome: Resolved an issue where the service failed to start, since the latest release archive does not ship with the needed permissions. Many thanks to @nclro for reporting this issue: https://github.com/MichaIng/DietPi/issues/7336
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index bfc0bcd8cb..4b16662995 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -9359,7 +9359,9 @@ _EOF_
 				[[ -f '/etc/apt/trusted.gpg.d/dietpi-sonarr.gpg' ]] && G_EXEC rm /etc/apt/trusted.gpg.d/dietpi-sonarr.gpg
 				if dpkg-query -s 'sonarr' &> /dev/null
 				then
+					[[ -d '/mnt/dietpi_userdata/sonarr' ]] && G_EXEC mv /mnt/dietpi_userdata/sonarr{,_bak}
 					G_AGP sonarr
+					[[ -d '/mnt/dietpi_userdata/sonarr_bak' ]] && G_EXEC mv /mnt/dietpi_userdata/sonarr{_bak,}
 					# Offer to uninstall Mono
 					if (( ${aSOFTWARE_INSTALL_STATE[150]} == 2 ))
 					then