diff --git a/base-runtime.yaml b/base-runtime.yaml
index 45fa651..3655eb0 100644
--- a/base-runtime.yaml
+++ b/base-runtime.yaml
@@ -64,570 +64,6 @@ data:
                 - redhat-rpm-config
                 - rpm-build
                 - shadow-utils
-    api:
-        rpms: [
-            # acl
-            acl, libacl, libacl-devel,
-            # attr
-            attr, libattr, libattr-devel,
-            # audit
-            audit-libs, audit-libs-devel, audit-libs-static,
-            # babeltrace
-            babeltrace, libbabeltrace,
-            # basesystem
-            basesystem,
-            # bash
-            bash, bash-doc,
-            # binutils
-            binutils, binutils-devel,
-            # byacc
-            byacc,
-            # bzip2
-            bzip2, bzip2-devel, bzip2-libs, bzip2-static,
-            # c-ares
-            c-ares, c-ares-devel,
-            # ca-certificates
-            ca-certificates,
-            # chkconfig
-            chkconfig,
-            # coreutils
-            coreutils, coreutils-common, coreutils-single,
-            # cpio
-            cpio,
-            # cracklib
-            cracklib, cracklib-devel, cracklib-dicts,
-            # crypto-policies
-            crypto-policies,
-            # cryptsetup
-            cryptsetup, cryptsetup-devel, cryptsetup-libs,
-            cryptsetup-reencrypt, veritysetup,
-            # curl
-            curl, libcurl, libcurl-devel,
-            # cyrus-sasl
-            cyrus-sasl, cyrus-sasl-devel, cyrus-sasl-gs2, cyrus-sasl-gssapi,
-            cyrus-sasl-ldap, cyrus-sasl-lib, cyrus-sasl-md5, cyrus-sasl-ntlm,
-            cyrus-sasl-plain, cyrus-sasl-scram,
-            # dbus
-            dbus, dbus-devel, dbus-doc, dbus-libs, dbus-tests,
-            # diffutils
-            diffutils,
-            # dracut
-            dracut, dracut-caps, dracut-config-generic, dracut-config-rescue,
-            dracut-tools,
-            # dwz
-            dwz,
-            # e2fsprogs
-            e2fsprogs, e2fsprogs-devel, e2fsprogs-libs, e2fsprogs-static,
-            libcom_err, libcom_err-devel, libss, libss-devel,
-            # efibootmgr
-            efibootmgr,
-            # efivar
-            efivar, efivar-devel, efivar-libs,
-            # elfutils
-            elfutils, elfutils-default-yama-scope, elfutils-devel,
-            elfutils-devel-static, elfutils-libelf, elfutils-libelf-devel,
-            elfutils-libelf-devel-static, elfutils-libs,
-            # emacs
-            emacs-filesystem,
-            # expat
-            expat, expat-devel, expat-static,
-            # fedora-logos
-            fedora-logos, fedora-logos-httpd,
-            # fedora-modular-release
-            fedora-modular-release,
-            # fedora-rpm-macros
-            fedora-rpm-macros,
-            # fedpkg-minimal
-            fedpkg-minimal,
-            # file
-            file, file-devel, file-libs,
-            # filesystem
-            filesystem,
-            # findutils
-            findutils,
-            # flex
-            flex, flex-devel, flex-doc,
-            # fpc-srpm-macros
-            fpc-srpm-macros,
-            # freetype
-            freetype, freetype-devel,
-            # fuse
-            fuse, fuse-devel, fuse-libs,
-            # gawk
-            gawk, gawk-devel, gawk-doc,
-            # gc
-            gc, gc-devel,
-            # gcc
-            cpp, gcc, gcc-c++, gcc-gdb-plugin, gcc-gfortran, gcc-gnat, gcc-go,
-            gcc-objc, gcc-objc++, gcc-offload-nvptx, gcc-plugin-devel, libasan,
-            libasan-static, libatomic, libatomic-static, libcilkrts,
-            libcilkrts-static, libgcc, libgccjit, libgccjit-devel, libgfortran,
-            libgfortran-static, libgnat, libgnat-devel, libgnat-static, libgo,
-            libgo-devel, libgo-static, libgomp, libgomp-offload-nvptx, libitm,
-            libitm-devel, libitm-static, liblsan, liblsan-static, libmpx,
-            libmpx-static, libobjc, libquadmath, libquadmath-devel,
-            libquadmath-static, libstdc++, libstdc++-devel, libstdc++-docs,
-            libstdc++-static, libtsan, libtsan-static, libubsan,
-            libubsan-static,
-            # gdb
-            gdb, gdb-doc, gdb-gdbserver, gdb-headless,
-            # gdbm
-            gdbm, gdbm-devel,
-            # gettext
-            gettext, gettext-common-devel, gettext-devel, gettext-libs,
-            # ghc-srpm-macros
-            ghc-srpm-macros,
-            # glib2
-            glib2, glib2-doc, glib2-tests,
-            # glibc
-            glibc, glibc-all-langpacks, glibc-common, glibc-devel,
-            glibc-headers, glibc-langpack-aa, glibc-langpack-af,
-            glibc-langpack-ak, glibc-langpack-am, glibc-langpack-an,
-            glibc-langpack-anp, glibc-langpack-ar, glibc-langpack-as,
-            glibc-langpack-ast, glibc-langpack-ayc, glibc-langpack-az,
-            glibc-langpack-be, glibc-langpack-bem, glibc-langpack-ber,
-            glibc-langpack-bg, glibc-langpack-bhb, glibc-langpack-bho,
-            glibc-langpack-bn, glibc-langpack-bo, glibc-langpack-br,
-            glibc-langpack-brx, glibc-langpack-bs, glibc-langpack-byn,
-            glibc-langpack-ca, glibc-langpack-ce, glibc-langpack-chr,
-            glibc-langpack-cmn, glibc-langpack-crh, glibc-langpack-cs,
-            glibc-langpack-csb, glibc-langpack-cv, glibc-langpack-cy,
-            glibc-langpack-da, glibc-langpack-de, glibc-langpack-doi,
-            glibc-langpack-dv, glibc-langpack-dz, glibc-langpack-el,
-            glibc-langpack-en, glibc-langpack-eo, glibc-langpack-es,
-            glibc-langpack-et, glibc-langpack-eu, glibc-langpack-fa,
-            glibc-langpack-ff, glibc-langpack-fi, glibc-langpack-fil,
-            glibc-langpack-fo, glibc-langpack-fr, glibc-langpack-fur,
-            glibc-langpack-fy, glibc-langpack-ga, glibc-langpack-gd,
-            glibc-langpack-gez, glibc-langpack-gl, glibc-langpack-gu,
-            glibc-langpack-gv, glibc-langpack-ha, glibc-langpack-hak,
-            glibc-langpack-he, glibc-langpack-hi, glibc-langpack-hne,
-            glibc-langpack-hr, glibc-langpack-hsb, glibc-langpack-ht,
-            glibc-langpack-hu, glibc-langpack-hy, glibc-langpack-ia,
-            glibc-langpack-id, glibc-langpack-ig, glibc-langpack-ik,
-            glibc-langpack-is, glibc-langpack-it, glibc-langpack-iu,
-            glibc-langpack-ja, glibc-langpack-ka, glibc-langpack-kk,
-            glibc-langpack-kl, glibc-langpack-km, glibc-langpack-kn,
-            glibc-langpack-ko, glibc-langpack-kok, glibc-langpack-ks,
-            glibc-langpack-ku, glibc-langpack-kw, glibc-langpack-ky,
-            glibc-langpack-lb, glibc-langpack-lg, glibc-langpack-li,
-            glibc-langpack-lij, glibc-langpack-ln, glibc-langpack-lo,
-            glibc-langpack-lt, glibc-langpack-lv, glibc-langpack-lzh,
-            glibc-langpack-mag, glibc-langpack-mai, glibc-langpack-mg,
-            glibc-langpack-mhr, glibc-langpack-mi, glibc-langpack-mk,
-            glibc-langpack-ml, glibc-langpack-mn, glibc-langpack-mni,
-            glibc-langpack-mr, glibc-langpack-ms, glibc-langpack-mt,
-            glibc-langpack-my, glibc-langpack-nan, glibc-langpack-nb,
-            glibc-langpack-nds, glibc-langpack-ne, glibc-langpack-nhn,
-            glibc-langpack-niu, glibc-langpack-nl, glibc-langpack-nn,
-            glibc-langpack-nr, glibc-langpack-nso, glibc-langpack-oc,
-            glibc-langpack-om, glibc-langpack-or, glibc-langpack-os,
-            glibc-langpack-pa, glibc-langpack-pap, glibc-langpack-pl,
-            glibc-langpack-ps, glibc-langpack-pt, glibc-langpack-quz,
-            glibc-langpack-raj, glibc-langpack-ro, glibc-langpack-ru,
-            glibc-langpack-rw, glibc-langpack-sa, glibc-langpack-sat,
-            glibc-langpack-sc, glibc-langpack-sd, glibc-langpack-se,
-            glibc-langpack-sgs, glibc-langpack-shs, glibc-langpack-si,
-            glibc-langpack-sid, glibc-langpack-sk, glibc-langpack-sl,
-            glibc-langpack-so, glibc-langpack-sq, glibc-langpack-sr,
-            glibc-langpack-ss, glibc-langpack-st, glibc-langpack-sv,
-            glibc-langpack-sw, glibc-langpack-szl, glibc-langpack-ta,
-            glibc-langpack-tcy, glibc-langpack-te, glibc-langpack-tg,
-            glibc-langpack-th, glibc-langpack-the, glibc-langpack-ti,
-            glibc-langpack-tig, glibc-langpack-tk, glibc-langpack-tl,
-            glibc-langpack-tn, glibc-langpack-tr, glibc-langpack-ts,
-            glibc-langpack-tt, glibc-langpack-ug, glibc-langpack-uk,
-            glibc-langpack-unm, glibc-langpack-ur, glibc-langpack-uz,
-            glibc-langpack-ve, glibc-langpack-vi, glibc-langpack-wa,
-            glibc-langpack-wae, glibc-langpack-wal, glibc-langpack-wo,
-            glibc-langpack-xh, glibc-langpack-yi, glibc-langpack-yo,
-            glibc-langpack-yue, glibc-langpack-zh, glibc-langpack-zu,
-            glibc-locale-source, glibc-minimal-langpack, glibc-nss-devel,
-            glibc-static, libcrypt, libcrypt-nss, nscd, nss_db, nss_hesiod,
-            nss_nis,
-            # gmp
-            gmp, gmp-c++, gmp-devel, gmp-static,
-            # gnat-srpm-macros
-            gnat-srpm-macros,
-            # gnupg2
-            gnupg2,
-            # gnutls
-            gnutls, gnutls-c++,
-            # go-srpm-macros
-            go-srpm-macros,
-            # gobject-introspection
-            gobject-introspection,
-            # gpgme
-            gpgme, gpgme-devel, gpgmepp, gpgmepp-devel,
-            # grep
-            grep,
-            # grub2
-            grub2, grub2-efi, grub2-efi-modules, grub2-starfield-theme,
-            grub2-tools,
-            # guile
-            guile, guile-devel,
-            # gzip
-            gzip,
-            # iptables
-            iptables-libs,
-            # isl
-            isl, isl-devel,
-            # kernel
-            kernel, kernel-core, kernel-cross-headers, kernel-headers,
-            kernel-modules, kernel-modules-extra,
-            # keyutils
-            keyutils, keyutils-libs, keyutils-libs-devel,
-            # kmod
-            kmod, kmod-devel, kmod-libs,
-            # krb5
-            krb5-devel, krb5-libs, krb5-pkinit, krb5-workstation, libkadm5,
-            # libarchive
-            bsdcat, bsdcpio, bsdtar, libarchive, libarchive-devel,
-            # libassuan
-            libassuan, libassuan-devel,
-            # libatomic_ops
-            libatomic_ops, libatomic_ops-devel, libatomic_ops-static,
-            # libcap
-            libcap, libcap-devel, libcap-static,
-            # libcap-ng
-            libcap-ng, libcap-ng-devel, libcap-ng-utils,
-            # libcroco
-            libcroco,
-            # libdb
-            libdb, libdb-cxx, libdb-cxx-devel, libdb-devel, libdb-devel-doc,
-            libdb-devel-static, libdb-java, libdb-java-devel, libdb-sql,
-            libdb-sql-devel, libdb-tcl, libdb-tcl-devel, libdb-utils,
-            # libdnf
-            libdnf,
-            # libev,
-            libev, libev-devel, libev-libevent-devel,
-            # libffi
-            libffi, libffi-devel,
-            # libgcrypt
-            libgcrypt, libgcrypt-devel,
-            # libgpg-error
-            libgpg-error, libgpg-error-devel,
-            # libidn
-            libidn, libidn-devel,
-            # libidn2
-            libidn2, libidn2-devel,
-            # libipt
-            libipt, libipt-devel,
-            # libksba
-            libksba, libksba-devel,
-            # libmetalink
-            libmetalink, libmetalink-devel,
-            # libmpc
-            compat-libmpc, libmpc, libmpc-devel,
-            # libpcap
-            libpcap, libpcap-devel,
-            # libpeas
-            libpeas,
-            # libpng
-            libpng, libpng-devel, libpng-static, libpng-tools,
-            # libpsl
-            libpsl, libpsl-devel, psl,
-            # libpwquality
-            libpwquality, libpwquality-devel,
-            # librepo
-            librepo,
-            # libseccomp
-            libseccomp, libseccomp-devel, libseccomp-static,
-            # libselinux
-            libselinux, libselinux-devel, libselinux-static,
-            libselinux-utils,
-            # libsemanage
-            libsemanage, libsemanage-devel, libsemanage-static,
-            # libsepol
-            libsepol, libsepol-devel, libsepol-static,
-            # libsigsegv
-            libsigsegv, libsigsegv-devel, libsigsegv-static,
-            # libsolv
-            libsolv, libsolv-demo, libsolv-devel, libsolv-tools,
-            # libssh2
-            libssh2, libssh2-devel, libssh2-docs,
-            # libtasn1
-            libtasn1, libtasn1-devel, libtasn1-tools,
-            # libtool
-            libtool-ltdl, libtool-ltdl-devel,
-            # libunistring
-            libunistring, libunistring-devel,
-            # libutempter
-            libutempter, libutempter-devel,
-            # libverto
-            libverto, libverto-devel, libverto-libev, libverto-libev-devel,
-            libverto-glib, libverto-glib-devel,
-            # libxml2
-            libxml2, libxml2-devel, libxml2-static,
-            # linux-firmware
-            iwl100-firmware, iwl1000-firmware, iwl105-firmware,
-            iwl135-firmware, iwl2000-firmware, iwl2030-firmware,
-            iwl3160-firmware, iwl3945-firmware, iwl4965-firmware,
-            iwl5000-firmware, iwl5150-firmware, iwl6000-firmware,
-            iwl6000g2a-firmware, iwl6000g2b-firmware, iwl6050-firmware,
-            iwl7260-firmware, libertas-sd8686-firmware,
-            libertas-sd8787-firmware, libertas-usb8388-firmware,
-            libertas-usb8388-olpc-firmware, linux-firmware,
-            # lua
-            lua, lua-devel, lua-libs, lua-static,
-            # lvm2
-            device-mapper, device-mapper-devel, device-mapper-event,
-            device-mapper-event-devel, device-mapper-event-libs,
-            device-mapper-libs, lvm2-libs,
-            # lz4
-            lz4, lz4-devel, lz4-static,
-            # lzo
-            lzo, lzo-devel, lzo-minilzo,
-            # m4
-            m4,
-            # mactel-boot
-            mactel-boot,
-            # make
-            make, make-devel,
-            # microdnf
-            microdnf,
-            # mokutil
-            mokutil,
-            # mpfr
-            mpfr, mpfr-devel,
-            # mtools
-            mtools,
-            # ncurses
-            ncurses, ncurses-base, ncurses-c++-libs, ncurses-compat-libs,
-            ncurses-devel, ncurses-libs, ncurses-static, ncurses-term,
-            # nettle
-            nettle, nettle-devel,
-            # nghttp2
-            libnghttp2, libnghttp2-devel, nghttp2,
-            # npth
-            npth, npth-devel,
-            # nspr
-            nspr, nspr-devel,
-            # nss
-            nss, nss-devel, nss-pkcs11-devel, nss-sysinit, nss-tools,
-            # nss-pem
-            nss-pem,
-            # nss-softokn
-            nss-softokn, nss-softokn-devel, nss-softokn-freebl,
-            nss-softokn-freebl-devel,
-            # nss-util
-            nss-util, nss-util-devel,
-            # ocaml-srpm-macros
-            ocaml-srpm-macros,
-            # openldap
-            openldap, openldap-clients, openldap-devel,
-            # openssl
-            openssl, openssl-devel, openssl-libs, openssl-static,
-            # os-prober
-            os-prober,
-            # p11-kit
-            p11-kit, p11-kit-devel, p11-kit-tools, p11-kit-trust,
-            # pam
-            pam, pam-devel,
-            # patch
-            patch,
-            # pcre
-            pcre, pcre-cpp, pcre-devel, pcre-doc, pcre-static, pcre-tools,
-            pcre-utf16, pcre-utf32,
-            # perl-srpm-macros
-            perl-srpm-macros,
-            # pkgconf
-            libpkgconf, libpkgconf-devel, pkgconf, pkgconf-m4,
-            pkgconf-pkg-config,
-            # popt
-            popt, popt-devel, popt-static,
-            # procps-ng
-            procps-ng, procps-ng-devel, procps-ng-i18n,
-            # pth
-            pth, pth-devel,
-            # publicsuffix-list
-            publicsuffix-list, publicsuffix-list-dafsa,
-            # pyparsing
-            pyparsing-doc, python3-pyparsing,
-            # python-appdirs
-            python3-appdirs,
-            # python-packaging
-            python-packaging-doc, python3-packaging,
-            # python-pip
-            python3-pip,
-            # python-rpm-macros
-            python-rpm-macros, python-srpm-macros, python2-rpm-macros,
-            python3-rpm-macros,
-            # python-setuptools
-            python3-setuptools,
-            # python-six
-            python3-six,
-            # python3
-            python3, python3-devel, python3-libs, system-python,
-            system-python-libs,
-            # qrencode
-            qrencode, qrencode-devel, qrencode-libs,
-            # qt5
-            qt5-srpm-macros,
-            # readline
-            readline, readline-devel, readline-static,
-            # redhat-rpm-config
-            redhat-rpm-config,
-            # rpm
-            rpm, rpm-apidocs, rpm-build, rpm-build-libs, rpm-devel, rpm-libs,
-            rpm-plugin-ima, rpm-plugin-selinux, rpm-plugin-syslog,
-            rpm-plugin-systemd-inhibit, rpm-sign,
-            # sed
-            sed,
-            # setup
-            setup,
-            # sgml-common
-            sgml-common, xml-common,
-            # shadow-utils
-            shadow-utils,
-            # sqlite
-            lemon, sqlite, sqlite-devel, sqlite-doc, sqlite-libs,
-            # syslinux
-            syslinux, syslinux-devel, syslinux-extlinux,
-            syslinux-extlinux-nonlinux, syslinux-nonlinux, syslinux-tftpboot,
-            # systemd
-            systemd, systemd-container, systemd-devel, systemd-libs,
-            systemd-pam, systemd-udev,
-            # tar
-            tar,
-            # texinfo
-            info,
-            # tzdata
-            tzdata, tzdata-java,
-            # unzip
-            unzip,
-            # ustr
-            ustr, ustr-debug, ustr-debug-static, ustr-devel, ustr-static,
-            # util-linux
-            libblkid, libblkid-devel, libfdisk, libfdisk-devel, libmount,
-            libmount-devel, libsmartcols, libsmartcols-devel, libuuid,
-            libuuid-devel, util-linux, uuidd,
-            # which
-            which,
-            # xz
-            xz, xz-devel, xz-libs, xz-lzma-compat, xz-static,
-            # zip
-            zip,
-            # zlib
-            minizip, minizip-devel, zlib, zlib-devel, zlib-static
-        ]
-    filter:
-        rpms: [
-            # audit
-            audispd-plugins, audispd-plugins-zos, audit, audit-libs-python,
-            audit-libs-python3,
-            # babeltrace
-            libbabeltrace-devel, python3-babeltrace,
-            # chkconfig
-            ntsysv,
-            # cracklib
-            cracklib-python,
-            # cryptsetup
-            cryptsetup-python, cryptsetup-python3,
-            # cyrus-sasl
-            cyrus-sasl-sql,
-            # dbus
-            dbus-x11,
-            # dracut
-            dracut-fips, dracut-fips-aesni, dracut-live, dracut-network,
-            # emacs
-            emacs, emacs-common, emacs-nox, emacs-terminal,
-            # file
-            python-magic, python3-magic,
-            # freetype
-            freetype-demos,
-            # gettext
-            emacs-gettext, msghack,
-            # glib2
-            glib2-devel, glib2-fam, glib2-static,
-            # glibc
-            glibc-benchtests, glibc-utils,
-            # gnupg2
-            gnupg2-smime,
-            # gnutls
-            gnutls-dane, gnutls-devel, gnutls-guile, gnutls-utils,
-            # gobject-introspection
-            gobject-introspection-devel,
-            # gpgme
-            python2-gpg, python3-gpg, qgpgme, qgpgme-devel,
-            # iptables
-            iptables, iptables-compat, iptables-devel, iptables-services,
-            iptables-utils,
-            # kernel
-            kernel-devel, kernel-tools, kernel-tools-libs,
-            kernel-tools-libs-devel, perf, python-perf,
-            # krb5
-            krb5-server, krb5-server-ldap,
-            # libcap-ng
-            libcap-ng-python, libcap-ng-python3,
-            # libcroco
-            libcroco-devel,
-            # libdnf
-            libdnf-devel, python2-hawkey, python3-hawkey,
-            # libidn
-            libidn-java, libidn-javadoc,
-            # libpeas
-            libpeas-devel, libpeas-gtk, libpeas-loader-python,
-            libpeas-loader-python3,
-            # libpsl
-            psl-make-dafsa,
-            # libpwquality
-            python-pwquality, python3-pwquality,
-            # librepo
-            librepo-devel, python2-librepo, python3-librepo,
-            # libselinux
-            libselinux-python, libselinux-python3, libselinux-ruby,
-            # libsemanage
-            libsemanage-python, libsemanage-python3,
-            # libsolv
-            perl-solv, python2-solv, python3-solv, ruby-solv,
-            # libtool
-            libtool,
-            # libverto
-            libverto-libevent, libverto-libevent-devel, libverto-tevent,
-            libverto-tevent-devel,
-            # libxml2
-            python-libxml2, python3-libxml2,
-            # lvm2
-            cmirror, cmirror-standalone, lvm2, lvm2-cluster,
-            lvm2-cluster-standalone, lvm2-dbusd, lvm2-devel, lvm2-lockd,
-            lvm2-python-libs, lvm2-python3-libs,
-            # openldap
-            openldap-servers,
-            # openssl
-            openssl-perl,
-            # pyparsing
-            pyparsing, python2-pyparsing,
-            # python-appdirs
-            python2-appdirs,
-            # python-packaging
-            python2-packaging,
-            # python-pip
-            python2-pip,
-            # python-setuptools
-            python2-setuptools,
-            # python-six
-            python2-six,
-            # python3
-            python3-debug, python3-test, python3-tkinter,
-            python3-tools,
-            # qt5
-            qt5, qt5-devel, qt5-rpm-macros,
-            # redhat-rpm-config
-            kernel-rpm-macros,
-            # rpm
-            python2-rpm, python3-rpm, rpm-cron,
-            # sqlite
-            sqlite-analyzer, sqlite-tcl,
-            # syslinux
-            syslinux-perl,
-            # systemd
-            systemd-journal-remote,
-            # texinfo
-            texinfo, texinfo-tex,
-            # util-linux
-            python3-libmount, util-linux-user,
-        ]
     components:
         rpms:
             # acl-2.2.52-13.fc26