diff --git a/puppet-extensions.spec b/puppet-extensions.spec
index 4067a01156f47860a635bcca5460a66acc9a0714..282533bd48f9d17e5fda99873008af3d79afad21 100644
--- a/puppet-extensions.spec
+++ b/puppet-extensions.spec
@@ -30,8 +30,13 @@ Patch0: https://github.com/duritong/ip/commit/0cf261fa2fb75113c94fef5ac231f3d7b2
 
 BuildRequires: puppet-agent >= 6.0
 BuildRequires: puppetserver >= 6.0
+%if 0%{?rhel} >= 8
+BuildRequires: postgresql
+BuildRequires: postgresql-devel
+%else
 BuildRequires: postgresql96
 BuildRequires: postgresql96-devel
+%endif
 BuildRequires: libxml2-devel
 BuildRequires: libxslt-devel
 BuildRequires: gcc-c++
diff --git a/repos.el8 b/repos.el8
index e526ac8bc61068e6e6d465e5d28b23d481515041..5785b6b2cdb8f990d8a386af5c3df831dfa5b752 100644
--- a/repos.el8
+++ b/repos.el8
@@ -3,10 +3,3 @@ name=Puppet Repository el 8 - $basearch
 baseurl=http://yum.puppetlabs.com/puppet/el/8/x86_64
 gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppet
 enabled=1
-
-[postgres96]
-name=Postgres 9.6 Repository el 8 - $basearch
-baseurl=https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-8-x86_64
-gpgkey=https://raw.githubusercontent.com/puppetlabs/puppetlabs-postgresql/master/files/RPM-GPG-KEY-PGDG
-enabled=1
-gpgcheck=1