diff --git a/xos-profiles/base-openstack/templates/_helpers.tpl b/xos-profiles/base-openstack/templates/_helpers.tpl
index 66a8e2d..bd4fcce 100644
--- a/xos-profiles/base-openstack/templates/_helpers.tpl
+++ b/xos-profiles/base-openstack/templates/_helpers.tpl
@@ -45,20 +45,3 @@
 {{- define "base-openstack.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{/*
-The R-CORD synchronizer loads R-CORD-specific models into the core
-*/}}
-
-{{- define "rcord.serviceConfig" -}}
-name: rcord
-accessor:
-  username: {{ .Values.xosAdminUser | quote }}
-  password: {{ .Values.xosAdminPassword | quote }}
-  endpoint: xos-core:50051
-dependency_graph: "/opt/xos/synchronizers/rcord/model-deps"
-sys_dir: "/opt/xos/synchronizers/rcord/sys"
-models_dir: "/opt/xos/synchronizers/rcord/models"
-model_policies_dir: "/opt/xos/synchronizers/rcord/model_policies"
-{{- end -}}
-
diff --git a/xos-profiles/base-openstack/templates/_tosca.tpl b/xos-profiles/base-openstack/templates/_tosca.tpl
new file mode 100644
index 0000000..962047c
--- /dev/null
+++ b/xos-profiles/base-openstack/templates/_tosca.tpl
@@ -0,0 +1,150 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-present Open Networking Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+{{- define "base-openstack.fixtureTosca" -}}
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - custom_types/deployment.yaml
+  - custom_types/site.yaml
+  - custom_types/networktemplate.yaml
+  - custom_types/network.yaml
+  - custom_types/networkslice.yaml
+  - custom_types/sitedeployment.yaml
+
+description: set up site and deployment and link them
+
+topology_template:
+  node_templates:
+
+    {{ .Values.cordSiteName }}:
+      type: tosca.nodes.Site
+      properties:
+          name: {{ .Values.cordSiteName }}
+          site_url: http://mysite.opencord.us/
+          hosts_nodes: true
+
+    {{ .Values.cordDeploymentName }}:
+      type: tosca.nodes.Deployment
+      properties:
+        name: {{ .Values.cordDeploymentName }}
+{{- end -}}
+
+{{- define "base-openstack.serviceGraphTosca" -}}
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+   - custom_types/onosapp.yaml
+   - custom_types/servicegraphconstraint.yaml
+   - custom_types/serviceinstancelink.yaml
+   - custom_types/vtnservice.yaml
+
+description: Configures the base-openstack service graph
+
+topology_template:
+  node_templates:
+
+    service#vtn:
+      type: tosca.nodes.VTNService
+      properties:
+        name: vtn
+        must-exist: true
+        resync: false
+
+    VTN_ONOS_app:
+      type: tosca.nodes.ONOSApp
+      properties:
+          name: VTN_ONOS_app
+          must-exist: true
+
+    VTN_ONOS_app_VTN_Service:
+        type: tosca.nodes.ServiceInstanceLink
+        requirements:
+          - provider_service_instance:
+              node: VTN_ONOS_app
+              relationship: tosca.relationships.BelongsToOne
+          - subscriber_service:
+              node: service#vtn
+              relationship: tosca.relationships.BelongsToOne
+
+    constraints:
+      type: tosca.nodes.ServiceGraphConstraint
+      properties:
+        constraints: '[]'
+{{- end -}}
+
+{{- define "base-openstack.testTosca" -}}
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+  - custom_types/flavor.yaml
+  - custom_types/image.yaml
+  - custom_types/site.yaml
+  - custom_types/network.yaml
+  - custom_types/networkslice.yaml
+  - custom_types/slice.yaml
+
+description: for testing basic openstack functionality
+
+topology_template:
+  node_templates:
+
+    Ubuntu-14.04:
+      type: tosca.nodes.Image
+      properties:
+        name: "Ubuntu 14.04 64-bit"
+        disk_format: QCOW2
+        container_format: BARE
+        path: https://github.com/opencord/platform-install/releases/download/vms/trusty-server-cloudimg-amd64-disk1.img.20170201
+
+    {{ .Values.cordSiteName }}:
+      type: tosca.nodes.Site
+      properties:
+        name: {{ .Values.cordSiteName }}
+        must-exist: true
+
+# Define a test slice
+    {{ .Values.cordSiteName }}_test:
+      description: Test Slice
+      type: tosca.nodes.Slice
+      properties:
+        # network: noauto
+        name: {{ .Values.cordSiteName }}_test
+      requirements:
+        - site:
+            node: {{ .Values.cordSiteName }}
+            relationship: tosca.relationships.BelongsToOne
+        - default_image:
+            node: Ubuntu-14.04
+            relationship: tosca.relationships.BelongsToOne
+
+    management:
+      type: tosca.nodes.Network
+      properties:
+        name: management
+        must-exist: true
+
+# Connect test slice to management net
+    networkslice#management_to_{{ .Values.cordSiteName }}_test:
+        type: tosca.nodes.NetworkSlice
+        requirements:
+          - network:
+              node: management
+              relationship: tosca.relationships.BelongsToOne
+          - slice:
+              node: {{ .Values.cordSiteName }}_test
+              relationship: tosca.relationships.BelongsToOne
+{{- end -}}
\ No newline at end of file
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 }}