diff --git a/Makefile b/Makefile
index b5089498..37e263e8 100644
--- a/Makefile
+++ b/Makefile
@@ -62,26 +62,23 @@ pull:
 		docker pull $(DOCKER_PREFIX)$$ext:$(DOCKER_LABEL) ; \
 	done
 
-r: py3.7
+r: py
 	docker build docker/r \
-		--build-arg RENKU_PIP_SPEC=$(RENKU_PIP_SPEC) \
 		--build-arg RENKU_BASE=renku/renkulab-py3.7:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG) \
 		--build-arg RVERSION=$(RVERSION) \
 		-t $(DOCKER_PREFIX)-r:$(DOCKER_LABEL)$(RENKU_TAG)$(R_TAG) && \
 	docker tag $(DOCKER_PREFIX)-r:$(DOCKER_LABEL)$(RENKU_TAG)$(R_TAG) $(DOCKER_PREFIX)-r:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG)$(R_TAG)
 
-bioc: py3.7
+bioc: py
 	docker build docker/bioc \
-		--build-arg RENKU_PIP_SPEC=$(RENKU_PIP_SPEC) \
 		--build-arg RENKU_BASE=renku/renkulab-py3.7:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG) \
 		--build-arg RELEASE=$(BIOC_VERSION) \
 		-t $(DOCKER_PREFIX)-bioc:$(DOCKER_LABEL)$(RENKU_TAG)$(BIOC_TAG) && \
 	docker tag $(DOCKER_PREFIX)-bioc:$(DOCKER_LABEL)$(RENKU_TAG)$(BIOC_TAG) $(DOCKER_PREFIX)-bioc:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG)$(BIOC_TAG)
 
 
-py3.7:
+py:
 	cd docker/$@ && \
 	docker build \
-		--build-arg RENKU_PIP_SPEC=${RENKU_PIP_SPEC} \
 		-t $(DOCKER_PREFIX)-$@:$(DOCKER_LABEL)$(RENKU_TAG) . && \
 	docker tag $(DOCKER_PREFIX)-$@:$(DOCKER_LABEL)$(RENKU_TAG) $(DOCKER_PREFIX)-$@:$(GIT_MASTER_HEAD_SHA)$(RENKU_TAG)
diff --git a/docker/py/requirements.txt b/docker/py/requirements.txt
index 46392018..93844291 100644
--- a/docker/py/requirements.txt
+++ b/docker/py/requirements.txt
@@ -1,7 +1,10 @@
-papermill==2.1.3
-requests>=2.20.0
 jupyterhub==1.1.0
-nbresuse==0.3.6
 jupyterlab-git==0.20.0
+jupyterlab_server~=1.0.0
+jupyter-server-proxy==1.5.0
+nbresuse==0.3.6
+nbclient<0.5.1
+papermill==2.1.3
 pipx>=0.15.0.0
 powerline-shell==0.7.0
+requests>=2.20.0
diff --git a/scripts/install-vscode.sh b/scripts/install-vscode.sh
new file mode 100644
index 00000000..23f4c755
--- /dev/null
+++ b/scripts/install-vscode.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+VSCODE_VERSION=${VSCODE_VERSION:="3.6.2"}
+
+# code-server installation
+wget https://github.com/cdr/code-server/releases/download/v${VSCODE_VERSION}/code-server_3.6.2_amd64.deb
+dpkg -i ./code-server*.deb
+rm code-server_3.6.2_amd64.deb
+apt-get clean
+code-server --install-extension ms-python.python
+chown -R 1000:1000 /home/${NB_USER}/.local/share
+
+# Jupyter support
+pip install git+https://github.com/betatim/vscode-binder
+jupyter serverextension enable --py jupyter_server_proxy && \
+jupyter labextension install --no-build @jupyterlab/server-proxy