diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 53268b29..954f3fab 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -190,10 +190,6 @@ removefrom glibc-common /usr/libexec/* /usr/sbin/*
 removefrom gmp /usr/${libdir}/libgmpxx.* /usr/${libdir}/libmp.*
 removefrom gnome-bluetooth-libs /usr/${libdir}/libgnome-bluetooth*
 removefrom gnome-bluetooth-libs /usr/share/*
-removefrom gnome-keyring /etc/xdg/* /usr/bin/* /usr/${libdir}/* /usr/libexec/*
-removefrom gnome-keyring /usr/share/GConf/* /usr/share/gcr-3/*
-removefrom gnome-keyring /usr/share/glib-2.0/* /usr/share/gnome-keyring*
-removefrom gnome-keyring /usr/share/locale/*
 removefrom gnutls /usr/share/locale/*
 removefrom gpgme /usr/${libdir}/libgpgme-*
 removefrom grep /etc/* /usr/share/locale/*
@@ -284,8 +280,6 @@ removefrom procps /usr/bin/vmstat /usr/bin/w /usr/bin/watch
 removefrom psmisc /usr/share/locale/*
 removefrom pygtk2 /usr/bin/* /usr/${libdir}/pygtk/*
 removefrom pykickstart /usr/bin/* /usr/share/locale/*
-removefrom python-ethtool /usr/sbin/*
-removefrom python-meh /usr/share/locale/*
 removefrom readline /usr/${libdir}/*
 removefrom libreport /usr/bin/* /usr/share/locale/*
 removefrom rpm /usr/bin/* /usr/share/locale/*
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index d15c757c..ebbb90f1 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -6,7 +6,6 @@ installpkg anaconda anaconda-widgets
 installpkg kexec-tools-anaconda-addon
 ## anaconda deps that aren't in the RPM
 installpkg tmux
-installpkg iscsi-initiator-utils
 ## Other available payloads
 installpkg dnf
 installpkg rpm-ostree
@@ -78,11 +77,7 @@ installpkg xorg-x11-drivers xorg-x11-server-Xorg
 installpkg xorg-x11-server-utils xorg-x11-xauth
 installpkg dbus-x11 metacity gsettings-desktop-schemas
 installpkg nm-connection-editor
-installpkg gobject-introspection
 installpkg librsvg2
-installpkg polkit-desktop-policy
-installpkg gnome-keyring
-installpkg python-imaging
 
 ## filesystem tools
 installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils gfs2-utils ntfs-3g ntfsprogs
@@ -91,14 +86,14 @@ installpkg device-mapper-persistent-data
 installpkg xfsdump
 
 ## needed for LUKS escrow
-installpkg python-volume_key volume_key
-installpkg python-nss
+installpkg volume_key
+installpkg nss-tools
 
 ## SELinux support
-installpkg selinux-policy-targeted audit libsemanage-python
+installpkg selinux-policy-targeted audit
 
 ## network tools/servers
-installpkg python-ethtool ethtool openssh-server nfs-utils openssh-clients
+installpkg ethtool openssh-server nfs-utils openssh-clients
 installpkg tigervnc-server-minimal
 %if basearch != "s390x":
 installpkg tigervnc-server-module
@@ -115,7 +110,7 @@ installpkg hdparm pcmciautils
 installpkg libmlx4 rdma
 
 ## translations & language packs
-installpkg yum-langpacks
+installpkg python3-dnf-langpacks
 
 ## fonts & themes
 installpkg bitmap-fangsongti-fonts
@@ -145,7 +140,6 @@ installpkg abattis-cantarell-fonts
 
 ## debugging/bug reporting tools
 installpkg gdb-gdbserver
-installpkg python-epdb
 installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader
 installpkg fpaste
 
@@ -155,9 +149,6 @@ installpkg wget rsync rsh bind-utils ftp mtr vconfig
 installpkg icfg spice-vdagent
 installpkg gdisk hexedit sg3_utils
 
-## yum plugins
-installpkg yum-plugin-fastestmirror yum-langpacks
-
 ## satisfy libnotify's desktop-notification-daemon with the least crazy option
 installpkg notification-daemon