diff --git a/manifests/site.pp b/manifests/site.pp
index a068a7c3c5..081c043c72 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -171,14 +171,6 @@ node 'community.openstack.org' {
   }
 }
 
-# Node-OS: precise
-node 'ci-puppetmaster.openstack.org' {
-  class { 'openstack_project::puppetmaster':
-    root_rsa_key    => hiera('puppetmaster_root_rsa_key', 'XXX'),
-    sysadmins       => hiera('sysadmins', []),
-  }
-}
-
 # Node-OS: precise
 node 'puppetmaster.openstack.org' {
   class { 'openstack_project::puppetmaster':
diff --git a/modules/openstack_project/files/ansible/remote_puppet3.yaml b/modules/openstack_project/files/ansible/remote_puppet.yaml
similarity index 100%
rename from modules/openstack_project/files/ansible/remote_puppet3.yaml
rename to modules/openstack_project/files/ansible/remote_puppet.yaml
diff --git a/modules/openstack_project/files/ansible/remote_puppet2.yaml b/modules/openstack_project/files/ansible/remote_puppet2.yaml
deleted file mode 100644
index 0af830441e..0000000000
--- a/modules/openstack_project/files/ansible/remote_puppet2.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- hosts: git0*
-  gather_facts: false
-  max_fail_percentage: 1
-  roles:
-    - { role: puppet, puppetmaster: ci-puppetmaster.openstack.org }
-- hosts: review.openstack.org
-  gather_facts: false
-  roles:
-    - { role: puppet, puppetmaster: ci-puppetmaster.openstack.org }
-- hosts: "!review.openstack.org:!git0*"
-  gather_facts: false
-  roles:
-    - { role: puppet, puppetmaster: ci-puppetmaster.openstack.org }
diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp
index 5f013042bf..bc9b082524 100644
--- a/modules/openstack_project/manifests/base.pp
+++ b/modules/openstack_project/manifests/base.pp
@@ -102,14 +102,18 @@ class openstack_project::base(
     ensure  => absent,
     user    => 'root',
   }
-
   ssh_authorized_key { 'puppet-remote-2014-09-11':
+    ensure  => absent,
+    user    => 'root',
+  }
+
+  ssh_authorized_key { 'puppet-remote-2014-09-15':
     ensure  => present,
     user    => 'root',
     type    => 'ssh-rsa',
     key     => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDSLlN41ftgxkNeUi/kATYPwMPjJdMaSbgokSb9PSkRPZE7GeNai60BCfhu+ky8h5eMe70Bpwb7mQ7GAtHGXPNU1SRBPhMuVN9EYrQbt5KSiwuiTXtQHsWyYrSKtB+XGbl2PhpMQ/TPVtFoL5usxu/MYaakVkCEbt5IbPYNg88/NKPixicJuhi0qsd+l1X1zoc1+Fn87PlwMoIgfLIktwaL8hw9mzqr+pPcDIjCFQQWnjqJVEObOcMstBT20XwKj/ymiH+6p123nnlIHilACJzXhmIZIZO+EGkNF7KyXpcBSfv9efPI+VCE2TOv/scJFdEHtDFkl2kdUBYPC0wQ92rp',
     options => [
-      'from="ci-puppetmaster.openstack.org,puppetmaster.openstack.org"',
+      'from="puppetmaster.openstack.org"',
     ],
     require => File['/root/.ssh'],
   }
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 55c77c60bc..1e19ce20c9 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -18,31 +18,26 @@ class openstack_project::puppetmaster (
     ca_server                 => $ca_server,
   }
 
-  if ($version == '2.7.'){
-    $ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet2.yaml'
-  }
-  else {
-    $ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet3.yaml'
+  $ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet.yaml'
 
-    file {'/etc/puppet/environments':
-      ensure => directory,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0755',
-    }
-    file {'/etc/puppet/environments/production':
-      ensure => directory,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0755',
-    }
-    file {'/etc/puppet/environments/production/environment.conf':
-      ensure => file,
-      owner  => 'root',
-      group  => 'root',
-      mode   => '0644',
-      source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf',
-    }
+  file {'/etc/puppet/environments':
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
+  }
+  file {'/etc/puppet/environments/production':
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0755',
+  }
+  file {'/etc/puppet/environments/production/environment.conf':
+    ensure => file,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0644',
+    source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf',
   }
 
   class { 'ansible':
diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index 7c72024fd6..b55fd2fc62 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -86,8 +86,5 @@ Subsystem sftp <%= scope.lookupvar('::ssh::params::sftp_path') %>
 UsePAM yes
 
 # allow ansible connections from puppetmaster host
-Match host ci-puppetmaster.openstack.org
-    PermitRootLogin without-password
-
 Match host puppetmaster.openstack.org
     PermitRootLogin without-password