diff --git a/base-runtime.yaml b/base-runtime.yaml
index c70db67..8fee4be 100644
--- a/base-runtime.yaml
+++ b/base-runtime.yaml
@@ -68,8 +68,6 @@ data:
         rpms: [
             # acl
             acl, libacl, libacl-devel,
-            # at
-            at,
             # attr
             attr, libattr, libattr-devel,
             # audit
@@ -80,8 +78,6 @@ data:
             basesystem,
             # bash
             bash, bash-doc,
-            # bc
-            bc,
             # binutils
             binutils, binutils-devel,
             # byacc
@@ -90,8 +86,6 @@ data:
             bzip2, bzip2-devel, bzip2-libs, bzip2-static,
             # ca-certificates
             ca-certificates,
-            # cflow
-            cflow,
             # chkconfig
             chkconfig,
             # coreutils
@@ -100,17 +94,11 @@ data:
             cpio,
             # cracklib
             cracklib, cracklib-devel, cracklib-dicts,
-            # cronie
-            cronie, cronie-anacron, cronie-noanacron,
-            # crontabs
-            crontabs,
             # crypto-policies
             crypto-policies,
             # cryptsetup
             cryptsetup, cryptsetup-devel, cryptsetup-libs,
             cryptsetup-reencrypt, veritysetup,
-            # ctags
-            ctags, ctags-etags,
             # curl
             curl, libcurl, libcurl-devel,
             # cyrus-sasl
@@ -129,8 +117,10 @@ data:
             # e2fsprogs
             e2fsprogs-devel, e2fsprogs-libs, e2fsprogs-static, libcom_err,
             libcom_err-devel, libss, libss-devel,
-            # ed
-            ed,
+            # efibootmgr
+            efibootmgr,
+            # efivar
+            efivar, efivar-devel, efivar-libs,
             # elfutils
             elfutils, elfutils-default-yama-scope, elfutils-devel,
             elfutils-devel-static, elfutils-libelf, elfutils-libelf-devel,
@@ -267,8 +257,6 @@ data:
             gpgme, gpgme-devel, gpgmepp, gpgmepp-devel,
             # grep
             grep,
-            # groff
-            groff-base,
             # grub2
             grub2, grub2-efi, grub2-efi-modules, grub2-starfield-theme,
             grub2-tools,
@@ -276,8 +264,6 @@ data:
             guile, guile-devel,
             # gzip
             gzip,
-            # hmaccalc
-            hmaccalc,
             # iptables
             iptables-libs,
             # isl
@@ -291,8 +277,6 @@ data:
             kmod, kmod-devel, kmod-libs,
             # krb5
             krb5-devel, krb5-libs, krb5-pkinit, krb5-workstation, libkadm5,
-            # less
-            less,
             # libarchive
             bsdcat, bsdcpio, bsdtar, libarchive, libarchive-devel,
             # libassuan
@@ -333,8 +317,6 @@ data:
             libpcap, libpcap-devel,
             # libpeas
             libpeas,
-            # libpipeline
-            libpipeline, libpipeline-devel,
             # libpng
             libpng, libpng-devel, libpng-static, libpng-tools,
             # libpsl
@@ -391,16 +373,18 @@ data:
             lzo, lzo-devel, lzo-minilzo,
             # m4
             m4,
+            # mactel-boot
+            mactel-boot,
             # make
             make, make-devel,
-            # man-db
-            man-db, man-db-cron,
             # microdnf
             microdnf,
+            # mokutil
+            mokutil,
             # mpfr
             mpfr, mpfr-devel,
-            # ncompress
-            ncompress,
+            # mtools
+            mtools,
             # ncurses
             ncurses, ncurses-base, ncurses-c++-libs, ncurses-compat-libs,
             ncurses-devel, ncurses-libs, ncurses-static, ncurses-term,
@@ -447,10 +431,6 @@ data:
             popt, popt-devel, popt-static,
             # procps-ng
             procps-ng, procps-ng-devel, procps-ng-i18n,
-            # psmisc
-            psmisc,
-            # pth
-            pth, pth-devel,
             # publicsuffix-list
             publicsuffix-list, publicsuffix-list-dafsa,
             # pyparsing
@@ -488,10 +468,13 @@ data:
             setup,
             # shadow-utils
             shadow-utils,
-            # sharutils
-            sharutils,
+            # shim-signed
+            shim,
             # 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,
@@ -499,8 +482,6 @@ data:
             tar,
             # texinfo
             info,
-            # time
-            time,
             # tzdata
             tzdata, tzdata-java,
             # unzip
@@ -511,8 +492,6 @@ data:
             libblkid, libblkid-devel, libfdisk, libfdisk-devel, libmount,
             libmount-devel, libsmartcols, libsmartcols-devel, libuuid,
             libuuid-devel, util-linux, uuidd,
-            # vim
-            vim-common, vim-filesystem, vim-minimal,
             # which
             which,
             # xz
@@ -563,8 +542,6 @@ data:
             gobject-introspection-devel,
             # gpgme
             python2-gpg, python3-gpg, qgpgme, qgpgme-devel,
-            # groff
-            groff, groff-doc, groff-perl, groff-x11,
             # iptables
             iptables, iptables-compat, iptables-devel, iptables-services,
             iptables-utils,
@@ -636,14 +613,14 @@ data:
             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,
-            # vim
-            vim-X11, vim-enhanced
         ]
     components:
         rpms:
@@ -651,10 +628,6 @@ data:
             acl:
                 rationale: Autogenerated from sampledata.
                 ref: 1b70d5975cbe16d4fd4e14de4e132e5b8bc39c53
-            # at-3.1.20-3.fc26
-            at:
-                rationale: Autogenerated from sampledata.
-                ref: c90eeec20af10ac0bb6cd01b7b38b99d7a04420e
             # attr-2.4.47-18.fc26
             attr:
                 rationale: Autogenerated from sampledata.
@@ -675,10 +648,6 @@ data:
             bash:
                 rationale: Autogenerated from sampledata.
                 ref: 04e4ecb3e66000bd0f8af08dc4150fa9febc8656
-            # bc-1.06.95-18.fc26
-            bc:
-                rationale: Autogenerated from sampledata.
-                ref: 2cdfa698bfc045918bbc39456a952532fc9de6ff
             # binutils-2.27-19.fc26
             binutils:
                 rationale: Autogenerated from sampledata.
@@ -695,10 +664,6 @@ data:
             ca-certificates:
                 rationale: Autogenerated from sampledata.
                 ref: c1c275770a923610511be57f74b3a4468d0112a9
-            # cflow-1.5-2.fc26
-            cflow:
-                rationale: Autogenerated from sampledata.
-                ref: f68387593eaffe0c9612ccb6d4d15390bd308fc7
             # chkconfig-1.9-1.fc26
             chkconfig:
                 rationale: Autogenerated from sampledata.
@@ -715,14 +680,6 @@ data:
             cracklib:
                 rationale: Autogenerated from sampledata.
                 ref: 2edb3e61e337926a92d56ffe84bd8cdb0f625586
-            # cronie-1.5.1-5.fc26
-            cronie:
-                rationale: Autogenerated from sampledata.
-                ref: d4e9ad734eced007fc4c190893c0b3f3ee12d260
-            # crontabs-1.11-14.20150630git.fc26
-            crontabs:
-                rationale: Autogenerated from sampledata.
-                ref: a1224ec526869dda086bfbfa7f37a422e2d6aeaf
             # crypto-policies-20170214-2.gitf3018dd.fc26
             crypto-policies:
                 rationale: Autogenerated from sampledata.
@@ -731,10 +688,6 @@ data:
             cryptsetup:
                 rationale: Autogenerated from sampledata.
                 ref: f0156f049d8f3fd8af0f07189237b65d1299fea9
-            # ctags-5.8-19.fc26
-            ctags:
-                rationale: Autogenerated from sampledata.
-                ref: 12552473663b28c4a50f62573b21aef28e5a68cf
             # curl-7.53.1-1.fc26
             curl:
                 rationale: Autogenerated from sampledata.
@@ -763,10 +716,14 @@ data:
             e2fsprogs:
                 rationale: Autogenerated from sampledata.
                 ref: 55a0c09e0e30ab1fb7306bc48f5842f08d58201d
-            # ed-1.14.1-2.fc26
-            ed:
+            # efibootmgr-14-3.fc26
+            efibootmgr:
                 rationale: Autogenerated from sampledata.
-                ref: 294cc9c77141dd8232afc8200a01537284fa939f
+                ref: 993c97f8b4ba23dac342fa40ab42a916a7886269
+            # efivar-30-4.fc26
+            efivar:
+                rationale: Autogenerated from sampledata.
+                ref: 0c5a60e160ed45b0afee8b146f3b38365b2af95d
             # elfutils-0.168-5.fc26
             elfutils:
                 rationale: Autogenerated from sampledata.
@@ -886,10 +843,6 @@ data:
             grep:
                 rationale: Autogenerated from sampledata.
                 ref: c232695f408106307c43b2954c732a5a6bb352ba
-            # groff-1.22.3-9.fc26
-            groff:
-                rationale: Autogenerated from sampledata.
-                ref: 24f89e57eee18296f1031fe906df81dd029b8f5c
             # grub2-2.02-0.38.fc26
             grub2:
                 rationale: Autogenerated from sampledata.
@@ -902,10 +855,6 @@ data:
             gzip:
                 rationale: Autogenerated from sampledata.
                 ref: cd306eb7f9bfce3b27372269d7b092812c312e9d
-            # hmaccalc-0.9.14-6.fc26
-            hmaccalc:
-                rationale: Autogenerated from sampledata.
-                ref: 0d6475031832f6e824c66a720fa9b2dcbfb8964e
             # iptables-1.6.1-2.fc26
             iptables:
                 rationale: Autogenerated from sampledata.
@@ -930,10 +879,6 @@ data:
             krb5:
                 rationale: Autogenerated from sampledata.
                 ref: 0d08e37340c5276b32dcdcf39c02c577e2102829
-            # less-487-2.fc26
-            less:
-                rationale: Autogenerated from sampledata.
-                ref: 8ba41a80f5de4605cb614c265eedf79ebfa44d22
             # libarchive-3.2.2-3.fc26
             libarchive:
                 rationale: Autogenerated from sampledata.
@@ -1010,10 +955,6 @@ data:
             libpeas:
                 rationale: Autogenerated from sampledata.
                 ref: f479ecc4041fb2b836b1270b9d117f3ffed12e1f
-            # libpipeline-1.4.1-3.fc26
-            libpipeline:
-                rationale: Autogenerated from sampledata.
-                ref: d34bc5542e09a5faf68728107ea3eb05b4421288
             # libpng-1.6.28-2.fc26
             libpng:
                 rationale: Autogenerated from sampledata.
@@ -1106,26 +1047,30 @@ data:
             m4:
                 rationale: Autogenerated from sampledata.
                 ref: 720144b905662d90fb6fc44da11e157742dd8087
+            # mactel-boot
+            mactel-boot:
+                rationale: Autogenerated from sampledata.
+                ref: 129a7f0b78d99f20df2b52d72dc24b6a87e7f82e
             # make-4.2.1-2.fc26
             make:
                 rationale: Autogenerated from sampledata.
                 ref: 966e01fab75b418a684d097b0596ee7159c80739
-            # man-db-2.7.6.1-2.fc26
-            man-db:
-                rationale: Autogenerated from sampledata.
-                ref: b7621a9cc1c12a8841f00bf2bc1dd0160eb9fa8c
             # microdnf-2-2.fc26
             microdnf:
                 rationale: Autogenerated from sampledata.
                 ref: 13625aae6d2d565110ab614402424544b9905de0
+            # mokutil-0.3.0-4.fc26
+            mokutil:
+                rationale: Autogenerated from sampledata.
+                ref: 802dd0c3c70005a9e7832d7274e4c0df282f8bb0
             # mpfr-3.1.5-2.fc26
             mpfr:
                 rationale: Autogenerated from sampledata.
                 ref: 7fe92b13b92156de8af013e794efc4781e71fa6b
-            # ncompress-4.2.4.4-7.fc26
-            ncompress:
+            # mtools-4.0.18-11.fc26
+            mtools:
                 rationale: Autogenerated from sampledata.
-                ref: 557b42d7f30901ae3ae564ffbc1a3d0ed635d4e4
+                ref: 90349496f4f041ba4c1396479b921f994cac5164
             # ncurses-6.0-8.20170212.fc26
             ncurses:
                 rationale: Autogenerated from sampledata.
@@ -1210,14 +1155,6 @@ data:
             procps-ng:
                 rationale: Autogenerated from sampledata.
                 ref: e54875d55a6b845a707004d29bffa11377321d15
-            # psmisc-22.21-9.fc26
-            psmisc:
-                rationale: Autogenerated from sampledata.
-                ref: d8eda9b1f9cbc3cfe02fb0c42c8d6a2885d3d25a
-            # pth-2.0.7-28.fc26
-            pth:
-                rationale: Autogenerated from sampledata.
-                ref: 4a65b57e8c1352a94ccf369d365d4f375119ef51
             # publicsuffix-list-20170206-1.fc26
             publicsuffix-list:
                 rationale: Autogenerated from sampledata.
@@ -1286,14 +1223,18 @@ data:
             shadow-utils:
                 rationale: Autogenerated from sampledata.
                 ref: ba9340caf5a3f86043659dd5dc83d9280cd38185
-            # sharutils-4.15.2-5.fc26
-            sharutils:
+            # shim-signed-0.8-10
+            shim-signed:
                 rationale: Autogenerated from sampledata.
-                ref: c1552ed6d1d0ded3754e34d21afb864a8b555df3
+                ref: f1f880777feb7333ecf6df2b77bd46761803fefe
             # sqlite-3.17.0-1.fc26
             sqlite:
                 rationale: Autogenerated from sampledata.
                 ref: e1d4f821fc02f20cf66dc9addba44ccb13f989ff
+            # syslinux-6.04-0.2.fc26
+            syslinux:
+                rationale: Autogenerated from sampledata.
+                ref: f793e3a0a39cf86dd5fff0448010b978583e4de2
             # systemd-232-15.fc26
             systemd:
                 rationale: Autogenerated from sampledata.
@@ -1306,10 +1247,6 @@ data:
             texinfo:
                 rationale: Autogenerated from sampledata.
                 ref: 6f9737e6acfc74b4484deff8500cedd3aea890a6
-            # time-1.7-52.fc26
-            time:
-                rationale: Autogenerated from sampledata.
-                ref: 0e9df1c2aa4fa7454bba05cfc33e2785baadc0ac
             # tzdata-2016j-3.fc26
             tzdata:
                 rationale: Autogenerated from sampledata.
@@ -1326,10 +1263,6 @@ data:
             util-linux:
                 rationale: Autogenerated from sampledata.
                 ref: 04f1d57f74fd4738d2c462a2302031bc92a186b9
-            # vim-8.0.347-2.fc26
-            vim:
-                rationale: Autogenerated from sampledata.
-                ref: 8088bd52d4484ff013868ebc9689754b4f17150a
             # which-2.21-2.fc26
             which:
                 rationale: Autogenerated from sampledata.