diff --git a/README.rst b/README.rst
index 6d420fe..977dcc2 100644
--- a/README.rst
+++ b/README.rst
@@ -1439,6 +1439,16 @@
       compute:
         security_driver: apparmor
 
+Disable new services automatically
+========
+
+.. code-block:: yaml
+
+    nova:
+      compute:
+        enable_new_services: False
+      controller:
+        enable_new_services: False
 
 Change files/directories permissions for nova service:
 =======================================
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 89467e8..8550698 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -1217,6 +1217,9 @@
 #   ready to use.
 #  (boolean value)
 #enable_new_services=true
+{%- if compute.enable_new_services is defined %}
+enable_new_services = {{ compute.enable_new_services }}
+{%- endif %}
 
 #
 # Template string to be used to generate instance names.
diff --git a/nova/files/pike/nova-controller.conf.Debian b/nova/files/pike/nova-controller.conf.Debian
index f31049d..4c5c619 100644
--- a/nova/files/pike/nova-controller.conf.Debian
+++ b/nova/files/pike/nova-controller.conf.Debian
@@ -1199,6 +1199,9 @@
 #   ready to use.
 #  (boolean value)
 #enable_new_services=true
+{%- if controller.enable_new_services is defined %}
+enable_new_services = {{ controller.enable_new_services }}
+{%- endif %}
 
 #
 # Template string to be used to generate instance names.
diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index a6d4a96..9cd5573 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -1307,6 +1307,9 @@
 #   they are not ready to use.
 #  (boolean value)
 #enable_new_services = true
+{%- if compute.enable_new_services is defined %}
+enable_new_services = {{ compute.enable_new_services }}
+{%- endif %}
 
 #
 # Template string to be used to generate instance names.
diff --git a/nova/files/queens/nova-controller.conf.Debian b/nova/files/queens/nova-controller.conf.Debian
index b56b793..390794e 100644
--- a/nova/files/queens/nova-controller.conf.Debian
+++ b/nova/files/queens/nova-controller.conf.Debian
@@ -1304,6 +1304,9 @@
 #   they are not ready to use.
 #  (boolean value)
 #enable_new_services = true
+{%- if controller.enable_new_services is defined %}
+enable_new_services = {{ controller.enable_new_services }}
+{%- endif %}
 
 #
 # Template string to be used to generate instance names.