diff --git a/manifests/server/puppetserver.pp b/manifests/server/puppetserver.pp
index aeab5d61..617ae472 100644
--- a/manifests/server/puppetserver.pp
+++ b/manifests/server/puppetserver.pp
@@ -145,7 +145,7 @@
   Optional[Integer[1]] $max_open_files = $puppet::server::max_open_files,
   Optional[Stdlib::Absolutepath] $versioned_code_id = $puppet::server::versioned_code_id,
   Optional[Stdlib::Absolutepath] $versioned_code_content = $puppet::server::versioned_code_content,
-  Boolean $disable_fips = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8',
+  Boolean $disable_fips = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] != '7',
   Array[String[1]] $jolokia_metrics_allowlist = $puppet::server::jolokia_metrics_allowlist,
 ) {
   include puppet::server
diff --git a/spec/classes/puppet_server_puppetserver_spec.rb b/spec/classes/puppet_server_puppetserver_spec.rb
index a3e59ff7..04c4aa55 100644
--- a/spec/classes/puppet_server_puppetserver_spec.rb
+++ b/spec/classes/puppet_server_puppetserver_spec.rb
@@ -55,7 +55,7 @@
                      .with_incl('/etc/default/puppetserver')
                      .with_lens('Shellvars.lns')
           }
-          if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] == '8'
+          if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
             it {
               should contain_augeas('puppet::server::puppetserver::jvm')
                 .with_changes(['set JAVA_ARGS \'"-Xms2G -Xmx2G -Dcom.redhat.fips=false"\'', 'set JAVA_BIN /usr/bin/java'])
@@ -385,7 +385,7 @@
               .with_changes(['set puppetserver_java_opts \'"-Xms2G -Xmx2G -XX:foo=bar -XX:bar=foo"\''])
               .with_context('/files/etc/rc.conf')
           }
-        elsif facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] == '8'
+        elsif facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
           it {
             should contain_augeas('puppet::server::puppetserver::jvm')
               .with_changes([
@@ -412,7 +412,7 @@
 
       describe 'with cli_args parameter', unless: facts[:osfamily] == 'FreeBSD' do
         let(:params) { super().merge(server_jvm_cli_args: '-Djava.io.tmpdir=/var/puppettmp') }
-        if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] == '8'
+        if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
           it {
             should contain_augeas('puppet::server::puppetserver::jvm')
               .with_changes([