diff --git a/Dockerfile b/Dockerfile
index 4b29119..2d1293c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -108,6 +108,6 @@ RUN chown -R spark_user:spark ${JUPYTERHUB_SECRETS_DIR}
 RUN echo "spark_user ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 # Switch back to non-root user
-USER spark_user
+#USER spark_user
 
 ENTRYPOINT ["/opt/scripts/entrypoint.sh"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 90adeb1..bbed80f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -150,7 +150,7 @@ services:
       - POSTGRES_URL=postgres:5432
       - USAGE_MODE=dev  # Enabling dev mode grants full access to MinIO and additional privileges for services like Hive, such as the ability to create tables as defined in the scripts/setup.sh.
     volumes:
-      - ./cdr/cdm/jupyter:/cdm_shared_workspace
+      - ./cdr/cdm/jupyter/cdm_shared_workspace:/cdm_shared_workspace
 
   user-jupyterlab:
     build:
@@ -179,7 +179,7 @@ services:
       - POSTGRES_DB=hive
       - POSTGRES_URL=postgres:5432
     volumes:
-      - ./cdr/cdm/jupyter/user_shared_workspace:/cdm_shared_workspace/user_shared_workspace
+      - ./cdr/cdm/jupyter/cdm_shared_workspace/user_shared_workspace:/cdm_shared_workspace/user_shared_workspace
 
   cdm_jupyterhub:
     build: