diff --git a/packages/dashmate/docker-compose.yml b/packages/dashmate/docker-compose.yml
index 67aae0bfa9..fb4cb02b0f 100644
--- a/packages/dashmate/docker-compose.yml
+++ b/packages/dashmate/docker-compose.yml
@@ -17,13 +17,14 @@ services:
     environment:
       - LOCAL_UID=${LOCAL_UID:?err}
       - LOCAL_GID=${LOCAL_GID:?err}
+      - DASHMATE_HOME_DIR=${DASHMATE_HOME_DIR:?err}
     ports:
       - 127.0.0.1:${DASHMATE_HELPER_API_PORT:?err}:${DASHMATE_HELPER_API_PORT:?err}
     command: yarn workspace dashmate helper ${CONFIG_NAME:?err}
     expose:
       - ${DASHMATE_HELPER_API_PORT:?err}
     volumes:
-      - ${DASHMATE_HOME_DIR:?err}:/home/dashmate/.dashmate
+      - ${DASHMATE_HOME_DIR:?err}:${DASHMATE_HOME_DIR:?err}
       - /var/run/docker.sock:/var/run/docker.sock
 
   core:
diff --git a/packages/dashmate/docker/entrypoint.sh b/packages/dashmate/docker/entrypoint.sh
index 773f337a2f..852dcb4095 100755
--- a/packages/dashmate/docker/entrypoint.sh
+++ b/packages/dashmate/docker/entrypoint.sh
@@ -31,4 +31,4 @@ fi
 
 echo "Starting with UID: $USER_ID, GID: $GROUP_ID, USER: $USERNAME, GROUP: $GROUP"
 
-exec su - $USERNAME -c "cd /platform;DASHMATE_HELPER=1 DASHMATE_HOME_DIR=/home/dashmate/.dashmate $*"
+exec su $USERNAME -c "cd /platform;DASHMATE_HELPER=1 DASHMATE_HOME_DIR=$DASHMATE_HOME_DIR $*"