diff --git a/frontend/Makefile b/frontend/Makefile
index 14c0dec..c1d46a6 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -54,7 +54,7 @@
 	@echo "[FRONTENDCONFIG]"
 	$(RUN_TOSCA) sample.yaml
 
-containers: prereqs download_xos
+local_containers: prereqs download_xos
 	make -f ../common/Makefile.containers xos_devel synchronizer onboarding_synchronizer
 
 rebuild:
diff --git a/frontend/README.md b/frontend/README.md
index 17f2626..9e10d83 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -14,7 +14,7 @@
 If you need to work on the Django application itself:
 - comment out the `sleep 86400` command for the `xos_bootstrap_ui` container in `docker-compose-bootstrap.yml`
 - comment the `python /opt/xos/manage.py runserver 0.0.0.0:9998 --insecure --makemigrations` in the same file
-- run `make containers`.
+- run `make local_containers`.
 - run `make`
 
 You'll notice that the `make` command will hang on to `Waiting for XOS to start listening on port 9998`, so in another shell:
@@ -51,7 +51,7 @@
 
 Delete the containers and relaunch them: `make rm; make`
 
-Build the containers from scratch using the local XOS source tree: `make containers`
+Build the containers from scratch using the local XOS source tree: `make local_containers`
 
 View logs: `make showlogs`
 
diff --git a/frontend/docker-compose-bootstrap.yml b/frontend/docker-compose-bootstrap.yml
index 66ca64e..51eba35 100644
--- a/frontend/docker-compose-bootstrap.yml
+++ b/frontend/docker-compose-bootstrap.yml
@@ -16,17 +16,20 @@
     volumes:
       - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
       - ../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/models:/opt/xos/core/models
+      - ../../xos/xos/templates:/opt/xos/templates
       - ../../xos/xos/core/templatetags:/opt/xos/core/templatetags
       - ../../xos/xos/core/xoslib/dashboards:/opt/xos/core/xoslib/dashboards
       - ../../xos/xos/core/xoslib/static/css:/opt/xos/core/xoslib/static/css
       - ../../xos/xos/core/xoslib/static/images:/opt/xos/core/xoslib/static/images
       - ../../xos/xos/core/xoslib/static/js:/opt/xos/core/xoslib/static/js
-      - ../../xos/xos/xos:/opt/xos/xos
-      - ../../xos/xos/tosca:/opt/xos/tosca
-      - ../../xos/xos/synchronizers:/opt/xos/synchronizers
+      
+      # The following volumes are sometimes used in development,
+      # but they are not tested and they can break part of the system, handle with care.
+      # - ../../xos_services:/opt/xos_services
+      # - ../../xos/xos/core/models:/opt/xos/core/models
+      # - ../../xos/xos/tosca:/opt/xos/tosca
+      # - ../../xos/xos/xos:/opt/xos/xos
 
 xos_synchronizer_onboarding:
     image: xosproject/xos-synchronizer-onboarding
diff --git a/frontend/xos.yaml b/frontend/xos.yaml
index 76d23f1..1f15cef 100644
--- a/frontend/xos.yaml
+++ b/frontend/xos.yaml
@@ -36,16 +36,6 @@
               node: xos
               relationship: tosca.relationships.UsedByXOS
 
-    /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/core/templatetags:
           type: tosca.nodes.XOSVolume
           properties:
@@ -106,22 +96,45 @@
                   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
+    # The following volumes are sometimes used in development,
+    # but they are not tested and they can break part of the system, handle with care.
 
-    /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
\ No newline at end of file
+    # /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
+
+    # /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/api/utility:
+    #       type: tosca.nodes.XOSVolume
+    #       properties:
+    #           host_path: { path_join: [ SELF, CONFIG_DIR, ../../xos/xos/api/utility/, ENV_VAR ] }
+    #           read_only: false
+    #       requirements:
+    #           - xos:
+    #               node: xos
+    #               relationship: tosca.relationships.UsedByXOS
\ No newline at end of file