diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp
index 485cb2c..2882a41 100644
--- a/manifests/repo/redhat/redhat.pp
+++ b/manifests/repo/redhat/redhat.pp
@@ -100,9 +100,10 @@ class openstack_extras::repo::redhat::redhat (
 
     $rdo_hash = {
       'rdo-release' => {
-        'baseurl'  => $rdo_baseurl,
-        'descr'    => "OpenStack ${release_cap} Repository",
-        'gpgkey'   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
+        'baseurl'         => $rdo_baseurl,
+        'descr'           => "OpenStack ${release_cap} Repository",
+        'gpgkey'          => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
+        'module_hotfixes' => true,
       }
     }
 
@@ -114,15 +115,6 @@ class openstack_extras::repo::redhat::redhat (
 
     create_resources('file', $rdokey_hash, $_gpgkey_defaults)
     create_resources('yumrepo', $rdo_hash, $_repo_defaults)
-
-    # NOTE(tobias-urdin): This was introduced in yumrepo_core 1.0.7 which is
-    # included from 6.15.0 and forward (also since 7.0.0).
-    # TODO(tobias-urdin): Should set this by default when we only support Puppet 7.
-    if versioncmp($facts['puppetversion'], '6.15.0') >= 0 {
-      Yumrepo<| title == 'rdo-release' |> {
-        module_hotfixes => true,
-      }
-    }
   }
 
   if $manage_epel {
diff --git a/metadata.json b/metadata.json
index 27287d9..14c30e7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -48,7 +48,7 @@
     "requirements": [
         {
             "name": "puppet",
-            "version_requirement": ">= 6.0.0 < 8.0.0"
+            "version_requirement": ">= 7.0.0 < 8.0.0"
         }
     ],
     "source": "https://opendev.org/openstack/puppet-openstack_extras.git",
diff --git a/releasenotes/notes/remove-puppet-6-1feddecc3d99d0b1.yaml b/releasenotes/notes/remove-puppet-6-1feddecc3d99d0b1.yaml
new file mode 100644
index 0000000..78061d5
--- /dev/null
+++ b/releasenotes/notes/remove-puppet-6-1feddecc3d99d0b1.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Puppet 6 is no longer supported.
diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
index a89475b..8a30cd9 100644
--- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
+++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
@@ -117,16 +117,6 @@ describe 'openstack_extras::repo::redhat::redhat' do
       )}
     end
 
-    context 'with default parameters but puppetversion < 6.15.0' do
-      before do
-        facts.merge!( :puppetversion => '6.14.0' )
-     end
-
-     it {
-       should contain_yumrepo('rdo-release').without_module_hotfixes
-     }
-    end
-
     context 'with centos_mirror_url' do
       let :params do
         {