diff --git a/manifests/repo/yum.pp b/manifests/repo/yum.pp
index 52b4876..10184bb 100644
--- a/manifests/repo/yum.pp
+++ b/manifests/repo/yum.pp
@@ -22,7 +22,7 @@
         baseurl  => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/${::puppet::collection}/${::architecture}",
         enabled  => '1',
         gpgcheck => '1',
-        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
       }
     } else {
 
@@ -31,14 +31,14 @@
         baseurl  => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/products/${::architecture}",
         enabled  => '1',
         gpgcheck => '1',
-        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
       }
       yumrepo { 'puppetlabs-products-source':
         descr    => "Puppet Labs Products EL ${::operatingsystemmajrelease} - ${::architecture} - Source",
         baseurl  => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/products/SRPMS",
         enabled  => $source_enable,
         gpgcheck => '1',
-        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
       }
 
       yumrepo { 'puppetlabs-deps':
@@ -46,14 +46,14 @@
         baseurl  => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/dependencies/${::architecture}",
         enabled  => '1',
         gpgcheck => '1',
-        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
       }
       yumrepo { 'puppetlabs-deps-source':
         descr          => "Puppet Labs Dependencies EL ${::operatingsystemmajrelease} - ${::architecture} - Source",
         baseurl        => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/dependencies/SRPMS",
         enabled        => $source_enable,
         gpgcheck       => '1',
-        gpgkey         => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+        gpgkey         => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
         failovermethod => 'priority'
       }
 
@@ -62,14 +62,14 @@
         baseurl  => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/devel/${::architecture}",
         enabled  => $devel_enabled,
         gpgcheck => '1',
-        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
       }
       yumrepo { 'puppetlabs-devel-source':
         descr    => "Puppet Labs Devel EL ${::operatingsystemmajrelease} - ${::architecture} - Source",
         baseurl  => "http://yum.puppetlabs.com/el/${::operatingsystemmajrelease}/devel/SRPMS",
         enabled  => $source_enable,
         gpgcheck => '1',
-        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+        gpgkey   => 'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
       }
     }
 
diff --git a/spec/classes/puppet_repo_yum_spec.rb b/spec/classes/puppet_repo_yum_spec.rb
index a6b2738..a44e109 100644
--- a/spec/classes/puppet_repo_yum_spec.rb
+++ b/spec/classes/puppet_repo_yum_spec.rb
@@ -43,7 +43,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/5/products/x86_64',
               'enabled'=>'1',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           when '6'
             should contain_yumrepo('puppetlabs-products').with({
@@ -51,7 +51,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/6/products/x86_64',
               'enabled'=>'1',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           when '7'
             should contain_yumrepo('puppetlabs-products').with({
@@ -59,7 +59,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/7/products/x86_64',
               'enabled'=>'1',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           end
         end
@@ -71,7 +71,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/5/dependencies/x86_64',
               'enabled'=>'1',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           when '6'
             should contain_yumrepo('puppetlabs-deps').with({
@@ -79,7 +79,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/6/dependencies/x86_64',
               'enabled'=>'1',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           when '7'
             should contain_yumrepo('puppetlabs-deps').with({
@@ -87,7 +87,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/7/dependencies/x86_64',
               'enabled'=>'1',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           end
         end
@@ -99,7 +99,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/5/devel/x86_64',
               'enabled'=>'0',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           when '6'
             should contain_yumrepo('puppetlabs-devel').with({
@@ -107,7 +107,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/6/devel/x86_64',
               'enabled'=>'0',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           when '7'
             should contain_yumrepo('puppetlabs-devel').with({
@@ -115,7 +115,7 @@
               'baseurl'=>'http://yum.puppetlabs.com/el/7/devel/x86_64',
               'enabled'=>'0',
               'gpgcheck'=>'1',
-              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+              'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
             })
           end
         end
@@ -140,7 +140,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/5/BOGON/x86_64',
                 'enabled'=>'1',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
               should_not contain_yumrepo('puppetlabs-products')
               should_not contain_yumrepo('puppetlabs-deps')
@@ -151,7 +151,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/6/BOGON/x86_64',
                 'enabled'=>'1',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
               should_not contain_yumrepo('puppetlabs-products')
               should_not contain_yumrepo('puppetlabs-deps')
@@ -162,7 +162,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/7/BOGON/x86_64',
                 'enabled'=>'1',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
               should_not contain_yumrepo('puppetlabs-products')
               should_not contain_yumrepo('puppetlabs-deps')
@@ -181,7 +181,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/5/devel/x86_64',
                 'enabled'=>'0',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
             when '6'
               should contain_yumrepo('puppetlabs-devel').with({
@@ -189,7 +189,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/6/devel/x86_64',
                 'enabled'=>'0',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
             when '7'
               should contain_yumrepo('puppetlabs-devel').with({
@@ -197,7 +197,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/7/devel/x86_64',
                 'enabled'=>'0',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
             end#end case
           end
@@ -213,7 +213,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/5/devel/x86_64',
                 'enabled'=>'1',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
             when '6'
               should contain_yumrepo('puppetlabs-devel').with({
@@ -221,7 +221,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/6/devel/x86_64',
                 'enabled'=>'1',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
             when '7'
               should contain_yumrepo('puppetlabs-devel').with({
@@ -229,7 +229,7 @@
                 'baseurl'=>'http://yum.puppetlabs.com/el/7/devel/x86_64',
                 'enabled'=>'1',
                 'gpgcheck'=>'1',
-                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
+                'gpgkey'=>'https://yum.puppetlabs.com/RPM-GPG-KEY-puppet',
               })
             end
           end