diff --git a/environments/enable-designate.yaml b/environments/enable-designate.yaml
index 780239641b..3d8ab08908 100644
--- a/environments/enable-designate.yaml
+++ b/environments/enable-designate.yaml
@@ -1,16 +1,7 @@
-# *******************************************************************
-# This file was created automatically by the sample environment
-# generator. Developers should use `tox -e genconfig` to update it.
-# Users are recommended to make changes to a copy of the file instead
-# of the original, if any customizations are needed.
-# *******************************************************************
-# title: Enable Designate Service
-# description: |
-#   EXPERIMENTAL: This service is not considered ready for production and
-#   should only be used for development and test purposes at this time.
+#  NOTE: use of environments/enable-designate.yaml is deprecated, please use
+#  environments/services/designate.yaml instead as it is the preferred location for environment files
+#  that configure and enable services in TripleO
 #
-#   This environment enables the Designate services.  One of the
-#   designate-config* environment files must also be included.
 parameter_defaults:
   # If True, enable the internal Neutron DNS server that provides name
   # resolution between VMs.  This parameter has no effect if
diff --git a/environments/services/designate.yaml b/environments/services/designate.yaml
new file mode 100644
index 0000000000..18d0a35010
--- /dev/null
+++ b/environments/services/designate.yaml
@@ -0,0 +1,20 @@
+parameter_defaults:
+  # If True, enable the internal Neutron DNS server that provides name
+  # resolution between VMs.  This parameter has no effect if
+  # NeutronDhcpAgentDnsmasqDnsServers is set.
+  # Type: boolean
+  NeutronEnableInternalDNS: True
+
+  # Comma-separated list of extensions enabled for the Neutron plugin.
+  # Type: comma_delimited_list
+  NeutronPluginExtensions: qos,port_security,dns
+
+resource_registry:
+  OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml
+  OS::TripleO::Services::DesignateBind: ../../deployment/designate/designate-bind-container.yaml
+  OS::TripleO::Services::DesignateCentral: ../../deployment/designate/designate-central-container-puppet.yaml
+  OS::TripleO::Services::DesignateMDNS: ../../deployment/designate/designate-mdns-container-puppet.yaml
+  OS::TripleO::Services::DesignateProducer: ../../deployment/designate/designate-producer-container-puppet.yaml
+  OS::TripleO::Services::DesignateWorker: ../../deployment/designate/designate-worker-container-puppet.yaml
+  OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml
+  OS::TripleO::Services::Unbound: ../../deployment/unbound/unbound-container-ansible.yaml
diff --git a/releasenotes/notes/designate-environment-file-bd08eef69758a996.yaml b/releasenotes/notes/designate-environment-file-bd08eef69758a996.yaml
new file mode 100644
index 0000000000..c8f14554ba
--- /dev/null
+++ b/releasenotes/notes/designate-environment-file-bd08eef69758a996.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    Using environments/enable-designate.yaml has been deprecated in
+    favor of environments/services/designate.yaml, the current location
+    for environment files that enable TripleO components.
diff --git a/sample-env-generator/enable-services.yaml b/sample-env-generator/enable-services.yaml
deleted file mode 100644
index d1103c0ce3..0000000000
--- a/sample-env-generator/enable-services.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-environments:
-  -
-    name: enable-designate
-    title: Enable Designate Service
-    description: |
-      EXPERIMENTAL: This service is not considered ready for production and
-      should only be used for development and test purposes at this time.
-
-      This environment enables the Designate services.  One of the
-      designate-config* environment files must also be included.
-    resource_registry:
-      OS::TripleO::Services::DesignateApi: ../deployment/designate/designate-api-container-puppet.yaml
-      OS::TripleO::Services::DesignateCentral: ../deployment/designate/designate-central-container-puppet.yaml
-      OS::TripleO::Services::DesignateMDNS: ../deployment/designate/designate-mdns-container-puppet.yaml
-      OS::TripleO::Services::DesignateProducer: ../deployment/designate/designate-producer-container-puppet.yaml
-      OS::TripleO::Services::DesignateWorker: ../deployment/designate/designate-worker-container-puppet.yaml
-      OS::TripleO::Services::DesignateBind: ../deployment/designate/designate-bind-container.yaml
-      OS::TripleO::Services::Redis: ../deployment/database/redis-container-puppet.yaml
-      OS::TripleO::Services::Unbound: ../deployment/unbound/unbound-container-ansible.yaml
-    files:
-      deployment/neutron/neutron-plugin-ml2.yaml:
-        parameters:
-          - NeutronPluginExtensions
-      deployment/neutron/neutron-dhcp-container-puppet.yaml:
-        parameters:
-          - NeutronEnableInternalDNS
-    sample_values:
-      NeutronPluginExtensions: qos,port_security,dns
-      NeutronEnableInternalDNS: True