diff --git a/freeipa.yaml b/freeipa.yaml
index 636b5ca..425372b 100644
--- a/freeipa.yaml
+++ b/freeipa.yaml
@@ -87,12 +87,6 @@ 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
@@ -101,104 +95,99 @@ data:
         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:
                 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: 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
+                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
+                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