diff --git a/devstack/settings b/devstack/settings
index 3be91312b..649ff3bc6 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -18,13 +18,6 @@ if [ "${TACKER_MODE}" == "all" ]; then
     enable_service q-svc
     enable_service neutron
 
-    # Heat
-    enable_service heat
-    enable_service h-eng
-    enable_service h-api
-    enable_service h-api-cfn
-    enable_service h-api-cw
-
     enable_service tacker
 
     # tacker-horizon isn't installable from pip
diff --git a/doc/source/install/devstack.rst b/doc/source/install/devstack.rst
index fc184c3fb..3a92a2fb5 100644
--- a/doc/source/install/devstack.rst
+++ b/doc/source/install/devstack.rst
@@ -30,9 +30,10 @@ Install from master
     $ git clone https://git.openstack.org/openstack-dev/devstack
     $ cd devstack
 
-2. Add this repo as an external repository into your ``local.conf`` file::
+2. Enable both heat and tacker devstack plugins in ``local.conf`` file::
 
     [[local|localrc]]
+    enable_plugin heat https://git.openstack.org/openstack/heat
     enable_plugin tacker https://git.openstack.org/openstack/tacker
 
 3. Run ``stack.sh``::