diff --git a/README.rst b/README.rst
index 21bba9c..0b41d13 100644
--- a/README.rst
+++ b/README.rst
@@ -327,6 +327,17 @@
           # Add key without value to remove line from policy.json
           cloudformation:ListStacks:
 
+
+Enable stack abandon and/or stack adopt features:
+-------------------------------------------------
+
+.. code-block:: yaml
+
+    heat:
+      server:
+        enable_stack_abandon: true
+        enable_stack_adopt: true
+
 Upgrades
 ========
 
diff --git a/heat/files/pike/heat.conf.Debian b/heat/files/pike/heat.conf.Debian
index a0e7555..5255e51 100644
--- a/heat/files/pike/heat.conf.Debian
+++ b/heat/files/pike/heat.conf.Debian
@@ -117,10 +117,10 @@
 #enable_cloud_watch_lite = false
 
 # Enable the preview Stack Abandon feature. (boolean value)
-#enable_stack_abandon = false
+enable_stack_abandon = {{ server.get('enable_stack_abandon', False) }}
 
 # Enable the preview Stack Adopt feature. (boolean value)
-#enable_stack_adopt = false
+enable_stack_adopt = {{ server.get('enable_stack_adopt', False) }}
 
 # Enables engine with convergence architecture. All stacks with this option
 # will be created using convergence engine. (boolean value)
diff --git a/heat/files/queens/heat.conf.Debian b/heat/files/queens/heat.conf.Debian
index 2e14675..c006f11 100644
--- a/heat/files/queens/heat.conf.Debian
+++ b/heat/files/queens/heat.conf.Debian
@@ -111,10 +111,10 @@
 #enable_cloud_watch_lite = false
 
 # Enable the preview Stack Abandon feature. (boolean value)
-#enable_stack_abandon = false
+enable_stack_abandon = {{ server.get('enable_stack_abandon', False) }}
 
 # Enable the preview Stack Adopt feature. (boolean value)
-#enable_stack_adopt = false
+enable_stack_adopt = {{ server.get('enable_stack_adopt', False) }}
 
 # Enables engine with convergence architecture. All stacks with this option
 # will be created using convergence engine. (boolean value)