diff --git a/doc/source/deploying_multiple_parallel_environments.rst b/doc/source/deploying_multiple_parallel_environments.rst
index 85fb9090..fbb15b2e 100644
--- a/doc/source/deploying_multiple_parallel_environments.rst
+++ b/doc/source/deploying_multiple_parallel_environments.rst
@@ -178,6 +178,7 @@ files for common configuration options and roles definitions.
         - etcd
         - glance-api
         - glance-registry
+        - heat-api-cfn
         - heat-api
         - heat-engine
         - horizon
diff --git a/doc/source/using_calico_instead_of_ovs.rst b/doc/source/using_calico_instead_of_ovs.rst
index f8fdc4e7..5df37957 100644
--- a/doc/source/using_calico_instead_of_ovs.rst
+++ b/doc/source/using_calico_instead_of_ovs.rst
@@ -156,6 +156,7 @@ in your configuration file (let's say it's ``ccp.yaml``):
         - etcd
         - glance-api
         - glance-registry
+        - heat-api-cfn
         - heat-api
         - heat-engine
         - horizon
diff --git a/etc/topology-calico-example.yaml b/etc/topology-calico-example.yaml
index a7c79bb2..ead9eec7 100644
--- a/etc/topology-calico-example.yaml
+++ b/etc/topology-calico-example.yaml
@@ -12,6 +12,7 @@ roles:
     - etcd
     - glance-api
     - glance-registry
+    - heat-api-cfn
     - heat-api
     - heat-engine
     - horizon
diff --git a/etc/topology-example.yaml b/etc/topology-example.yaml
index 7039899e..67c94dbd 100644
--- a/etc/topology-example.yaml
+++ b/etc/topology-example.yaml
@@ -12,6 +12,7 @@ roles:
     - etcd
     - glance-api
     - glance-registry
+    - heat-api-cfn
     - heat-api
     - heat-engine
     - horizon
diff --git a/etc/topology-with-ceph-example.yaml b/etc/topology-with-ceph-example.yaml
index 54801dd2..3124a7aa 100644
--- a/etc/topology-with-ceph-example.yaml
+++ b/etc/topology-with-ceph-example.yaml
@@ -12,6 +12,7 @@ roles:
     - etcd
     - glance-api
     - glance-registry
+    - heat-api-cfn
     - heat-api
     - heat-engine
     - horizon
diff --git a/etc/topology-with-stacklight-example.yaml b/etc/topology-with-stacklight-example.yaml
index f98424fc..55d0d884 100644
--- a/etc/topology-with-stacklight-example.yaml
+++ b/etc/topology-with-stacklight-example.yaml
@@ -21,6 +21,7 @@ roles:
     - etcd
     - glance-api
     - glance-registry
+    - heat-api-cfn
     - heat-api
     - heat-engine
     - horizon
diff --git a/tools/ccp-multi-deploy/config/ccp-roles.yaml b/tools/ccp-multi-deploy/config/ccp-roles.yaml
index 3df6cd6b..0b206bbe 100644
--- a/tools/ccp-multi-deploy/config/ccp-roles.yaml
+++ b/tools/ccp-multi-deploy/config/ccp-roles.yaml
@@ -8,6 +8,7 @@ roles:
     - etcd
     - glance-api
     - glance-registry
+    - heat-api-cfn
     - heat-api
     - heat-engine
     - horizon