diff --git a/xos-profiles/base-openstack/templates/tosca-configmap.yaml b/xos-profiles/base-openstack/templates/tosca-configmap.yaml
index 3d7edf8..6d4448e 100644
--- a/xos-profiles/base-openstack/templates/tosca-configmap.yaml
+++ b/xos-profiles/base-openstack/templates/tosca-configmap.yaml
@@ -19,10 +19,22 @@
 metadata:
   name: base-openstack-tosca
 data:
-  010-openstack.yaml: |
-{{ toYaml .Values.toscaRecipes.openstack | indent 4 }}
-  020-openstack-compute.yaml: |
+  010-fixtures.yaml: |
+{{ include "base-openstack.fixtureTosca" . | indent 4 }}
+  020-openstack-controller.yaml: |
+{{ include "openstack.controllerTosca" .Values | indent 4 }}
+  030-openstack-flavors.yaml: |
+{{ include "openstack.flavorTosca" .Values.openstack | indent 4 }}
+  040-vtn-service.yaml: |
+{{ include "vtn-service.serviceTosca" (index .Values "vtn-service") | indent 4 }}
+  050-openstack-compute.yaml: |
 {{ toYaml .Values.toscaRecipes.openstackCompute | indent 4 }}
-  030-vtn-service.yaml: |
-{{ toYaml .Values.toscaRecipes.vtnService | indent 4 }}
+  060-openstack-networks.yaml: |
+{{ include "openstack.networkTosca" .Values | indent 4 }}
+  070-onos-service-vtn-app.yaml: |
+{{ include "onos-service.vtnAppTosca" (index .Values "onos-service") | indent 4 }}
+  300-service-graph.yaml: |
+{{ include "base-openstack.serviceGraphTosca" . | indent 4 }}
+  400-openstack-test.yaml: |
+{{ include "base-openstack.testTosca" . | indent 4 }}