diff --git a/R-minimal/.gitlab-ci.yml b/R-minimal/.gitlab-ci.yml
index 1b8d47b..910df3b 100644
--- a/R-minimal/.gitlab-ci.yml
+++ b/R-minimal/.gitlab-ci.yml
@@ -1,21 +1,17 @@
-# renku: v1.dev20180723
-
 variables:
   GIT_STRATEGY: fetch
   GIT_SSL_NO_VERIFY: "true"
   GIT_LFS_SKIP_SMUDGE: 1
 
 stages:
   - build
 
 image_build:
   stage: build
   image: docker:stable
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN http://$CI_REGISTRY
-  script:
-    - CI_COMMIT_SHA_7=$(echo $CI_COMMIT_SHA | cut -c1-7)
-    - docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 .
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7
-  tags:
-    - image-build
+  script: |
+    CI_COMMIT_SHA_7=$(echo $CI_COMMIT_SHA | cut -c1-7)
+    docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 .
+    docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7
diff --git a/R-minimal/Dockerfile b/R-minimal/Dockerfile
index e08863d..329507f 100644
--- a/R-minimal/Dockerfile
+++ b/R-minimal/Dockerfile
@@ -1,25 +1,37 @@
-FROM renku/renkulab-r:4.0.0-renku0.10.4-0.6.3
-# see https://github.com/SwissDataScienceCenter/renkulab-docker
-# to swap this image for the latest version available
+# For finding latest versions of the base image see
+# https://github.com/SwissDataScienceCenter/renkulab-docker
+ARG RENKU_BASE_IMAGE=renku/renkulab-r:4.0.0-d2d0b9e
+FROM ${RENKU_BASE_IMAGE}
+
+# RENKU_VERSION determines the version of the renku CLI
+# that will be used in this image. To find the latest version,
+# visit https://pypi.org/project/renku/#history.
+
+ARG RENKU_VERSION=0.11.1
 
 # Uncomment and adapt if code is to be included in the image
 # COPY src /code/src
 
 # Uncomment and adapt if your R or python packages require extra linux (ubuntu) software
 # e.g. the following installs apt-utils and vim; each pkg on its own line, all lines
 # except for the last end with backslash '\' to continue the RUN line
 #
 # USER root
 # RUN apt-get update && \
 #    apt-get install -y --no-install-recommends \
 #    apt-utils \
 #    vim
 # USER ${NB_USER}
 
 # install the R dependencies
 COPY install.R /tmp/
 RUN R -f /tmp/install.R
 
 # install the python dependencies
 COPY requirements.txt /tmp/
 RUN pip3 install -r /tmp/requirements.txt
+
+########################################################
+# Do not edit this section and do not add anything below
+RUN pipx install --force renku==${RENKU_VERSION}
+########################################################
diff --git a/minimal/.gitignore b/minimal/.gitignore
index 19c422a..63a848e 100644
--- a/minimal/.gitignore
+++ b/minimal/.gitignore
@@ -1,4 +1,7 @@
 # Renku
 .renku.lock
 .renku/tmp
 .renku/cache
+
+# JupyterLab
+.ipynb_checkpoints
diff --git a/minimal/.gitlab-ci.yml b/minimal/.gitlab-ci.yml
index 1b8d47b..910df3b 100644
--- a/minimal/.gitlab-ci.yml
+++ b/minimal/.gitlab-ci.yml
@@ -1,21 +1,17 @@
-# renku: v1.dev20180723
-
 variables:
   GIT_STRATEGY: fetch
   GIT_SSL_NO_VERIFY: "true"
   GIT_LFS_SKIP_SMUDGE: 1
 
 stages:
   - build
 
 image_build:
   stage: build
   image: docker:stable
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN http://$CI_REGISTRY
-  script:
-    - CI_COMMIT_SHA_7=$(echo $CI_COMMIT_SHA | cut -c1-7)
-    - docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 .
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7
-  tags:
-    - image-build
+  script: |
+    CI_COMMIT_SHA_7=$(echo $CI_COMMIT_SHA | cut -c1-7)
+    docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 .
+    docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index 77a7ee3..f5da0f8 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -1,29 +1,41 @@
-FROM renku/renkulab-py:3.7-renku0.10.4-0.6.3
-# see https://github.com/SwissDataScienceCenter/renkulab-docker
-# to swap this image for the latest version available
+# For finding latest versions of the base image see
+# https://github.com/SwissDataScienceCenter/renkulab-docker
+ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.7-d2d0b9e
+FROM ${RENKU_BASE_IMAGE}
+
+# RENKU_VERSION determines the version of the renku CLI
+# that will be used in this image. To find the latest version,
+# visit https://pypi.org/project/renku/#history.
+
+ARG RENKU_VERSION=0.11.1
 
 # Uncomment and adapt if code is to be included in the image
 # COPY src /code/src
 
 # Uncomment and adapt if your R or python packages require extra linux (ubuntu) software
 # e.g. the following installs apt-utils and vim; each pkg on its own line, all lines
 # except for the last end with backslash '\' to continue the RUN line
 #
 # USER root
 # RUN apt-get update && \
 #    apt-get install -y --no-install-recommends \
 #    apt-utils \
 #    vim
 # USER ${NB_USER}
 
 # Uncomment and adapt if you want to automatically install
 # python dependencies when the Docker image builds (pip or conda)
 # Note: you will need to add a (pip) requirements.txt file
 #       AND a (conda) environment.yml file for the below code to run,
 #       but you can remove one or the other.
 #
 # COPY requirements.txt environment.yml /tmp/
 # RUN conda env update -q -f /tmp/environment.yml && \
 #    /opt/conda/bin/pip install -r /tmp/requirements.txt && \
 #    conda clean -y --all && \
 #    conda env export -n "root"
+
+########################################################
+# Do not edit this section and do not add anything below
+RUN pipx install --force renku==${RENKU_VERSION}
+########################################################
diff --git a/python-minimal/.gitlab-ci.yml b/python-minimal/.gitlab-ci.yml
index 1b8d47b..910df3b 100644
--- a/python-minimal/.gitlab-ci.yml
+++ b/python-minimal/.gitlab-ci.yml
@@ -1,21 +1,17 @@
-# renku: v1.dev20180723
-
 variables:
   GIT_STRATEGY: fetch
   GIT_SSL_NO_VERIFY: "true"
   GIT_LFS_SKIP_SMUDGE: 1
 
 stages:
   - build
 
 image_build:
   stage: build
   image: docker:stable
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN http://$CI_REGISTRY
-  script:
-    - CI_COMMIT_SHA_7=$(echo $CI_COMMIT_SHA | cut -c1-7)
-    - docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 .
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7
-  tags:
-    - image-build
+  script: |
+    CI_COMMIT_SHA_7=$(echo $CI_COMMIT_SHA | cut -c1-7)
+    docker build --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7 .
+    docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7
diff --git a/python-minimal/Dockerfile b/python-minimal/Dockerfile
index bef6289..4d0e262 100644
--- a/python-minimal/Dockerfile
+++ b/python-minimal/Dockerfile
@@ -1,24 +1,36 @@
-FROM renku/renkulab-py:3.7-renku0.10.4-0.6.3
-# see https://github.com/SwissDataScienceCenter/renkulab-docker
-# to swap this image for the latest version available
+# For finding latest versions of the base image see
+# https://github.com/SwissDataScienceCenter/renkulab-docker
+ARG RENKU_BASE_IMAGE=renku/renkulab-py:3.7-d2d0b9e
+FROM ${RENKU_BASE_IMAGE}
+
+# RENKU_VERSION determines the version of the renku CLI
+# that will be used in this image. To find the latest version,
+# visit https://pypi.org/project/renku/#history.
+
+ARG RENKU_VERSION=0.11.1
 
 # Uncomment and adapt if code is to be included in the image
 # COPY src /code/src
 
 # Uncomment and adapt if your R or python packages require extra linux (ubuntu) software
 # e.g. the following installs apt-utils and vim; each pkg on its own line, all lines
 # except for the last end with backslash '\' to continue the RUN line
 #
 # USER root
 # RUN apt-get update && \
 #    apt-get install -y --no-install-recommends \
 #    apt-utils \
 #    vim
 # USER ${NB_USER}
 
 # install the python dependencies
 COPY requirements.txt environment.yml /tmp/
 RUN conda env update -q -f /tmp/environment.yml && \
     /opt/conda/bin/pip install -r /tmp/requirements.txt && \
     conda clean -y --all && \
     conda env export -n "root"
+
+########################################################
+# Do not edit this section and do not add anything below
+RUN pipx install --force renku==${RENKU_VERSION}
+########################################################