diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index 143ede9f4..91bfca79c 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -69,11 +69,16 @@ kolla_feature_flags:
   - ceph
   - ceph_rgw
   - cinder
+  - cinder_backend_hnas_iscsi
+  - cinder_backend_hnas_nfs
   - cinder_backend_iscsi
   - cinder_backend_lvm
+  - cinder_backend_nfs
   - cloudkitty
   - congress
+  - designate
   - etcd
+  - freezer
   - gnocchi
   - grafana
   - haproxy
@@ -81,23 +86,38 @@ kolla_feature_flags:
   - horizon
   - influxdb
   - ironic
+  - karbor
   - kuryr
   - magnum
   - manila
+  - manila_backend_generic
+  - manila_backend_hnas
   - mistral
   - mongodb
   - murano
   - multipathd
   - neutron_dvr
+  - neutron_fwaas
   - neutron_lbaas
   - neutron_qos
   - neutron_agent_ha
   - neutron_vpnaas
+  - neutron_bgp_dragent
+  - neutron_provider_networks
+  - nova_serialconsole_proxy
+  - octavia
+  - osprofiler
+  - panko
   - rally
   - sahara
+  - searchlight
   - senlin
+  - skydive
+  - solum
   - swift
+  - tacker
   - telegraf
   - tempest
+  - trove
   - watcher
-
+  - zun
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 78a4d7e77..e678f05d1 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -139,11 +139,16 @@
 #kolla_enable_ceph:
 #kolla_enable_ceph_rgw:
 #kolla_enable_cinder:
+#kolla_enable_cinder_backend_hnas_iscsi:
+#kolla_enable_cinder_backend_hnas_nfs:
 #kolla_enable_cinder_backend_iscsi:
 #kolla_enable_cinder_backend_lvm:
+#kolla_enable_cinder_backend_nfs:
 #kolla_enable_cloudkitty:
 #kolla_enable_congress:
+#kolla_enable_designate:
 #kolla_enable_etcd:
+#kolla_enable_freezer:
 #kolla_enable_gnocchi:
 #kolla_enable_grafana:
 #kolla_enable_haproxy:
@@ -152,26 +157,42 @@
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
 #kolla_enable_iscsid:
+#kolla_enable_karbor:
 #kolla_enable_kuryr:
 #kolla_enable_magnum:
 #kolla_enable_manila:
+#kolla_enable_manila_backend_generic:
+#kolla_enable_manila_backend_hnas:
 #kolla_enable_mistral:
 #kolla_enable_mongodb:
 #kolla_enable_multipathd:
 #kolla_enable_murano:
 #kolla_enable_neutron_vpnaas:
 #kolla_enable_neutron_dvr:
+#kolla_enable_neutron_fwaas:
 #kolla_enable_neutron_lbaas:
 #kolla_enable_neutron_qos:
 #kolla_enable_neutron_agent_ha:
+#kolla_enable_neutron_bgp_dragent:
+#kolla_enable_neutron_provider_networks:
+#kolla_enable_nova_serialconsole_proxy:
+#kolla_enable_octavia:
+#kolla_enable_osprofiler:
+#kolla_enable_panko:
 #kolla_enable_rally:
 #kolla_enable_sahara:
+#kolla_enable_searchlight:
 #kolla_enable_senlin:
+#kolla_enable_skydive:
+#kolla_enable_solum:
 #kolla_enable_swift:
+#kolla_enable_tacker:
 #kolla_enable_telegraf:
 #kolla_enable_tempest:
+#kolla_enable_trove:
 #kolla_enable_vmtp:
 #kolla_enable_watcher:
+#kolla_enable_zun:
 
 ###############################################################################
 # Passwords and credentials.