diff --git a/freeipa.yaml b/freeipa.yaml
index b85a3f2..cde893f 100644
--- a/freeipa.yaml
+++ b/freeipa.yaml
@@ -13,7 +13,7 @@ data:
             bind: master
             sssd: master
             python2: master
-            #python2-ecosystem: master
+            # python2-ecosystem: master
             python3: master
             python3-ecosystem: master
         requires:
@@ -33,6 +33,7 @@ data:
             python3: master
             python3-ecosystem: master
             libtom: master
+            fonts: master
     references:
         community: https://docs.pagure.org/modularity/
         documentation: https://github.com/modularity-modules/freeipa
@@ -61,120 +62,133 @@ data:
                 - freeipa-server-common
                 - freeipa-server-dns
                 - freeipa-server-trust-ad
+        client:
+            description: FreeIPA Client
+            rpms:
+                - freeipa-client
+                - freeipa-client-common
+                - freeipa-common
+        domaincontroller:
+            description: FreeIPA Domain Controller
+            rpms:
+                - freeipa-common
+                - ntp
+                - bind-dyndb-ldap
+                - certmonger
+        dnsserver:
+            description: FreeIPA DNS Server
+            rpms:
+                - freeipa-common
+                - freeipa-server-dns
+        activedirectory:
+            description: FreeIPA Integration with Active Directory
+            rpms:
+                - freeipa-common
+                - freeipa-server-trust-ad
     filter:
         rpms:
-            # - openssl
-            # - openssl-libs
-            # - openssl-devel
-            # - openssl-perl
-            # - openssl-static
-            # - m2crypto
+            # build requirement, runtime python-ldap is in pki:
+            - python2-ldap
+            - python-ldap-debugsource
+            - python2-ldap-debuginfo
     components:
         rpms:
             gssntlmssp:
                 rationale: Build dependency.
-                ref: f27
+                ref: master
                 buildorder: -5
             python-lesscpy:
                 rationale: Build dependency.
-                ref: f27
+                ref: master
                 buildorder: -5
             python-ldap:
                 rationale: Build dependency.
-                ref: f27
+                ref: master
                 buildorder: -5
             libica:
+                arches: [ s390x ]
                 rationale: Build dependency.
-                ref: f27
+                ref: master
                 buildorder: -5
             pyusb:
                 rationale: Build dependency.
-                ref: f27
+                ref: master
                 buildorder: -5
             authconfig:
                 rationale: Generated.
-                ref: f27
+                ref: master
             autofs:
                 rationale: Generated.
-                ref: f27
+                ref: master
             autogen:
                 rationale: Generated.
-                ref: f27
+                ref: master
             babel:
                 rationale: Generated.
-                ref: f27
+                ref: master
             bind-dyndb-ldap:
                 rationale: Generated.
-                ref: f27
+                ref: master
             certmonger:
                 rationale: Generated.
-                ref: f27
+                ref: master
             custodia:
-                rationale: Needed for dogtag
-                ref: f27
-            fontawesome-fonts:
-                rationale: Generated.
-                ref: f27
+                rationale: Needed for dogtag.
+                ref: master
             freeipa:
                 rationale: Generated.
-                ref: f27
-            freeipa-desktop-profile:
-                rationale: Generated.
-                ref: f27
+                ref: master
             hesiod:
                 rationale: Generated.
-                ref: f27
+                ref: master
             ldns:
                 rationale: Generated.
-                ref: f27
+                ref: master
                 buildorder: -5
             m2crypto:
-                # Using master branch because f27 is FTBFS
                 rationale: Generated.
                 ref: master
             mod_auth_gssapi:
                 rationale: Generated.
-                ref: f27
+                ref: master
             mod_lookup_identity:
                 rationale: Generated.
-                ref: f27
+                ref: master
             ntp:
                 rationale: Generated.
-                ref: f27
+                ref: master
             oddjob:
                 rationale: Generated.
-                ref: f27
+                ref: master
             opencryptoki:
                 rationale: Generated.
-                ref: f27
+                ref: master
             opendnssec:
                 rationale: Generated.
-                ref: f27
-            # openssl:
-            #     rationale: Generated.
-            #     ref: c914702332cf3be5ef4aff47068b00509cc092fc
-            #     buildorder: -5
-            open-sans-fonts:
-                rationale: Generated.
-                ref: f27
+                ref: master
             python-jinja2:
                 rationale: Generated.
-                ref: f27
+                ref: master
             python-markupsafe:
                 rationale: Generated.
-                ref: f27
+                ref: master
             python-yubico:
                 rationale: Generated.
-                ref: f27
+                ref: master
             pytz:
                 rationale: Generated.
-                ref: f27
+                ref: master
             rolekit:
-                rationale: Needed for automated testing
-                ref: f27
+                rationale: Needed for automated testing.
+                ref: master
             slapi-nis:
                 rationale: Generated.
-                ref: f27
+                ref: master
             softhsm:
                 rationale: Generated.
-                ref: f27
+                ref: master
+            freeipa-desktop-profile:
+                rationale: Generated.
+                ref: master
+                # build-requires python3-ipaserver from freeipa component
+                buildorder: 1