diff --git a/Gemfile b/Gemfile
index 6ca505db..8e167ae6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,6 @@ group :development do
   gem "beaker-rspec"
   gem "beaker", '2.51.0'
   gem "guard-rake"
-  gem "hiera-eyaml"
   gem "nokogiri", "~> 1.6.0"
   gem "puppet-blacksmith"
   gem "xmlrpc" if RUBY_VERSION >= '2.3'
diff --git a/manifests/redhat.pp b/manifests/redhat.pp
index d4448c3b..80d7d66b 100644
--- a/manifests/redhat.pp
+++ b/manifests/redhat.pp
@@ -23,7 +23,7 @@
 
   validate_bool($manage_repo)
   if $manage_repo {
-    $public_key_local = '/tmp/DATADOG_RPM_KEY.public'
+    $public_key_local = '/etc/pki/rpm-gpg/DATADOG_RPM_KEY.public'
 
     validate_string($baseurl)
 
@@ -40,12 +40,6 @@
         onlyif  => "/usr/bin/gpg --quiet --with-fingerprint -n ${public_key_local} | grep \'A4C0 B90D 7443 CF6E 4E8A  A341 F106 8E14 E094 22B3\'",
         unless  => '/bin/rpm -q gpg-pubkey-e09422b3',
         require => Remote_file['DATADOG_RPM_KEY.public'],
-        notify  => Exec['cleanup-gpg-key'],
-    }
-
-    exec { 'cleanup-gpg-key':
-        command => "/bin/rm ${public_key_local}",
-        onlyif  => "/usr/bin/test -f ${public_key_local}",
     }
 
     yumrepo {'datadog':