diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp
index 52c926b..edeaf8d 100644
--- a/yum/manifests/init.pp
+++ b/yum/manifests/init.pp
@@ -603,7 +603,10 @@ class yum::repo::puppetlabs {
             $path = "fedora/f\$releasever/products/\$basearch"
         }
         "centos","redhat": {
-            $path = "el/\$releasever/products/\$basearch"
+          case $::operatingsystemrelease {
+            /^7/:    { $path = "el/7/products/\$basearch" }
+            default: { $path = "el/\$releasever/products/\$basearch" }
+          }
         }
         default: {
             fail("yum::repo::puppetlabs not supported in ${::operatingsystem}")
@@ -613,7 +616,7 @@ class yum::repo::puppetlabs {
     yum::repo { "puppetlabs":
         descr    => "Puppet Labs Packages - Products",
         baseurl  => "https://yum.puppetlabs.com/${path}",
-        gpgkey   => "https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs",
+        gpgkey   => "puppet:///modules/yum/keys/puppetlabs.key",
         priority => "90",
     }
 
@@ -627,7 +630,10 @@ class yum::repo::puppetlabs::dependencies {
             $path = "fedora/f\$releasever/dependencies/\$basearch"
         }
         "centos","redhat": {
-            $path = "el/\$releasever/dependencies/\$basearch"
+          case $::operatingsystemrelease {
+            /^7/:    { $path = "el/7/products/\$basearch" }
+            default: { $path = "el/\$releasever/products/\$basearch" }
+          }
         }
         default: {
             fail("yum::repo::puppetlabs::dependencies not supported in ${::operatingsystem}")
@@ -637,7 +643,7 @@ class yum::repo::puppetlabs::dependencies {
     yum::repo { "puppetlabs-dependencies":
         descr    => "Puppet Labs Packages - Dependencies",
         baseurl  => "https://yum.puppetlabs.com/${path}",
-        gpgkey   => "https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs",
+        gpgkey   => "puppet:///modules/yum/keys/puppetlabs.key",
         priority => "90",
     }