diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml
index 64498c2b2b..f03dcc12da 100644
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.yaml
@@ -36,6 +36,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CertmongerUser
     - OS::TripleO::Services::CinderApi
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index b6968c4d17..50b5b39c45 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -300,6 +300,7 @@ def validate_controller_no_ceph_role(filename, tpl):
     for role in tpl:
         if role['name'] == 'ControllerNoCeph':
             services = role['ServicesDefault']
+            services.remove('OS::TripleO::Services::CephClient')
             services.append('OS::TripleO::Services::CephMds')
             services.append('OS::TripleO::Services::CephMgr')
             services.append('OS::TripleO::Services::CephMon')