diff --git a/inventory/host_vars/db-fas01.iad2.fedoraproject.org b/inventory/host_vars/db-fas01.iad2.fedoraproject.org
index bb0f59fad8..343d5790bf 100644
--- a/inventory/host_vars/db-fas01.iad2.fedoraproject.org
+++ b/inventory/host_vars/db-fas01.iad2.fedoraproject.org
@@ -7,8 +7,8 @@ eth0_ip: 10.3.163.42
 vmhost: vmhost-x86-01.iad2.fedoraproject.org
 datacenter: iad2
 
-ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-8-ext
-ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/
+ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
+ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
 
 # This is a generic list, monitored by collectd
 databases:
diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml
index cf717dcdd2..1687a5ee5f 100644
--- a/roles/postgresql_server/tasks/main.yml
+++ b/roles/postgresql_server/tasks/main.yml
@@ -39,6 +39,7 @@
       stream=12
       profiles=
       state=enabled
+  when: ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat'
 
 - name: install postgresql server packages (dnf)
   package: