diff --git a/roles/apache-proxy/files/cord-http.conf b/roles/apache-proxy/files/cord-http.conf
index db7bdc6..0057d6a 100644
--- a/roles/apache-proxy/files/cord-http.conf
+++ b/roles/apache-proxy/files/cord-http.conf
@@ -47,6 +47,9 @@
     ProxyPass /apidocs/ http://xos-chameleon:9101/apidocs/
     ProxyPass /v1/swagger.json http://xos-chameleon:9101/apidocs/v1/swagger.json
     
+    # TOSCA
+    ProxyPass /xos-tosca http://xos-tosca:9102
+
     # Map the various XOS roots to the XOS instance
     ProxyPass /xos-deprecated http://xos:9000
     ProxyPass /xos-deprecated/ http://xos:9000/
diff --git a/roles/cord-profile/tasks/main.yml b/roles/cord-profile/tasks/main.yml
index f6ed2bc..b9b5017 100644
--- a/roles/cord-profile/tasks/main.yml
+++ b/roles/cord-profile/tasks/main.yml
@@ -94,6 +94,7 @@
     - Dockerfile.xos
     - xos-gui-extensions.yml
     - docker-compose.yml
+    - xos-tosca.config.yaml
 
 - name: Create profile specific templated TOSCA config files
   template:
diff --git a/roles/cord-profile/templates/docker-compose.yml.j2 b/roles/cord-profile/templates/docker-compose.yml.j2
index c10e2d3..74551a3 100644
--- a/roles/cord-profile/templates/docker-compose.yml.j2
+++ b/roles/cord-profile/templates/docker-compose.yml.j2
@@ -110,6 +110,30 @@
       SERVICE_80_IGNORE: "yes"
     restart: unless-stopped
 
+  xos_tosca:
+    image: {{ deploy_docker_registry }}xosproject/xos-tosca:{{ deploy_docker_tag }}
+    networks:
+{% for network in xos_docker_networks %}
+     - {{ network }}
+{% endfor %}
+    ports:
+      - "9102:9102"
+    links:
+      - xos_core:xos-core
+    volumes:
+      - {{ head_cord_profile_dir }}/xos-tosca.config.yaml:/opt/xos-tosca/src/xos-tosca.config.yaml
+    depends_on:
+      - xos_core
+      - registrator
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1000k"
+        max-file: "5"
+    environment:
+      SERVICE_9102_NAME: "xos-tosca"
+    restart: unless-stopped
+
   xos_chameleon:
     image: {{ deploy_docker_registry }}xosproject/chameleon:{{ deploy_docker_tag }}
     networks:
diff --git a/roles/cord-profile/templates/xos-tosca.config.yaml.j2 b/roles/cord-profile/templates/xos-tosca.config.yaml.j2
new file mode 100644
index 0000000..311e9dd
--- /dev/null
+++ b/roles/cord-profile/templates/xos-tosca.config.yaml.j2
@@ -0,0 +1,4 @@
+name: xos-tosca
+grpc:
+  secure_endpoint: "xos-core.{{ site_suffix }}:50051"
+  insecure_endpoint: "xos-core.{{ site_suffix }}:50055"
diff --git a/roles/dev-env/tasks/main.yml b/roles/dev-env/tasks/main.yml
index 2189b3f..f0e1982 100644
--- a/roles/dev-env/tasks/main.yml
+++ b/roles/dev-env/tasks/main.yml
@@ -56,4 +56,5 @@
   - "127.0.0.1 xos-ws"
   - "127.0.0.1 xos-chameleon"
   - "127.0.0.1 xos-core"
+  - "127.0.0.1 xos-tosca"
   - "127.0.0.1 consul"