diff --git a/metadata.json b/metadata.json
index 56c16b76..cb0506cf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,85 +1,91 @@
 {
   "name": "puppetlabs-apache",
   "version": "6.5.1",
   "author": "puppetlabs",
   "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-apache",
   "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.13.1 < 9.0.0"
     },
     {
       "name": "puppetlabs/concat",
       "version_requirement": ">= 2.2.1 < 8.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "9",
         "10",
         "11"
       ]
     },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
         "12",
         "15"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
         "18.04",
         "20.04"
       ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8"
+      ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ],
   "description": "Module for Apache configuration",
   "pdk-version": "2.1.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
   "template-ref": "heads/main-0-g03daa92"
 }
diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
index 702ed060..05cba06d 100644
--- a/spec/classes/mod/fastcgi_spec.rb
+++ b/spec/classes/mod/fastcgi_spec.rb
@@ -1,42 +1,42 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
 
 describe 'apache::mod::fastcgi', type: :class do
   on_supported_os.each do |os, facts|
     context "on #{os} " do
       let :facts do
         facts
       end
 
       context 'with all defaults' do
         case facts[:os]['name']
         when 'Debian'
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_class('apache::params') }
           it { is_expected.to contain_apache__mod('fastcgi') }
           it { is_expected.to contain_package('libapache2-mod-fastcgi') }
           it { is_expected.to contain_file('fastcgi.conf') }
-        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific'
+        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'Rocky'
           if facts[:os]['release']['major'].to_i < 7
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('fastcgi') }
             it { is_expected.to contain_package('mod_fastcgi') }
             it { is_expected.not_to contain_file('fastcgi.conf') }
           else
             it { is_expected.not_to compile }
           end
         when 'Ubuntu'
           if facts[:os]['release']['major'].to_i < 18
             it { is_expected.to compile.with_all_deps }
           else
             it { is_expected.not_to compile }
           end
         else
           it { is_expected.to compile.with_all_deps }
         end
       end
     end
   end
 end
diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
index a954e56b..9956e524 100644
--- a/spec/classes/mod/php_spec.rb
+++ b/spec/classes/mod/php_spec.rb
@@ -1,327 +1,328 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
 
 describe 'apache::mod::php', type: :class do
   on_supported_os.each do |os, facts|
     context "on #{os} " do
       let :facts do
         facts
       end
       let :pre_condition do
         'class { "apache": mpm_module => prefork, }'
       end
 
       case facts[:os]['family']
       when 'Debian'
         describe 'on a Debian OS' do
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
           end
           case facts[:os]['release']['major']
           when '9'
             context 'on stretch' do
               it { is_expected.to contain_apache__mod('php7.0') }
               it { is_expected.to contain_package('libapache2-mod-php7.0') }
               it {
                 is_expected.to contain_file('php7.0.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so\n",
                 )
               }
             end
           when '10'
             context 'on buster' do
               it { is_expected.to contain_apache__mod('php7.3') }
               it { is_expected.to contain_package('libapache2-mod-php7.3') }
               it {
                 is_expected.to contain_file('php7.3.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.3.so\n",
                 )
               }
 
               context 'with experimental php8.0' do
                 let :params do
                   { php_version: '8.0' }
                 end
 
                 it { is_expected.to contain_apache__mod('php') }
                 it { is_expected.to contain_package('libapache2-mod-php8.0') }
                 it {
                   is_expected.to contain_file('php.load').with(
                     content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
                   )
                 }
               end
             end
           when '11'
             context 'on bullseye' do
               it { is_expected.to contain_apache__mod('php7.4') }
               it { is_expected.to contain_package('libapache2-mod-php7.4') }
               it {
                 is_expected.to contain_file('php7.4.load').with(
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.4.so\n",
                 )
               }
 
               context 'with experimental php8.0' do
                 let :params do
                   { php_version: '8.0' }
                 end
 
                 it { is_expected.to contain_apache__mod('php') }
                 it { is_expected.to contain_package('libapache2-mod-php8.0') }
                 it {
                   is_expected.to contain_file('php.load').with(
                     content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
                   )
                 }
               end
             end
           when '16.04'
             context 'on xenial' do
               let :params do
                 { content: 'somecontent' }
               end
 
               it {
                 is_expected.to contain_file('php7.0.conf').with(
                   content: 'somecontent',
                 )
               }
             end
 
           when '18.04'
             context 'on bionic' do
               let :params do
                 { content: 'somecontent' }
               end
 
               it {
                 is_expected.to contain_file('php7.2.conf').with(
                   content: 'somecontent',
                 )
               }
             end
           end
         end
       when 'RedHat'
         describe 'on a RedHat OS' do
           context 'with default params' do
             let :pre_condition do
               'class { "apache": }'
             end
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
             it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with alternative package name' do
             let :pre_condition do
               'class { "apache": }'
             end
             let :params do
               { package_name: 'php54' }
             end
 
             it { is_expected.to contain_package('php54') }
           end
           context 'with alternative path' do
             let :pre_condition do
               'class { "apache": }'
             end
             let :params do
               { path: 'alternative-path' }
             end
 
             it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module alternative-path\n") } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module alternative-path\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with alternative extensions' do
             let :pre_condition do
               'class { "apache": }'
             end
             let :params do
               {
                 extensions: ['.php', '.php5'],
               }
             end
 
             it { is_expected.to contain_file('php5.conf').with_content(Regexp.new(Regexp.escape('<FilesMatch ".+(\.php|\.php5)$">'))) } if facts[:os]['release']['major'].to_i < 8
           end
           if facts[:os]['release']['major'].to_i > 5
             context 'with specific version' do
               let :pre_condition do
                 'class { "apache": }'
               end
               let :params do
                 { package_ensure: '5.3.13' }
               end
 
               it {
                 is_expected.to contain_package('php').with(
                   ensure: '5.3.13',
                 )
               }
             end
           end
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::prefork') }
             it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
             it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
           context 'with mpm_module => itk' do
             let :pre_condition do
               'class { "apache": mpm_module => itk, }'
             end
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::itk') }
             it { is_expected.to contain_apache__mod('php5') } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_package('php') } if facts[:os]['release']['major'].to_i > 5
             it { is_expected.to contain_file('php5.load').with(content: "LoadModule php5_module modules/libphp5.so\n") } if facts[:os]['release']['major'].to_i < 8
             it { is_expected.to contain_file('php7.load').with(content: "LoadModule php7_module modules/libphp7.so\n") } if facts[:os]['release']['major'].to_i >= 8
           end
         end
       when 'FreeBSD'
         describe 'on a FreeBSD OS' do
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('www/mod_php5') }
             it { is_expected.to contain_file('php5.load') }
           end
           context 'with mpm_module => itk' do
             let :pre_condition do
               'class { "apache": mpm_module => itk, }'
             end
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::itk') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('www/mod_php5') }
             it { is_expected.to contain_file('php5.load') }
           end
         end
       when 'Gentoo'
         describe 'on a Gentoo OS' do
           context 'with mpm_module => prefork' do
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('dev-lang/php') }
             it { is_expected.to contain_file('php5.load') }
           end
           context 'with mpm_module => itk' do
             let :pre_condition do
               'class { "apache": mpm_module => itk, }'
             end
 
             it { is_expected.to contain_class('apache::params') }
             it { is_expected.to contain_class('apache::mod::itk') }
             it { is_expected.to contain_apache__mod('php5') }
             it { is_expected.to contain_package('dev-lang/php') }
             it { is_expected.to contain_file('php5.load') }
           end
         end
       end
 
       # all the following tests are for legacy php/apache versions. They don't work on modern ubuntu and redhat 8
       next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
               (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
               (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
-              (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS'))
+              (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
+                                                            facts[:os]['name'] == 'Rocky'))
 
       describe 'OS independent tests' do
         context 'with content param' do
           let :params do
             { content: 'somecontent' }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               content: 'somecontent',
             )
           }
         end
         context 'with template param' do
           let :params do
             { template: 'apache/mod/php.conf.erb' }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               content: %r{^# PHP is an HTML-embedded scripting language which attempts to make it},
             )
           }
         end
         context 'with source param' do
           let :params do
             { source: 'some-path' }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
         end
         context 'content has priority over template' do
           let :params do
             {
               template: 'apache/mod/php5.conf.erb',
               content: 'somecontent',
             }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               content: 'somecontent',
             )
           }
         end
         context 'source has priority over template' do
           let :params do
             {
               template: 'apache/mod/php5.conf.erb',
               source: 'some-path',
             }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
         end
         context 'source has priority over content' do
           let :params do
             {
               content: 'somecontent',
               source: 'some-path',
             }
           end
 
           it {
             is_expected.to contain_file('php5.conf').with(
               source: 'some-path',
             )
           }
         end
         context 'with mpm_module => worker' do
           let :pre_condition do
             'class { "apache": mpm_module => worker, }'
           end
 
           it 'raises an error' do
             is_expected.to compile.and_raise_error(%r{mpm_module => 'prefork' or mpm_module => 'itk'})
           end
         end
       end
     end
   end
 end