diff --git a/freeipa.yaml b/freeipa.yaml
index 88c0c20..cde893f 100644
--- a/freeipa.yaml
+++ b/freeipa.yaml
@@ -8,44 +8,32 @@ data:
             - MIT
     dependencies:
         buildrequires:
-            bootstrap: f27
-            platform: f27
-            java: 8
-            perl: 5.26
-            389-ds: 1.3
-            bind: 9
-            sssd: 1.16
-            samba: 4.7
-            pki: 10.4
-            tomcat: 8.0
-            resteasy: 3.0
-            httpd: 2.4
-            python2: 2.7
-            python2-ecosystem: f27
-            python3: 3.6
-            python3-ecosystem: f27
-            libtom: f27
-            networking-base: f27
-            fonts: f27
+            bootstrap: master
+            389-ds: master
+            bind: master
+            sssd: master
+            python2: master
+            # python2-ecosystem: master
+            python3: master
+            python3-ecosystem: master
         requires:
-            platform: f27
-            java: 8
-            perl: 5.26
-            389-ds: 1.3
-            bind: 9
-            sssd: 1.16
-            samba: 4.7
-            pki: 10.4
-            tomcat: 8.0
-            resteasy: 3.0
-            httpd: 2.4
-            python2: 2.7
-            python2-ecosystem: f27
-            python3: 3.6
-            python3-ecosystem: f27
-            libtom: f27
-            networking-base: f27
-            fonts: f27
+            platform: master
+            java: master
+            perl: master
+            389-ds: master
+            bind: master
+            sssd: master
+            samba: master
+            pki: master
+            tomcat: master
+            resteasy: master
+            httpd: master
+            python2: master
+            python2-ecosystem: master
+            python3: master
+            python3-ecosystem: master
+            libtom: master
+            fonts: master
     references:
         community: https://docs.pagure.org/modularity/
         documentation: https://github.com/modularity-modules/freeipa
@@ -99,119 +87,108 @@ data:
                 - 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: 5ca46283b14bd68875495a8aec89d25a1e3dae04
+                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
+                rationale: Needed for dogtag.
+                ref: master
             freeipa:
                 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
+                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: f27
+                ref: master
                 # build-requires python3-ipaserver from freeipa component
                 buildorder: 1