diff --git a/roles/cord-profile/templates/onboard-chameleon.yaml.j2 b/roles/cord-profile/templates/onboard-chameleon.yaml.j2
index 9ba68f2..e8f88d8 100644
--- a/roles/cord-profile/templates/onboard-chameleon.yaml.j2
+++ b/roles/cord-profile/templates/onboard-chameleon.yaml.j2
@@ -13,3 +13,14 @@
         command: python chameleon/chameleon/main.py -R 9101 -G xos-core:50055
         image: xosproject/chameleon
         ports: 9101:9101
+
+    chameleon-to-core:
+      type: tosca.nodes.ComponentLink
+      properties:
+          container: xos_core
+          alias: xos-core
+          kind: internal
+      requirements:
+          - xos:
+             node: xos_chameleon
+             relationship: tosca.relationships.LinkOfComponent
diff --git a/roles/cord-profile/templates/onboard-xos-rest-gw.yaml.j2 b/roles/cord-profile/templates/onboard-xos-rest-gw.yaml.j2
index 04b916c..22d9fc6 100644
--- a/roles/cord-profile/templates/onboard-xos-rest-gw.yaml.j2
+++ b/roles/cord-profile/templates/onboard-xos-rest-gw.yaml.j2
@@ -41,7 +41,7 @@
     gw-to-redis:
       type: tosca.nodes.ComponentLink
       properties:
-          container: cordpodbs_xos_redis_1
+          container: {{ cord_profile | regex_replace('\\W','') }}bs_xos_redis_1
           alias: redis
           kind: external
       requirements: