diff --git a/.env b/.env
index 06a95e0..dbbbd6b 100755
--- a/.env
+++ b/.env
@@ -19,7 +19,7 @@ DOCKER_MACHINE_NAME=jupyterhub
 DOCKER_NETWORK_NAME=jupyterhub-network
 
 # Single-user Jupyter Notebook server container image
-DOCKER_NOTEBOOK_IMAGE=jupyter/scipy-notebook
+DOCKER_NOTEBOOK_IMAGE=jupyter/datascience-notebook
 
 # the local image we use, after pinning jupyterhub version
 LOCAL_NOTEBOOK_IMAGE=jupyterhub-user
diff --git a/jupyterhub_config.py b/jupyterhub_config.py
index 5908efc..8bd81f3 100755
--- a/jupyterhub_config.py
+++ b/jupyterhub_config.py
@@ -17,6 +17,7 @@ c.JupyterHub.spawner_class = 'dockerspawner.DockerSpawner'
 c.DockerSpawner.image_whitelist = {'default': "jupyterhub-user", 
                                     'scipy': "jupyter/scipy-notebook", 
                                     'datascience': "jupyter/datascience-notebook",
+                                    'rstudio': 'rstudio_test',
                                     'base': "jupyter/base-notebook"}
 #c.DockerSpawner.container_image = "jupyter/datascience-notebook:7254cdcfa22b"
 
diff --git a/singleuser/Dockerfile b/singleuser/Dockerfile
index fc2a33f..99d6b0d 100755
--- a/singleuser/Dockerfile
+++ b/singleuser/Dockerfile
@@ -12,5 +12,6 @@ RUN apt-get update && \
 
 USER jovyan
 
-RUN python3 -m pip install --no-cache jupyterhub==$JUPYTERHUB_VERSION nbresuse
+RUN conda install rstudio
+RUN python3 -m pip install --no-cache jupyterhub==$JUPYTERHUB_VERSION nbresuse jupyter-rsession-proxy
 RUN conda install -c conda-forge fenics