diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 637b3fd502..75f91340f5 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -1,10 +1,10 @@
 resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
-  OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
-  OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
-  OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
+  OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
+  OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
+  OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
+  OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
   OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
   OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml
diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index dddcb917c9..d03262e575 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -6,10 +6,10 @@ resource_registry:
   OS::TripleO::Services::CeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
   OS::TripleO::Services::ComputeCeilometerAgent: ../../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
-  OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
-  OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
-  OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
-  OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
+  OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
+  OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
+  OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
+  OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
   OS::TripleO::Services::PankoApi: ../../deployment/deprecated/panko/panko-api-container-puppet.yaml
   OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
   OS::TripleO::Services::GnocchiApi: ../../deployment/gnocchi/gnocchi-api-container-puppet.yaml
diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml
index 33135be947..8413247bd0 100644
--- a/ci/environments/scenario004-multinode-containers.yaml
+++ b/ci/environments/scenario004-multinode-containers.yaml
@@ -1,12 +1,12 @@
 resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
-  OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
-  OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
-  OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
-  OS::TripleO::Services::CephRgw: ../../docker/services/ceph-ansible/ceph-rgw.yaml
-  OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
+  OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
+  OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
+  OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
+  OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml
+  OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
+  OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
   OS::TripleO::Services::SwiftProxy: OS::Heat::None
   OS::TripleO::Services::SwiftStorage: OS::Heat::None
   OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml
index 7bd5ddd2c3..4bb6378fce 100644
--- a/ci/environments/scenario004-standalone.yaml
+++ b/ci/environments/scenario004-standalone.yaml
@@ -4,12 +4,12 @@ resource_registry:
   OS::TripleO::Services::CinderVolume: OS::Heat::None
   OS::TripleO::Services::Redis: OS::Heat::None
   OS::TripleO::Services::Horizon: OS::Heat::None
-  OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
-  OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
-  OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
-  OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
-  OS::TripleO::Services::CephRgw: ../../docker/services/ceph-ansible/ceph-rgw.yaml
-  OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
+  OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
+  OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
+  OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
+  OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml
+  OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
+  OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
   OS::TripleO::Services::SwiftProxy: OS::Heat::None
   OS::TripleO::Services::SwiftStorage: OS::Heat::None
   OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml
index 4e073f103a..1880250f14 100644
--- a/ci/environments/scenario010-multinode-containers.yaml
+++ b/ci/environments/scenario010-multinode-containers.yaml
@@ -1,10 +1,10 @@
 resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
-  OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
-  OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
-  OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
+  OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
+  OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
+  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
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-base.yaml
rename to deployment/ceph-ansible/ceph-base.yaml
diff --git a/docker/services/ceph-ansible/ceph-client.yaml b/deployment/ceph-ansible/ceph-client.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-client.yaml
rename to deployment/ceph-ansible/ceph-client.yaml
diff --git a/docker/services/ceph-ansible/ceph-external.yaml b/deployment/ceph-ansible/ceph-external.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-external.yaml
rename to deployment/ceph-ansible/ceph-external.yaml
diff --git a/docker/services/ceph-ansible/ceph-mds.yaml b/deployment/ceph-ansible/ceph-mds.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-mds.yaml
rename to deployment/ceph-ansible/ceph-mds.yaml
diff --git a/docker/services/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-mgr.yaml
rename to deployment/ceph-ansible/ceph-mgr.yaml
diff --git a/docker/services/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-mon.yaml
rename to deployment/ceph-ansible/ceph-mon.yaml
diff --git a/docker/services/ceph-ansible/ceph-nfs.yaml b/deployment/ceph-ansible/ceph-nfs.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-nfs.yaml
rename to deployment/ceph-ansible/ceph-nfs.yaml
diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-osd.yaml
rename to deployment/ceph-ansible/ceph-osd.yaml
diff --git a/docker/services/ceph-ansible/ceph-rbdmirror.yaml b/deployment/ceph-ansible/ceph-rbdmirror.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-rbdmirror.yaml
rename to deployment/ceph-ansible/ceph-rbdmirror.yaml
diff --git a/docker/services/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml
similarity index 100%
rename from docker/services/ceph-ansible/ceph-rgw.yaml
rename to deployment/ceph-ansible/ceph-rgw.yaml
diff --git a/environments/ceph-ansible/ceph-ansible-external.yaml b/environments/ceph-ansible/ceph-ansible-external.yaml
index 10326a5de7..a73ecb7fad 100644
--- a/environments/ceph-ansible/ceph-ansible-external.yaml
+++ b/environments/ceph-ansible/ceph-ansible-external.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml
+  OS::TripleO::Services::CephExternal: ../../deployment/ceph-ansible/ceph-external.yaml
 
 parameter_defaults:
   # NOTE: These example parameters are required when using CephExternal
diff --git a/environments/ceph-ansible/ceph-ansible.yaml b/environments/ceph-ansible/ceph-ansible.yaml
index d6b57e9f15..a53c2a41c6 100644
--- a/environments/ceph-ansible/ceph-ansible.yaml
+++ b/environments/ceph-ansible/ceph-ansible.yaml
@@ -1,8 +1,8 @@
 resource_registry:
-  OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
-  OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
-  OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
-  OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
+  OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
+  OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
+  OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
+  OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
 
 parameter_defaults:
   # Ensure that if user overrides CephAnsiblePlaybook via some env
diff --git a/environments/ceph-ansible/ceph-mds.yaml b/environments/ceph-ansible/ceph-mds.yaml
index 0834269cb1..1f6408810a 100644
--- a/environments/ceph-ansible/ceph-mds.yaml
+++ b/environments/ceph-ansible/ceph-mds.yaml
@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
+  OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml
diff --git a/environments/ceph-ansible/ceph-rbdmirror.yaml b/environments/ceph-ansible/ceph-rbdmirror.yaml
index 41f01496b0..a2fe75bf5c 100644
--- a/environments/ceph-ansible/ceph-rbdmirror.yaml
+++ b/environments/ceph-ansible/ceph-rbdmirror.yaml
@@ -1,2 +1,2 @@
 resource_registry:
-  OS::TripleO::Services::CephRbdMirror: ../../docker/services/ceph-ansible/ceph-rbdmirror.yaml
+  OS::TripleO::Services::CephRbdMirror: ../../deployment/ceph-ansible/ceph-rbdmirror.yaml
diff --git a/environments/ceph-ansible/ceph-rgw.yaml b/environments/ceph-ansible/ceph-rgw.yaml
index 4b09a70322..0cf3495c51 100644
--- a/environments/ceph-ansible/ceph-rgw.yaml
+++ b/environments/ceph-ansible/ceph-rgw.yaml
@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Services::CephRgw: ../../docker/services/ceph-ansible/ceph-rgw.yaml
+  OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
   OS::TripleO::Services::SwiftProxy: OS::Heat::None
   OS::TripleO::Services::SwiftStorage: OS::Heat::None
   OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
diff --git a/environments/manila-cephfsganesha-config.yaml b/environments/manila-cephfsganesha-config.yaml
index a51895c6fa..a37217b433 100644
--- a/environments/manila-cephfsganesha-config.yaml
+++ b/environments/manila-cephfsganesha-config.yaml
@@ -8,7 +8,7 @@ resource_registry:
   OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml
   # ceph-nfs (ganesha) service is installed and configured by ceph-ansible
   # but it's still managed by pacemaker
-  OS::TripleO::Services::CephNfs: ../docker/services/ceph-ansible/ceph-nfs.yaml
+  OS::TripleO::Services::CephNfs: ../deployment/ceph-ansible/ceph-nfs.yaml
 
 
 parameter_defaults:
diff --git a/environments/storage-environment-external.yaml b/environments/storage-environment-external.yaml
index 1534d1d9c2..3bf6f674d9 100644
--- a/environments/storage-environment-external.yaml
+++ b/environments/storage-environment-external.yaml
@@ -4,7 +4,7 @@
 # A Heat environment file which can be used to enable the
 # use of an externally managed Ceph cluster.
 resource_registry:
-  OS::TripleO::Services::CephExternal: ../docker/services/ceph-ansible/ceph-external.yaml
+  OS::TripleO::Services::CephExternal: ../deployment/ceph-ansible/ceph-external.yaml
   OS::TripleO::Services::CephMon: OS::Heat::None
   OS::TripleO::Services::CephClient: OS::Heat::None
   OS::TripleO::Services::CephOSD: OS::Heat::None
diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml
index d15b7d2652..349446bcda 100644
--- a/environments/storage-environment.yaml
+++ b/environments/storage-environment.yaml
@@ -6,10 +6,10 @@
 ## backends. Defaults to Ceph used as a backend for Cinder, Glance and
 ## Nova ephemeral storage.
 resource_registry:
-  OS::TripleO::Services::CephMgr: ../docker/services/ceph-ansible/ceph-mgr.yaml
-  OS::TripleO::Services::CephMon: ../docker/services/ceph-ansible/ceph-mon.yaml
-  OS::TripleO::Services::CephOSD: ../docker/services/ceph-ansible/ceph-osd.yaml
-  OS::TripleO::Services::CephClient: ../docker/services/ceph-ansible/ceph-client.yaml
+  OS::TripleO::Services::CephMgr: ../deployment/ceph-ansible/ceph-mgr.yaml
+  OS::TripleO::Services::CephMon: ../deployment/ceph-ansible/ceph-mon.yaml
+  OS::TripleO::Services::CephOSD: ../deployment/ceph-ansible/ceph-osd.yaml
+  OS::TripleO::Services::CephClient: ../deployment/ceph-ansible/ceph-client.yaml
 
 parameter_defaults:
   #### BACKEND SELECTION ####
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index b1b172be09..82f40bca29 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -260,15 +260,15 @@ CONFIG_RESOURCE_TYPES = [
 
 WORKFLOW_TASKS_EXCLUSIONS = [
     './deployment/octavia/octavia-deployment-config.yaml',
-    './docker/services/ceph-ansible/ceph-external.yaml',
-    './docker/services/ceph-ansible/ceph-osd.yaml',
-    './docker/services/ceph-ansible/ceph-rbdmirror.yaml',
-    './docker/services/ceph-ansible/ceph-client.yaml',
-    './docker/services/ceph-ansible/ceph-mds.yaml',
-    './docker/services/ceph-ansible/ceph-rgw.yaml',
-    './docker/services/ceph-ansible/ceph-base.yaml',
-    './docker/services/ceph-ansible/ceph-mon.yaml',
-    './docker/services/ceph-ansible/ceph-mgr.yaml',
+    './deployment/ceph-ansible/ceph-external.yaml',
+    './deployment/ceph-ansible/ceph-osd.yaml',
+    './deployment/ceph-ansible/ceph-rbdmirror.yaml',
+    './deployment/ceph-ansible/ceph-client.yaml',
+    './deployment/ceph-ansible/ceph-mds.yaml',
+    './deployment/ceph-ansible/ceph-rgw.yaml',
+    './deployment/ceph-ansible/ceph-base.yaml',
+    './deployment/ceph-ansible/ceph-mon.yaml',
+    './deployment/ceph-ansible/ceph-mgr.yaml',
     './docker/services/skydive/skydive-base.yaml',
     './docker/services/skydive/skydive-agent.yaml',
     './docker/services/skydive/skydive-analyzer.yaml',
@@ -602,7 +602,7 @@ def validate_docker_service(filename, tpl):
         for section_name in REQUIRED_DOCKER_SECTIONS:
             if section_name not in role_data:
                 # add an exception if both step_config is used in docker
-                # service, docker/services/ceph-ansible/ceph-nfs.yaml uses
+                # service, deployment/ceph-ansible/ceph-nfs.yaml uses
                 # additional step_config to add pacemaker resources
                 if (section_name == 'docker_config' and
                         role_data.get('step_config', '')):
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 21071bf022..4c4eae1bf9 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -92,7 +92,7 @@
             dependencies: *deps_unit_lint
             files:
               - ^(docker|puppet)/services/.*octavia.*$
-              - ^docker/services/ceph-ansible.*$
+              - ^deployment/ceph-ansible.*$
               - ci/environments/scenario010-multinode-containers.yaml
               - ^environments\/.*.yaml
               - ^deployed-server/.*$