diff --git a/docker-compose.yml b/docker-compose.yml
index b87e35f..9d0f12c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,7 @@
     container_name: jupyterhub
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
+      - jupyterhub_data:/srv/jupyterhub
     environment:
       - VIRTUAL_HOST=jupyter.floop.org.uk
       - VIRTUAL_PORT=8000
@@ -29,6 +30,9 @@
     networks:
       - default
 
+volumes:
+  jupyterhub_data:
+
 networks:
   cloudfluff_proxy:
     external: true
diff --git a/gssnotebook/Dockerfile b/gssnotebook/Dockerfile
index 2034918..df8260a 100644
--- a/gssnotebook/Dockerfile
+++ b/gssnotebook/Dockerfile
@@ -1,9 +1,10 @@
 FROM cloudfluff/databaker
 
 RUN pip3 install --no-cache-dir \
-    jupyterhub==1.0.0
-RUN useradd -m jovyan
-ENV HOME=/home/jovyan
+    jupyterhub==1.0.0 \
+    jupyterlab
+RUN useradd -m gssuser
+ENV HOME=/home/gssuser
 WORKDIR $HOME
 USER gssuser
 
diff --git a/jupyterhub/jupyterhub_config.py b/jupyterhub/jupyterhub_config.py
index 07b000d..0ab910e 100644
--- a/jupyterhub/jupyterhub_config.py
+++ b/jupyterhub/jupyterhub_config.py
@@ -16,3 +16,10 @@
 
 from oauthenticator.github import GitHubOAuthenticator
 c.JupyterHub.authenticator_class = GitHubOAuthenticator
+
+notebook_dir = os.environ.get('DOCKER_NOTEBOOK_DIR') or '/home/gssuser'
+c.DockerSpawner.notebook_dir = notebook_dir
+c.DockerSpawner.volumes = { 'jupyterhub-user-{username}': notebook_dir }
+
+# Redirect to JupyterLab, instead of the plain Jupyter notebook
+c.Spawner.default_url = '/lab'