diff --git a/roles/Controller.yaml b/roles/Controller.yaml
index f456a985eb..0876ac9746 100644
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@@ -59,6 +59,7 @@
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr
     - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephNfs
     - OS::TripleO::Services::CephRbdMirror
     - OS::TripleO::Services::CephRgw
     - OS::TripleO::Services::CinderApi
diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml
index 18bf5caefc..62ce5b02c9 100644
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/roles/ControllerAllNovaStandalone.yaml
@@ -42,6 +42,7 @@
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr
     - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephNfs
     - OS::TripleO::Services::CephRbdMirror
     - OS::TripleO::Services::CephRgw
     - OS::TripleO::Services::CinderApi
diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml
index f041ff3ef9..67227a17ae 100644
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@@ -46,6 +46,7 @@
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr
     - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephNfs
     - OS::TripleO::Services::CephRbdMirror
     - OS::TripleO::Services::CephRgw
     - OS::TripleO::Services::CinderApi
diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml
index f07cbec0a4..75ea072623 100644
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@@ -47,6 +47,7 @@
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr
     - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephNfs
     - OS::TripleO::Services::CephRbdMirror
     - OS::TripleO::Services::CephRgw
     - OS::TripleO::Services::CinderApi
diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml
index 6b5e2765fb..75b04ec141 100644
--- a/roles/ControllerSriov.yaml
+++ b/roles/ControllerSriov.yaml
@@ -56,6 +56,7 @@
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr
     - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephNfs
     - OS::TripleO::Services::CephRbdMirror
     - OS::TripleO::Services::CephRgw
     - OS::TripleO::Services::CinderApi
diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml
index cfd12b225e..5befecc4cb 100644
--- a/roles/ControllerStorageDashboard.yaml
+++ b/roles/ControllerStorageDashboard.yaml
@@ -57,6 +57,7 @@
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr
     - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephNfs
     - OS::TripleO::Services::CephRbdMirror
     - OS::TripleO::Services::CephRgw
     - OS::TripleO::Services::CinderApi
diff --git a/roles_data.yaml b/roles_data.yaml
index ea94d7f775..71a0a86924 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -62,6 +62,7 @@
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr
     - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephNfs
     - OS::TripleO::Services::CephRbdMirror
     - OS::TripleO::Services::CephRgw
     - OS::TripleO::Services::CinderApi
diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml
index e33dd96ad9..2ba0df00cb 100644
--- a/roles_data_undercloud.yaml
+++ b/roles_data_undercloud.yaml
@@ -94,3 +94,4 @@
     - OS::TripleO::Services::Tuned
     - OS::TripleO::Services::UndercloudUpgrade
     - OS::TripleO::Services::TripleoValidations
+
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 38085c8232..26ae8ef29e 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -365,23 +365,6 @@ def validate_controller_dashboard(filename, tpl):
     return 0
 
 
-def validate_controller_storage_nfs(filename, tpl, exclude_service=()):
-    control_role_filename = os.path.join(os.path.dirname(filename),
-                                         './Controller.yaml')
-    with open(control_role_filename, 'r') as f:
-        control_role_tpl = yaml.safe_load(f.read())
-
-    control_role_services = control_role_tpl[0]['ServicesDefault']
-    for role in tpl:
-        if role['name'] == 'ControllerStorageNfs':
-            services = [x for x in role['ServicesDefault'] if (x not in exclude_service)]
-            if sorted(services) != sorted(control_role_services):
-                print('ERROR: ServicesDefault in %s is different from '
-                      'ServicesDefault in roles/Controller.yaml' % filename)
-                return 1
-    return 0
-
-
 def validate_hci_role(hci_role_filename, hci_role_tpl):
     role_files = ['HciCephAll', 'HciCephFile', 'HciCephMon', 'HciCephObject']
     if hci_role_filename in ['./roles/' + x + '.yaml' for x in role_files]:
@@ -468,6 +451,7 @@ def validate_controller_no_ceph_role(filename, tpl):
             services.append('OS::TripleO::Services::CephMgr')
             services.append('OS::TripleO::Services::CephGrafana')
             services.append('OS::TripleO::Services::CephMon')
+            services.append('OS::TripleO::Services::CephNfs')
             services.append('OS::TripleO::Services::CephRbdMirror')
             services.append('OS::TripleO::Services::CephRgw')
             if sorted(services) != sorted(control_role_services):
@@ -1172,11 +1156,6 @@ def validate(filename, param_map):
                 filename.startswith('./roles/ComputeHCISriov.yaml'):
             retval |= validate_hci_computehci_role(filename, tpl)
 
-        if filename.startswith('./roles/ControllerStorageNfs.yaml'):
-            exclude = [
-                'OS::TripleO::Services::CephNfs']
-            retval |= validate_controller_storage_nfs(filename, tpl, exclude)
-
         if filename.startswith('./roles/ControllerStorageDashboard.yaml'):
             retval |= validate_controller_dashboard(filename, tpl)
         if filename in ['./roles/ComputeOvsDpdk.yaml',