diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
index dd0b136..a7049ee 100644
--- a/manifests/repo/apt.pp
+++ b/manifests/repo/apt.pp
@@ -7,7 +7,7 @@ class fluentd::repo::apt (
   $repos        = 'contrib',
   $architecture = $::architecture,
   $key          = {
-    'id'     => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
+    'id'     => 'BEE682289B2217F45AF4CC3F901F9177AB97ACBE',
     'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
   },
   $include      = {
diff --git a/manifests/repo/yum.pp b/manifests/repo/yum.pp
index b13add5..cbd84ab 100644
--- a/manifests/repo/yum.pp
+++ b/manifests/repo/yum.pp
@@ -23,4 +23,11 @@ class fluentd::repo::yum (
     path        => '/bin:/usr/bin/',
     refreshonly => true,
   }
+
+  exec { 'remove old GPG key':
+    command => 'rpm -e --allmatches gpg-pubkey-a12e206f-*',
+    onlyif  => 'rpm -qi gpg-pubkey-a12e206f-*',
+    notify  => Exec['add GPG key'],
+  }
+
 }
diff --git a/spec/classes/fluentd_repo_apt_spec.rb b/spec/classes/fluentd_repo_apt_spec.rb
index 6bb43bd..ce6bc15 100644
--- a/spec/classes/fluentd_repo_apt_spec.rb
+++ b/spec/classes/fluentd_repo_apt_spec.rb
@@ -21,7 +21,7 @@ describe 'fluentd::repo::apt', :type => :class do
         'repos'        => 'contrib',
         'architecture' => 'amd64',
         'key'          => {
-          'id'     => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
+          'id'     => 'BEE682289B2217F45AF4CC3F901F9177AB97ACBE',
           'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
         },
         'include'      => {