diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 8b058c07..2269b5b8 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -299,7 +299,7 @@ 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/*
+removefrom rpm /usr/share/locale/*
 removefrom rsync /etc/*
 removefrom sed /usr/share/locale/*
 removefrom smartmontools /etc/* /usr/sbin/smartd
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index ec1e1585..997f96c3 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -3,7 +3,7 @@
 
 ## anaconda package
 installpkg anaconda anaconda-widgets
-installpkg kexec-tools-anaconda-addon
+
 ## anaconda deps that aren't in the RPM
 installpkg tmux
 installpkg firstboot
@@ -144,5 +144,9 @@ installpkg yum-langpacks
 ## RHEL packages
 installpkg subscription-manager
 
+## addons
+installpkg kexec-tools-anaconda-addon
+installpkg oscap-anaconda-addon
+
 ## actually install all the requested packages
 run_pkg_transaction