diff --git a/environments/services-docker/tripleo-ui.yaml b/environments/services-docker/tripleo-ui.yaml
deleted file mode 100644
index 2b2d0273b9..0000000000
--- a/environments/services-docker/tripleo-ui.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resource_registry:
-  OS::TripleO::Services::TripleoUI: ../../docker/services/tripleo-ui.yaml
diff --git a/environments/services-docker/novajoin.yaml b/environments/services/novajoin.yaml
similarity index 100%
rename from environments/services-docker/novajoin.yaml
rename to environments/services/novajoin.yaml
diff --git a/environments/services-docker/tempest.yaml b/environments/services/tempest.yaml
similarity index 100%
rename from environments/services-docker/tempest.yaml
rename to environments/services/tempest.yaml
diff --git a/environments/services-docker/update-odl.yaml b/environments/services/update-odl.yaml
similarity index 100%
rename from environments/services-docker/update-odl.yaml
rename to environments/services/update-odl.yaml
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 42152ff53e..945f1563c4 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -1093,8 +1093,15 @@ for base_path in path_args:
             if '.tox' in dirs:
                 dirs.remove('.tox')
             for f in files:
+                file_path = os.path.join(subdir, f)
+                if 'environments/services-docker' in file_path:
+                    print("ERROR: environments/services-docker should not be used "
+                          "any more, use environments/services instead: %s " %
+                          file_path)
+                    failed_files.append(file_path)
+                    exit_val |= 1
+
                 if f.endswith('.yaml') and not f.endswith('.j2.yaml'):
-                    file_path = os.path.join(subdir, f)
                     failed = validate(file_path, param_map)
                     if failed:
                         failed_files.append(file_path)