diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile
index 483d339..6f91f02 100644
--- a/platforms/livecd-light-root/Makefile
+++ b/platforms/livecd-light-root/Makefile
@@ -19,7 +19,7 @@ $(MAKEDIST_TARGET)-livecd-light-root: \
                   xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
                   xorg-drv-input-synaptics xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
-                  gparted ntfs-3g libdvdcss \
+                  partitionmanager ntfs-3g libdvdcss \
                   livecd-tools \
                   Mesa-tools driconf parted testdisk \
                   vixie-cron logrotate \
diff --git a/platforms/livecd-light-root/Makefile.defs b/platforms/livecd-light-root/Makefile.defs
index 1a02277..dc1add2 100644
--- a/platforms/livecd-light-root/Makefile.defs
+++ b/platforms/livecd-light-root/Makefile.defs
@@ -1,3 +1,3 @@
-packagekitgui = gnome-packagekit
+packagekitgui = discover
 firewallgui = gui-ufw
 xorgdrvvideo += xorg-drv-video-vboxvideo
diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile
index 65b2f85..4f2b1f1 100644
--- a/platforms/rootfs-light/Makefile
+++ b/platforms/rootfs-light/Makefile
@@ -18,7 +18,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
              procps xorg-server x11vnc xkeyboard-config \
              rpm dnf xdg-utils \
              rfkill plymouth live-user-environment \
-             postplug-xorg postplug-sound gparted tar net-tools mambatray florence
+             postplug-xorg postplug-sound partitionmanager tar net-tools mambatray qtvkbd
 
 # Localization targets
 $(MAKEDIST_TARGET)-$(PLATFORM)-de: langpacks-de
diff --git a/platforms/rootfs-light/Makefile.defs b/platforms/rootfs-light/Makefile.defs
index a9dd47d..8093762 100644
--- a/platforms/rootfs-light/Makefile.defs
+++ b/platforms/rootfs-light/Makefile.defs
@@ -1,2 +1,2 @@
-packagekitgui = gnome-packagekit
+packagekitgui = discover
 firewallgui = gui-ufw