diff --git a/frontend/docker-compose-bootstrap.yml b/frontend/docker-compose-bootstrap.yml
index f2055fc..26a41de 100644
--- a/frontend/docker-compose-bootstrap.yml
+++ b/frontend/docker-compose-bootstrap.yml
@@ -18,7 +18,11 @@
       - ../cord-pod/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
       - ../../xos_services:/opt/xos_services
       - ../../xos/xos/api/utility:/opt/xos/api/utility
-      - ../../xos/xos/core:/opt/xos/core
+      - ../../xos/xos/core/models:/opt/xos/core/models
+      - ../../xos/xos/core/templatetags:/opt/xos/core/templatetags
+      - ../../xos/xos/xos:/opt/xos/xos
+      - ../../xos/xos/tosca:/opt/xos/tosca
+      - ../../xos/xos/synchronizers:/opt/xos/synchronizers
 
 xos_synchronizer_onboarding:
     image: xosproject/xos-synchronizer-onboarding
diff --git a/frontend/xos.yaml b/frontend/xos.yaml
index caa4b86..6d71725 100644
--- a/frontend/xos.yaml
+++ b/frontend/xos.yaml
@@ -36,12 +36,42 @@
               node: xos
               relationship: tosca.relationships.UsedByXOS
 
-    /opt/xos/core/xoslib/static:
-      type: tosca.nodes.XOSVolume
-      properties:
-          host_path: { path_join: [ SELF, CONFIG_DIR, ../../core/xoslib/static/, ENV_VAR ] }
-          read_only: false
-      requirements:
-          - xos:
-              node: xos
-              relationship: tosca.relationships.UsedByXOS
\ No newline at end of file
+    /opt/xos/core/models:
+          type: tosca.nodes.XOSVolume
+          properties:
+              host_path: { path_join: [ SELF, CONFIG_DIR, ../../xos/xos/core/models/, ENV_VAR ] }
+              read_only: false
+          requirements:
+              - xos:
+                  node: xos
+                  relationship: tosca.relationships.UsedByXOS
+
+    /opt/xos/templates:
+          type: tosca.nodes.XOSVolume
+          properties:
+              host_path: { path_join: [ SELF, CONFIG_DIR, ../../xos/xos/templates/, ENV_VAR ] }
+              read_only: false
+          requirements:
+              - xos:
+                  node: xos
+                  relationship: tosca.relationships.UsedByXOS
+
+    /opt/xos/tosca:
+          type: tosca.nodes.XOSVolume
+          properties:
+              host_path: { path_join: [ SELF, CONFIG_DIR, ../../xos/xos/tosca/, ENV_VAR ] }
+              read_only: false
+          requirements:
+              - xos:
+                  node: xos
+                  relationship: tosca.relationships.UsedByXOS
+
+    /opt/xos/xos:
+          type: tosca.nodes.XOSVolume
+          properties:
+              host_path: { path_join: [ SELF, CONFIG_DIR, ../../xos/xos/xos/, ENV_VAR ] }
+              read_only: false
+          requirements:
+              - xos:
+                  node: xos
+                  relationship: tosca.relationships.UsedByXOS