diff --git a/debian/kali-desktop-base.postinst b/debian/kali-desktop-base.postinst
index 87a9d2d6..94abe576 100644
--- a/debian/kali-desktop-base.postinst
+++ b/debian/kali-desktop-base.postinst
@@ -154,6 +154,27 @@ EOF
 	update-alternatives --remove \
 	    desktop-grub \
 	    /usr/share/desktop-base/kali-theme/grub/grub-16x9.png
+
+    elif dpkg --compare-versions "$2" lt-nl "2020.2.1"; then
+        # Remove desktop background alternatives
+        update-alternatives --remove \
+            desktop-background \
+            /usr/share/backgrounds/kali/kali-logo-16x9.png
+
+        # Remove XML version of the background alternatives
+        update-alternatives --remove \
+            desktop-background.xml \
+            /usr/share/backgrounds/kali/kali-logo.xml
+
+        # Remove login background alternatives
+        update-alternatives --remove \
+            desktop-login-background \
+            /usr/share/backgrounds/kali/kali-light.svg
+
+        # Remove XML version of the login background alternatives
+        update-alternatives --remove \
+            desktop-lockscreen.xml \
+            /usr/share/backgrounds/kali/kali-light.xml
     fi
 fi
 
diff --git a/debian/kali-desktop-base.prerm b/debian/kali-desktop-base.prerm
index c3e2e28a..118cd523 100644
--- a/debian/kali-desktop-base.prerm
+++ b/debian/kali-desktop-base.prerm
@@ -10,17 +10,17 @@ if [ "$1" = "remove" ]; then
     # Remove background alternatives for theme packages
     update-alternatives --remove \
 	desktop-background \
-	/usr/share/backgrounds/kali/kali-logo-16x9.png
+	/usr/share/wallpapers/KaliLogo/contents/images/kali-logo-16x9.png
 
     # Remove desktop-background.xml alternatives
     update-alternatives --remove \
 	desktop-background.xml \
-	/usr/share/backgrounds/kali/kali-logo.xml
+	/usr/share/wallpapers/KaliLogo/gnome-background.xml
 
     # Remove desktop-lockscreen.xml alternatives
     update-alternatives --remove \
 	desktop-lockscreen.xml \
-	/usr/share/backgrounds/kali/kali-light.xml
+	/usr/share/wallpapers/KaliLight/gnome-background.xml
 
     # Remove Plasma 5/KDE wallpaper alternatives
     update-alternatives --remove \
@@ -30,7 +30,7 @@ if [ "$1" = "remove" ]; then
     # Remove login theme alternatives
     update-alternatives --remove \
 	desktop-login-background \
-	/usr/share/backgrounds/kali/kali-light.svg
+	/usr/share/wallpapers/KaliLight/contents/kali-light.svg
 
     # Remove GRUB alternatives
     update-alternatives --remove \
diff --git a/update-maintainer-scripts b/debian/update-maintainer-scripts
similarity index 100%
rename from update-maintainer-scripts
rename to debian/update-maintainer-scripts