diff --git a/Rakefile b/Rakefile
index 49676db..67d182a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -106,6 +106,8 @@ def _run_basic_queries # rubocop:disable Metrics/MethodLength
     'keystone' => %w(--version user-list endpoint-list role-list service-list tenant-list),
     'cinder-manage' => ['version list', 'db version'],
     'cinder' => %w(--version list),
+    'heat-manage' => ['db_version', 'service list'],
+    'heat' => %w(--version stack-list),
     'rabbitmqctl' => %w(cluster_status),
     'ifconfig' => [''],
     'neutron' => %w(agent-list ext-list net-list port-list subnet-list quota-list),
@@ -150,7 +152,7 @@ end
 
 def _dump_logs
   paths = []
-  %w(nova neutron keystone cinder glance).each do |project|
+  %w(nova neutron keystone cinder glance heat).each do |project|
     paths << "-r \"\" /etc/#{project}/*"
     paths << "-r \"\" /var/log/#{project}/*"
   end
diff --git a/data_bags/db_passwords/heat.json b/data_bags/db_passwords/heat.json
new file mode 100644
index 0000000..22720f9
--- /dev/null
+++ b/data_bags/db_passwords/heat.json
@@ -0,0 +1,9 @@
+{
+  "id": "heat",
+  "heat": {
+    "encrypted_data": "zgl0ZuuOiJ0LpzDdKCX4M9n/l9bkcF4Z45gv4abyLng=\n",
+    "iv": "182xiFiVaERWG53LotL7Gg==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
+  }
+}
\ No newline at end of file
diff --git a/data_bags/secrets/orchestration_auth_encryption_key.json b/data_bags/secrets/orchestration_auth_encryption_key.json
new file mode 100644
index 0000000..ff4247f
--- /dev/null
+++ b/data_bags/secrets/orchestration_auth_encryption_key.json
@@ -0,0 +1,9 @@
+{
+  "id": "orchestration_auth_encryption_key",
+  "orchestration_auth_encryption_key": {
+    "encrypted_data": "2zjK5nNVG3ZTXQ6ZbpGBWjK+7X7vhcI8xq8EstBYdSQtrzcPAFToUG0jbb9d\nmJuJ10uXoH+JntEM68pNmCRsrw==\n",
+    "iv": "XMpkT6S0qeATHewNsnQCrw==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
+  }
+}
\ No newline at end of file
diff --git a/data_bags/service_passwords/openstack-orchestration.json b/data_bags/service_passwords/openstack-orchestration.json
new file mode 100644
index 0000000..692f032
--- /dev/null
+++ b/data_bags/service_passwords/openstack-orchestration.json
@@ -0,0 +1,9 @@
+{
+  "id": "openstack-orchestration",
+  "openstack-orchestration": {
+    "encrypted_data": "0HpyFflTF4UHGDtq3koSMGkLOZ7XAKrp0fw2D0rKSt0=\n",
+    "iv": "xRgADbFNtnNdPrRHGdI1vg==\n",
+    "version": 1,
+    "cipher": "aes-256-cbc"
+  }
+}
\ No newline at end of file
diff --git a/roles/allinone.json b/roles/allinone.json
index 7444e13..f6f0dde 100644
--- a/roles/allinone.json
+++ b/roles/allinone.json
@@ -51,6 +51,11 @@
     "recipe[openstack-block-storage::volume]",
     "recipe[openstack-block-storage::backup]",
     "recipe[openstack-block-storage::identity_registration]",
+    "recipe[openstack-orchestration::engine]",
+    "recipe[openstack-orchestration::api]",
+    "recipe[openstack-orchestration::api-cfn]",
+    "recipe[openstack-orchestration::api-cloudwatch]",
+    "recipe[openstack-orchestration::identity_registration]",
     "recipe[openstack-common::client]",
     "recipe[openstack-dashboard::server]"
   ],