diff --git a/ci/environments/multinode-3nodes-registry.yaml b/ci/environments/multinode-3nodes-registry.yaml
index 3ad3df6922..68519dfc82 100644
--- a/ci/environments/multinode-3nodes-registry.yaml
+++ b/ci/environments/multinode-3nodes-registry.yaml
@@ -5,8 +5,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
diff --git a/ci/environments/scenario000-multinode-containers.yaml b/ci/environments/scenario000-multinode-containers.yaml
index a2ca92a55a..563395e230 100644
--- a/ci/environments/scenario000-multinode-containers.yaml
+++ b/ci/environments/scenario000-multinode-containers.yaml
@@ -8,8 +8,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 1a8294f9fc..bf7eb47d2a 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -11,8 +11,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml
index bd9c6cdd2c..611afde3e6 100644
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@@ -9,8 +9,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml
diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml
index c34664446c..aa5f5e1b4f 100644
--- a/ci/environments/scenario003-multinode-containers.yaml
+++ b/ci/environments/scenario003-multinode-containers.yaml
@@ -10,8 +10,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::DesignateApi: ../../deployment/experimental/designate/designate-api-container-puppet.yaml
   OS::TripleO::Services::DesignateCentral: ../../deployment/experimental/designate/designate-central-container-puppet.yaml
diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml
index 886e624a12..a42c0abb89 100644
--- a/ci/environments/scenario004-multinode-containers.yaml
+++ b/ci/environments/scenario004-multinode-containers.yaml
@@ -24,8 +24,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml
index 2de031d6af..d1f2fcdcb9 100644
--- a/ci/environments/scenario004-standalone.yaml
+++ b/ci/environments/scenario004-standalone.yaml
@@ -20,8 +20,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml
index c40da4193c..689a259b62 100644
--- a/ci/environments/scenario010-multinode-containers.yaml
+++ b/ci/environments/scenario010-multinode-containers.yaml
@@ -6,8 +6,8 @@ resource_registry:
   OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
   OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::Keepalived: OS::Heat::None
diff --git a/ci/environments/scenario012-multinode-containers.yaml b/ci/environments/scenario012-multinode-containers.yaml
index 19c281d5d5..c3d8fc5809 100644
--- a/ci/environments/scenario012-multinode-containers.yaml
+++ b/ci/environments/scenario012-multinode-containers.yaml
@@ -9,8 +9,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
diff --git a/ci/environments/scenario012-standalone.yaml b/ci/environments/scenario012-standalone.yaml
index df8d898db0..a8f0c4818a 100644
--- a/ci/environments/scenario012-standalone.yaml
+++ b/ci/environments/scenario012-standalone.yaml
@@ -9,8 +9,8 @@ resource_registry:
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::Pacemaker: ../../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+  OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
   OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
   # Some infra instances don't pass the ping test but are otherwise working.
diff --git a/deployment/README.rst b/deployment/README.rst
index f834167739..c359764768 100644
--- a/deployment/README.rst
+++ b/deployment/README.rst
@@ -158,7 +158,7 @@ Then the usual deploy steps are run which pull in the latest image for
 all containerized services and the updated configuration if any.
 
 Note: as pacemaker is not containerized, the points 1 and 4 happen in
-puppet/services/pacemaker.yaml.
+deployment/pacemaker/pacemaker-baremetal-puppet.yaml.
 
 Fast-forward Upgrade Steps
 --------------------------
diff --git a/puppet/services/pacemaker.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/pacemaker.yaml
rename to deployment/pacemaker/pacemaker-baremetal-puppet.yaml
diff --git a/puppet/services/pacemaker_remote.yaml b/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
similarity index 100%
rename from puppet/services/pacemaker_remote.yaml
rename to deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
diff --git a/environments/docker-ha.yaml b/environments/docker-ha.yaml
index 674c6861fa..1d19d80f81 100644
--- a/environments/docker-ha.yaml
+++ b/environments/docker-ha.yaml
@@ -4,9 +4,9 @@
 resource_registry:
   # Pacemaker runs on the host
   # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
+  OS::TripleO::Services::Pacemaker: ../deployment/pacemaker/pacemaker-baremetal-puppet.yaml
   # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml
+  OS::TripleO::Services::PacemakerRemote: ../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
   OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
   OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None