diff --git a/installer.yaml b/installer.yaml
index da18c81..83e4366 100644
--- a/installer.yaml
+++ b/installer.yaml
@@ -146,7 +146,6 @@ data:
     - rsync
     - sgpio
     - augeas-libs
-    - python3-sssdconfig
     - usermode
     - fcoe-utils
     - libblockdev-kbd
@@ -160,6 +159,8 @@ data:
     rpms:
     # NetworkManager
     - NetworkManager-bluetooth
+    - NetworkManager-glib-devel
+    - NetworkManager-libnm-devel
     - NetworkManager-ppp
     - NetworkManager-tui
     - NetworkManager-wifi
@@ -169,34 +170,133 @@ data:
     - anaconda-gui
     - anaconda-widgets
     - anaconda-widgets-devel
-    # dbus
-    - dbus-x11
-    # dmraid
-    - dmraid-events-logwatch
+    # augeas
+    - augeas-devel
+    # createrepo_c
+    - createrepo_c-devel
+    - python2-createrepo_c
+    # dbus-python
+    - dbus-python-devel
+    # drpm
+    - drpm-devel
     # firewalld
     - firewall-applet
     - firewall-config
+    - 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
+    - langtable-python
+    # libblockdev
+    - libblockdev-btrfs-devel
+    - libblockdev-crypto-devel
+    - libblockdev-dm-devel
+    - libblockdev-fs-devel
+    - libblockdev-kbd-devel
+    - libblockdev-loop-devel
+    - libblockdev-lvm-dbus-devel
+    - libblockdev-lvm-devel
+    - libblockdev-mdraid-devel
+    - libblockdev-mpath-devel
+    - libblockdev-part-devel
+    - libblockdev-swap-devel
+    - libblockdev-utils-devel
+    - python2-blockdev
+    # libbytesize
+    - libbytesize-devel
+    - 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
     - libproxy-mozjs
     - libproxy-pacrunner
     - libproxy-webkitgtk4
-    # polkit - needs inspection
+    - python2-libproxy
+    # libsoup
+    - libsoup-devel
+    # libteam
+    - libteam-devel
+    - python-libteam
+    - teamd-devel
+    # libusbx
+    - libusbx-devel
+    # libuser
+    - libuser-devel
+    - libuser-python
+    # lldpad
+    - lldpad-devel
+    # polkit
+    - polkit-devel
+    - polkit-docs
+    # pyOpenSSL
+    - python2-pyOpenSSL
     # pygobject3
+    - pygobject3-devel
     - python-gobject
     - python3-gobject
+    # pykickstart
+    - python-kickstart
+    # python-cffi
+    - python-cffi-doc
+    - python2-cffi
+    # python-coverage
+    - python2-coverage
     # python-cryptography
     - python2-cryptography
+    # python-decorator
+    - python2-decorator
+    # python-idna
+    - python2-idna
     # python-meh
-    - python3-meh-gui
+    - python-meh
     - python-meh-gui
+    - python3-meh-gui
+    # python-ntplib
+    - python2-ntplib
+    # python-pid
+    - python2-pid
+    # python-ply
+    - python2-ply
+    # python-pyasn1
+    - python2-pyasn1
+    - python2-pyasn1-modules
+    # python-pycparser
+    - python2-pycparser
+    # python-pysocks
+    - python2-pysocks
     # python-pyudev
+    - python2-pyudev
     - python2-pyudev-glib
     - python2-pyudev-pyside
     - python2-pyudev-qt4
@@ -204,30 +304,30 @@ data:
     - python2-pyudev-wx
     - python3-pyudev-qt4
     - python3-pyudev-qt5
+    # python-requests
+    - python2-requests
+    # python-requests-file
+    - python2-requests-file
+    # python-requests-ftp
+    - python2-requests-ftp
     # python-slip
+    - python-slip
+    - python-slip-dbus
     - python-slip-gtk
     # python-urllib3
     - python2-urllib3
-    # sssd
-    - sssd-ad
-    - sssd-common
-    - sssd-common-pac
-    - sssd-dbus
-    - sssd-ipa
-    - sssd-krb5
-    - sssd-krb5-common
-    - sssd-ldap
-    - sssd-libwbclient-devel
-    - sssd-nfs
-    - sssd-proxy
-    - sssd-tools
-    - sssd-winbind-idmap
-    - libsss_simpleifp
-    - libsss_simpleifp-devel
-    - python2-sss
-    - python3-sss
+    # satyr
+    - satyr-devel
+    - satyr-python
+    # snappy
+    - snappy-devel
     # usermode
     - usermode-gtk
+    # volume_key
+    - python-volume_key
+    - volume_key-devel
+    # xmlrpc-c
+    - xmlrpc-c-apps
   components:
     rpms:
       NetworkManager:
@@ -414,6 +514,9 @@ data:
       polkit:
         rationale: Automatically generated
         ref: fcbd678dee20a37987a5cfe22e90b175d1289f21
+      polkit-pkla-compat:
+        rationale: Dependency of polkit
+        ref: 71f758ef22453089423c68ffa2562af17e9b0d88
       pyOpenSSL:
         rationale: Automatically generated
         ref: 0021ff00d8cba1a634d588813b4b0b360c5b2a02
@@ -513,9 +616,6 @@ data:
       snappy:
         rationale: Automatically generated
         ref: 4e1d0eafc0fabe79b5ea74e2bf5f42079cb146c2
-      sssd:
-        rationale: Latest stable. Fix test failures.
-        ref: 90107469a76e6bb7247bfb29a40bade398dcf4bf
       usermode:
         rationale: Update to fix FTBFS
         ref: 124aec2cb3cc9910f5abbb1560d49157488136af
@@ -532,10 +632,12 @@ data:
       dnf: master
       installer-bootstrap: master
       shared-userspace: master
+      sssd: master
     requires:
       base-runtime: master
       dnf: master
       shared-userspace: master
+      sssd: master
   description: ''
   license:
     module: