diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index b5f42ff5dd..60efcc7f44 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -132,7 +132,7 @@
 
   # RedHat-based systems hardcode some PG* variables in the init script, and need to be overriden
   # in /etc/sysconfig/pgsql/postgresql. Create a blank file so we can manage it with augeas later.
-  if ($::osfamily == 'RedHat') and ($::operatingsystemrelease !~ /^7/) and ($::operatingsystem != 'Fedora') {
+  if ($::osfamily == 'RedHat') and ($::operatingsystemrelease !~ /^7|^8/) and ($::operatingsystem != 'Fedora') {
     file { '/etc/sysconfig/pgsql/postgresql':
       ensure  => present,
       replace => false,
diff --git a/manifests/server/config_entry.pp b/manifests/server/config_entry.pp
index 5a4f83ab57..8fea4d7d18 100644
--- a/manifests/server/config_entry.pp
+++ b/manifests/server/config_entry.pp
@@ -112,7 +112,7 @@
     }
   }
   if $::osfamily == 'RedHat' {
-    if ! ($::operatingsystemrelease =~ /^7/ or $::operatingsystem == 'Fedora') {
+    if ! ($::operatingsystemrelease =~ /^7|^8/ or $::operatingsystem == 'Fedora') {
       if $name == 'port' {
         # We need to force postgresql to stop before updating the port
         # because puppet becomes confused and is unable to manage the