diff --git a/ccp/modules/datashield-compose.yml b/ccp/modules/datashield-compose.yml
index 555a4f8..8504750 100644
--- a/ccp/modules/datashield-compose.yml
+++ b/ccp/modules/datashield-compose.yml
@@ -17,7 +17,7 @@ services:
       - "traefik.http.routers.rstudio_ccp.tls=true"
       - "traefik.http.middlewares.rstudio_ccp_strip.stripprefix.prefixes=/rstudio"
       - "traefik.http.routers.rstudio_ccp.middlewares=rstudio_ccp_strip"
-    #volumes:
+      #volumes:
       #- "bridgehead-rstudio-config:/home/rstudio/.config/rstudio"
       #- "bridgehead-rstudio-workspace:/home/rstudio/workspace"
 
@@ -35,7 +35,7 @@ services:
       - opal-db
     environment:
       JAVA_OPTS: "-Xms1G -Xmx8G -XX:+UseG1GC"
-      # OPAL_ADMINISTRATOR_USER: "administrator"
+      # OPAL_ADMINISTRATOR_USER: "administrator" # Please, don't remove this line. It is informative.
       OPAL_ADMINISTRATOR_PASSWORD: "${OPAL_ADMINISTRATOR_PASSWORD}"
       POSTGRESDATA_HOST: "opal-db"
       POSTGRESDATA_DATABASE: "opal"
@@ -45,8 +45,8 @@ services:
       APP_URL: "https://${HOST}/opal"
       APP_CONTEXT_PATH: "/opal"
 
-#    volumes:
-#      - "bridgehead-opal:/srv"
+  #    volumes:
+  #      - "bridgehead-opal:/srv"
 
 
   opal-db: # Data
@@ -56,8 +56,8 @@ services:
       POSTGRES_PASSWORD: "${OPAL_DB_PASSWORD}"
       POSTGRES_USER: "opal"
       POSTGRES_DB: "opal"
-    volumes:
-      - "bridgehead-opal-db:/var/lib/postgresql/data"
+  #    volumes:
+  #      - "bridgehead-opal-db:/var/lib/postgresql/data"
 
   opal-rserver:
     container_name: bridgehead-opal-rserver
@@ -75,7 +75,7 @@ services:
       DISCOVERY_URL: "./map/central.json"
       LOCAL_TARGETS_FILE: "./map/local.json"
     depends_on:
-      - "beam-proxy"
+      - beam-proxy
     volumes:
       - /etc/bridgehead/datashield-connect/:/map:ro
 
@@ -84,12 +84,12 @@ services:
       APP_2_ID: datashield-connect
       APP_2_KEY: ${DATASHIELD_CONNECT_SECRET}
 
-volumes:
+#volumes:
 #  bridgehead-rstudio-config:
 #    name: "bridgehead-rstudio-config"
 #  bridgehead-rstudio-workspace:
 #    name: "bridgehead-rstudio-workspace"
-  bridgehead-opal-db:
-    name: "bridgehead-opal-db"
+#  bridgehead-opal-db:
+#    name: "bridgehead-opal-db"
 #  bridgehead-opal:
 #    name: "bridgehead-opal"
diff --git a/ccp/modules/exporter-compose.yml b/ccp/modules/exporter-compose.yml
index 6d48531..5a5597a 100644
--- a/ccp/modules/exporter-compose.yml
+++ b/ccp/modules/exporter-compose.yml
@@ -23,12 +23,10 @@ services:
       - "traefik.http.routers.exporter_ccp.rule=PathPrefix(`/ccp-exporter`)"
       - "traefik.http.services.exporter_ccp.loadbalancer.server.port=8092"
       - "traefik.http.routers.exporter_ccp.tls=true"
-      # TODO: Add basic auth in Teiler UI to access exporter?
-      #- "traefik.http.routers.exporter_ccp.middlewares=auth"
       - "traefik.http.middlewares.exporter_ccp_strip.stripprefix.prefixes=/ccp-exporter"
       - "traefik.http.routers.exporter_ccp.middlewares=exporter_ccp_strip"
-    volumes:
-      - "bridgehead-exporter:/app/exporter-files"
+#    volumes:
+#      - "bridgehead-exporter:/app/exporter-files"
 
   exporter-db:
     image: postgres:15.1-alpine
@@ -38,11 +36,12 @@ services:
       POSTGRES_PASSWORD: "${EXPORTER_DB_PASSWORD}" # Set in exporter-setup.sh
       POSTGRES_DB: "exporter"
     volumes:
+      # TODO: Move to logging component in bridgehead
       - "bridgehead-exporter-db:/var/lib/postgresql/data"
 
 
 volumes:
   bridgehead-exporter-db:
     name: "bridgehead-exporter-db"
-  bridgehead-exporter:
-    name: "bridgehead-exporter"
+#  bridgehead-exporter:
+#    name: "bridgehead-exporter"