diff --git a/base-runtime.yaml b/base-runtime.yaml
index 4d0a688..640f4fd 100644
--- a/base-runtime.yaml
+++ b/base-runtime.yaml
@@ -111,7 +111,7 @@ data:
             diffutils,
             # dracut
             dracut, dracut-caps, dracut-config-generic, dracut-config-rescue,
-            dracut-fips, dracut-fips-aesni, dracut-tools,
+            dracut-tools,
             # dwz
             dwz,
             # e2fsprogs
@@ -150,7 +150,7 @@ data:
             # freetype
             freetype, freetype-devel,
             # fuse
-            fuse, fuse-common, fuse-devel, fuse-libs,
+            fuse, fuse-devel, fuse-libs,
             # gawk
             gawk, gawk-devel, gawk-doc,
             # gc
@@ -272,7 +272,7 @@ data:
             isl, isl-devel,
             # kernel
             kernel, kernel-core, kernel-cross-headers, kernel-headers,
-            kernel-modules, kernel-modules-extra, kernel-tools-libs,
+            kernel-modules, kernel-modules-extra,
             # keyutils
             keyutils, keyutils-libs, keyutils-libs-devel,
             # kmod
@@ -332,7 +332,7 @@ data:
             # libseccomp
             libseccomp, libseccomp-devel, libseccomp-static,
             # libselinux
-            libselinux, libselinux-devel, libselinux-ruby, libselinux-static,
+            libselinux, libselinux-devel, libselinux-static,
             libselinux-utils,
             # libsemanage
             libsemanage, libsemanage-devel, libsemanage-static,
@@ -341,7 +341,7 @@ data:
             # libsigsegv
             libsigsegv, libsigsegv-devel, libsigsegv-static,
             # libsolv
-            libsolv, libsolv-demo, libsolv-devel, libsolv-tools, ruby-solv,
+            libsolv, libsolv-demo, libsolv-devel, libsolv-tools,
             # libssh2
             libssh2, libssh2-devel, libssh2-docs,
             # libtasn1
@@ -456,7 +456,8 @@ data:
             # python-six
             python3-six,
             # python3
-            python3, python3-libs, system-python, system-python-libs,
+            python3, python3-devel, python3-libs, system-python,
+            system-python-libs,
             # qrencode
             qrencode, qrencode-devel, qrencode-libs,
             # qt5
@@ -524,7 +525,7 @@ data:
             # dbus
             dbus-devel, dbus-x11,
             # dracut
-            dracut-live, dracut-network,
+            dracut-fips, dracut-fips-aesni, dracut-live, dracut-network,
             # emacs
             emacs, emacs-common, emacs-nox, emacs-terminal,
             # file
@@ -549,8 +550,8 @@ data:
             iptables, iptables-compat, iptables-devel, iptables-services,
             iptables-utils,
             # kernel
-            kernel-devel, kernel-tools, kernel-tools-libs-devel, perf,
-            python-perf,
+            kernel-devel, kernel-tools, kernel-tools-libs,
+            kernel-tools-libs-devel, perf, python-perf,
             # krb5
             krb5-server, krb5-server-ldap,
             # libcap-ng
@@ -571,11 +572,11 @@ data:
             # librepo
             librepo-devel, python2-librepo, python3-librepo,
             # libselinux
-            libselinux-python, libselinux-python3,
+            libselinux-python, libselinux-python3, libselinux-ruby,
             # libsemanage
             libsemanage-python, libsemanage-python3,
             # libsolv
-            perl-solv, python2-solv, python3-solv,
+            perl-solv, python2-solv, python3-solv, ruby-solv,
             # libtool
             libtool,
             # libverto
@@ -606,7 +607,7 @@ data:
             # python-six
             python2-six,
             # python3
-            python3-debug, python3-devel, python3-test, python3-tkinter,
+            python3-debug, python3-test, python3-tkinter,
             python3-tools,
             # qt5
             qt5, qt5-devel, qt5-rpm-macros,