diff --git a/installer.yaml b/installer.yaml
index 0203cf0..e0de63c 100644
--- a/installer.yaml
+++ b/installer.yaml
@@ -1,160 +1,129 @@
 data:
   api:
     rpms:
-    - kbd-misc
-    - libuser
-    - libblockdev-plugins-all
-    - iputils
-    - isomd5sum
-    - lz4
-    - kbd
-    - python3-pytz
-    - kexec-tools
-    - xmlrpc-c-client
-    - python3-cffi
-    - python3-pwquality
-    - python3-cryptography
-    - kbd-legacy
-    - anaconda-tui
-    - satyr
-    - python3-pyOpenSSL
-    - snappy
-    - python3-hawkey
-    - libnl3
-    - langtable-data
-    - libblockdev-dm
-    - iptables
-    - ipset
-    - libselinux-python3
-    - python3-requests-ftp
-    - libtar
-    - libdaemon
-    - libss
-    - iproute
-    - device-mapper-persistent-data
-    - libbytesize
-    - xmlrpc-c
-    - python3-gobject-base
-    - polkit-libs
-    - libmodman
-    - libconfig
-    - teamd
-    - libnl3-cli
-    - python3-librepo
-    - libselinux-utils
-    - python3-pycparser
-    - libblockdev-btrfs
-    - libblockdev-mpath
-    - json-c
-    - dosfstools
-    - libblockdev-mdraid
-    - libpciaccess
-    - python3-requests-file
-    - python3-pyasn1
-    - langtable
-    - python3-ntplib
-    - mdadm
-    - python3-urllib3
-    - glib-networking
-    - python3-pid
-    - hwdata
-    - libproxy
-    - lvm2-libs
-    - bind99-libs
-    - python3-ordered-set
-    - kpartx
-    - python3-bytesize
-    - python3-requests
-    - dmraid-events
-    - dhcp-libs
-    - libblockdev-swap
     - anaconda-core
-    - device-mapper-multipath
-    - python3-chardet
-    - libteam
-    - python3-slip
-    - openssl
-    - dhcp-common
-    - jansson
-    - device-mapper-multipath-libs
-    - e2fsprogs-libs
-    - lsof
-    - python3-slip-dbus
-    - hfsplus-tools
-    - lldpad
-    - lvm2
-    - python3-blivet
-    - python3-iscsi-initiator-utils
-    - python3-ply
-    - libmnl
-    - gdisk
-    - libblockdev-loop
-    - dmraid
-    - libnetfilter_conntrack
-    - bcache-tools
-    - rpm-plugin-systemd-inhibit
-    - python3-decorator
-    - firewalld
-    - python3-wrapt
-    - python3-pysocks
-    - NetworkManager-libnm
-    - python3-firewall
-    - NetworkManager
-    - python3-idna
-    - libusbx
-    - realmd
-    - python3-pygpgme
-    - libblockdev-crypto
-    - python3-blockdev
-    - python3-kickstart
-    - authconfig
-    - drpm
-    - libblockdev-utils
-    - createrepo_c-libs
-    - libnfnetlink
-    - ipset-libs
-    - device-mapper-event-libs
-    - libblockdev-part
-    - python3-coverage
-    - initscripts
-    - bind99-license
-    - device-mapper-event
-    - volume_key-libs
-    - python3-pyparted
-    - ethtool
-    - libndp
-    - iscsi-initiator-utils-iscsiuio
-    - firewalld-filesystem
-    - python3-pyudev
-    - dhcp-client
-    - e2fsprogs
-    - libblockdev
-    - gsettings-desktop-schemas
-    - libgudev
-    - libblockdev-fs
-    - python3-dbus
-    - dracut-network
-    - hostname
-    - libblockdev-lvm
-    - iscsi-initiator-utils
-    - libsoup
-    - glibc-langpack-en
-    - ebtables
-    - cracklib-dicts
-    - passwd
-    - python3-meh
-    - rsync
-    - sgpio
+    - anaconda-tui
     - augeas-libs
-    - usermode
-    - fcoe-utils
-    - libblockdev-kbd
-    - ipcalc
+    - bcache-tools
+    - bind99-libs
+    - bind99-license
     - chrony
     - createrepo_c
+    - createrepo_c-libs
+    - device-mapper-multipath
+    - device-mapper-multipath-libs
+    - dhcp-client
+    - dhcp-common
+    - dhcp-libs
+    - dmraid
+    - dmraid-events
+    - dosfstools
+    - dracut-live
+    - dracut-network
+    - drpm
+    - ebtables
+    - ethtool
+    - fcoe-utils
+    - firewalld
+    - firewalld-filesystem
+    - gdisk
+    - glib-networking
+    - gsettings-desktop-schemas
+    - hfsplus-tools
+    - hostname
+    - initscripts
+    - ipcalc
+    - ipset
+    - ipset-libs
+    - iscsi-initiator-utils
+    - iscsi-initiator-utils-iscsiuio
+    - isomd5sum
+    - kbd
+    - kbd-legacy
+    - kbd-misc
+    - kexec-tools
+    - kpartx
+    - langtable
+    - langtable-data
     - langtable-python3
-    - python3-rpm
+    - libblockdev
+    - libblockdev-btrfs
+    - libblockdev-crypto
+    - libblockdev-dm
+    - libblockdev-fs
+    - libblockdev-kbd
+    - libblockdev-loop
+    - libblockdev-lvm
+    - libblockdev-mdraid
+    - libblockdev-mpath
+    - libblockdev-part
+    - libblockdev-plugins-all
+    - libblockdev-swap
+    - libblockdev-utils
+    - libbytesize
+    - libconfig
+    - libgudev
+    - libndp
+    - libnl3
+    - libnl3-cli
+    - libproxy
+    - libsoup
+    - libtar
+    - libteam
+    - libusbx
+    - libuser
+    - lldpad
+    - lsof
+    - mdadm
+    - NetworkManager
+    - NetworkManager-libnm
     - NetworkManager-team
+    - passwd
+    - polkit-libs
+    - python3-blivet
+    - python3-blockdev
+    - python3-bytesize
+    - python3-cffi
+    - python3-chardet
+    - python3-coverage
+    - python3-cryptography
+    - python3-dbus
+    - python3-decorator
+    - python3-firewall
+    - python3-gobject-base
+    - python3-idna
+    - python3-iscsi-initiator-utils
+    - python3-kickstart
+    - python3-meh
+    - python3-ntplib
+    - python3-ordered-set
+    - python3-pid
+    - python3-ply
+    - python3-pyasn1
+    - python3-pycparser
+    - python3-pyOpenSSL
+    - python3-pyparted
+    - python3-pysocks
+    - python3-pytz
+    - python3-pyudev
+    - python3-requests
+    - python3-requests-file
+    - python3-requests-ftp
+    - python3-slip
+    - python3-slip-dbus
+    - python3-urllib3
+    - python3-wrapt
+    - realmd
+    - rsync
+    - satyr
+    - sgpio
+    - snappy
+    - teamd
+    - tmux
+    - usermode
+    - volume_key-libs
+    - xmlrpc-c
+    - xmlrpc-c-client
   filter:
     rpms:
     # NetworkManager
@@ -177,6 +146,16 @@ data:
     - python2-createrepo_c
     # dbus-python
     - dbus-python-devel
+    # dmraid
+    - dmraid-events-logwatch
+    # dracut
+    - dracut
+    - dracut-caps
+    - dracut-config-generic
+    - dracut-config-rescue
+    - dracut-fips
+    - dracut-fips-aesni
+    - dracut-tools
     # drpm
     - drpm-devel
     # firewalld
@@ -185,14 +164,8 @@ data:
     - python-firewall
     # gsettings-desktop-schemas
     - gsettings-desktop-schemas-devel
-    # iproute
-    - iproute-tc
     # ipset
     - ipset-devel
-    # jansson
-    - jansson-devel
-    # json-c
-    - json-c-devel
     # kexec-tools
     - kexec-tools-anaconda-addon
     # langtable
@@ -217,25 +190,13 @@ data:
     - python-bytesize
     # libconfig
     - libconfig-devel
-    # libdaemon
-    - libdaemon-devel
     # libgudev
     - libgudev-devel
-    # libmnl
-    - libmnl-devel
-    # libmodman
-    - libmodman-devel
     # libndp
     - libndp-devel
-    # libnetfilter_conntrack
-    - libnetfilter_conntrack-devel
-    # libnfnetlink
-    - libnfnetlink-devel
     # libnl3
     - libnl3-devel
     - python-libnl3
-    # libpciaccess
-    - libpciaccess-devel
     # libproxy
     - libproxy-devel
     - libproxy-kde
@@ -334,7 +295,7 @@ data:
     rpms:
       NetworkManager:
         rationale: Latest version to fix build errors
-        ref: 085f84674b9171b5176000ad04d23aea8e24b60d
+        ref: a53c203b20bb3bcb6137a99ab20133396106622d
       anaconda:
         rationale: Update to Fedora 26 beta freeze version
         ref: 471d1b56989610cc7dd791823c5f139007222bc6
@@ -365,9 +326,6 @@ data:
       device-mapper-multipath:
         rationale: Automatically generated
         ref: 8e9e3b7467947f8aada42f17e23e98b8be76285f
-      device-mapper-persistent-data:
-        rationale: Automatically generated
-        ref: 0a96e398abb747cbb8862e0a4a3be42617d1d1ca
       dhcp:
         rationale: Automatically generated
         ref: 00c7b672b0b5e9a20084edab9e478fb7ac32d6e9
@@ -377,6 +335,9 @@ data:
       dosfstools:
         rationale: Automatically generated
         ref: 583cba6c622aa10aaff5dd7d490d9425aa6e9829
+      dracut:
+        rationale: baseruntime doesn't provide dracut-network
+        ref: 04d6319f7600ca18a9a0da517052af6e56986657
       drpm:
         rationale: Fix test suite FTBFS
         ref: a15a225621e8f2347b1f605b0506999669ba30ce
@@ -407,36 +368,21 @@ data:
       hostname:
         rationale: Automatically generated
         ref: 0295eebd4fdb0f743622697699cb24452e134921
-      hwdata:
-        rationale: Automatically generated
-        ref: 3229b7e74693107035460356659d770518dace9e
       initscripts:
         rationale: Automatically generated
         ref: 049c81f2d3e2aac907375522d446d6a8df551c2a
       ipcalc:
         rationale: Automatically generated
         ref: 94b17329ad410efbaf01eef190b166e5b893976f
-      iproute:
-        rationale: Automatically generated
-        ref: 5362d1ec6009ae1343fdd257bd15a4f752fcb008
       ipset:
         rationale: Automatically generated
         ref: 5a4869ae44738727eb2618816346f9830d47ca52
-      iputils:
-        rationale: Automatically generated
-        ref: 3be51cc88526fbf29d67dd1de80366b416140975
       iscsi-initiator-utils:
         rationale: Automatically generated
         ref: 3e84e8c88d0f03d39e084a535411f6bca6613264
       isomd5sum:
         rationale: Automatically generated
         ref: d4a2bfeeba51a3aa8d0f4bb96c2a91446ad7c65d
-      jansson:
-        rationale: Automatically generated
-        ref: 87cf3eaa9513e3f659dd2941faf2667538dc877d
-      json-c:
-        rationale: Automatically generated
-        ref: fdf4b42349251f8cda8e1f6125b70582d6ff1ae3
       kbd:
         rationale: Automatically generated
         ref: 662a2c6744cba8c78e0c1f6cb91df6abcf56222e
@@ -456,33 +402,15 @@ data:
       libconfig:
         rationale: Automatically generated
         ref: d6d9b7d012624c9fa4905bb5f9b24004bd445414
-      libdaemon:
-        rationale: Automatically generated
-        ref: cded0af21e7f3e8521bc610ae94b1227be52ca1b
       libgudev:
         rationale: Automatically generated
         ref: 967fcdee403ce64e333170aed62ec88e8a2796ff
-      libmnl:
-        rationale: Automatically generated
-        ref: 0fecaca66472a4f11fbac306aaded65a354dcfab
-      libmodman:
-        rationale: Automatically generated
-        ref: ba5951e1830ef27cdf78d4c4513967f29d9b4149
       libndp:
         rationale: Automatically generated
         ref: 743399d6336993a1d6a953ac8c4d1f42bfbf2743
-      libnetfilter_conntrack:
-        rationale: Automatically generated
-        ref: 0e59521eaee1763e46d0a48e0ad6e5d02fc67e59
-      libnfnetlink:
-        rationale: Automatically generated
-        ref: 3e3ab7c13aac49047432b6f4ceb42ef1ed48c483
       libnl3:
         rationale: Automatically generated
         ref: c59222a3d1ff195e17ca81a4a52f1c8782af12f2
-      libpciaccess:
-        rationale: Automatically generated
-        ref: 14af11625e1c86b564e7eef18cc8318714c11df1
       libproxy:
         rationale: Automatically generated
         ref: da793c1f5aced58e40bf86d15903f5d28d1eabb1
@@ -605,7 +533,7 @@ data:
         ref: 1538f79020fb4d55d79c804f85ff5460f48930f1
       pytz:
         rationale: Automatically generated
-        ref: 67de44e3f3504d7083a85a4520b97bf3fa3c6c46
+        ref: 8da39891076bf410584df48a0b486e71c4dee358
       realmd:
         rationale: Automatically generated
         ref: 2009ea05e5a1ff1cf363b0fb15f6a68633c9f8ae
@@ -621,6 +549,13 @@ data:
       snappy:
         rationale: Automatically generated
         ref: 4e1d0eafc0fabe79b5ea74e2bf5f42079cb146c2
+      startup-notification:
+        rationale: Needed for usermode, disappeared from bootstrap.
+        ref: 1f8690873e1c8299828610dcbaa651f0c3204d79
+        buildorder: -1
+      tmux:
+        rationale: Required by anaconda
+        ref: d51025f60ff58e2454f1f48aa9c49a9f2ac4dabc
       usermode:
         rationale: Update to fix FTBFS
         ref: 124aec2cb3cc9910f5abbb1560d49157488136af
@@ -629,7 +564,7 @@ data:
         ref: 8f83183cd99f94009b63216cbafd55fc0a37470d
       xmlrpc-c:
         rationale: Automatically generated
-        ref: 46bffbbc772e305aade00c09bd4fffb20151f301
+        ref: cd1fc7a8922d08eb4cc03b630e8e83bcec6a3436
   dependencies:
     buildrequires:
       bootstrap: f26
@@ -643,6 +578,7 @@ data:
       dnf: f26
       shared-userspace: f26
       sssd: f26
+      dhcp: f26
   description: ''
   license:
     module: