diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index ccdc31d..5ac3bc4 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -1,10 +1,16 @@
-name: CI
+name: Build & run notebooks
 
 on:
   push:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
+    inputs:
+      nipype_branch:
+        description: 'Build specific Nipype branch'
+        required: true
+        default: 'master'
 
 
 jobs:
@@ -14,11 +20,19 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: generate the Dockerfile from generate.sh
-      run: bash generate.sh
+      run: |
+        BRANCH=${{ github.event.inputs.nipype_branch }}
+        BRANCH=${BRANCH:-"master"}
+        bash generate.sh $BRANCH
     # In this step, this action saves a list of existing images,
     # the cache is created without them in the post run.
     # It also restores the cache if it exists.
-    - uses: satackey/action-docker-layer-caching@v0.0.7
+    - uses: satackey/action-docker-layer-caching@v0.0.11
+      with:
+        key: tutorial-docker-cache-{hash}
+        restore-keys: |
+          tutorial-docker-cache-
+          layer-tutorial-docker-cache-
     - name: build the image
       run: docker build . --file Dockerfile -t nipype_tutorial:latest
 
@@ -26,8 +40,12 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: satackey/action-docker-layer-caching@v0.0.7
+    - uses: satackey/action-docker-layer-caching@v0.0.11
+      with:
+        key: tutorial-docker-cache-{hash}
+        restore-keys: |
+          tutorial-docker-cache-
+          layer-tutorial-docker-cache-
     - name: run test 1
       run: docker run --rm nipype_tutorial:latest python /home/neuro/nipype_tutorial/test_notebooks.py 1
 
@@ -35,8 +53,12 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: satackey/action-docker-layer-caching@v0.0.7
+    - uses: satackey/action-docker-layer-caching@v0.0.11
+      with:
+        key: tutorial-docker-cache-{hash}
+        restore-keys: |
+          tutorial-docker-cache-
+          layer-tutorial-docker-cache-
     - name: run	test 2
       run: docker run --rm nipype_tutorial:latest python /home/neuro/nipype_tutorial/test_notebooks.py 2
 
@@ -44,7 +66,11 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: satackey/action-docker-layer-caching@v0.0.7
+    - uses: satackey/action-docker-layer-caching@v0.0.11
+      with:
+        key: tutorial-docker-cache-{hash}
+        restore-keys: |
+          tutorial-docker-cache-
+          layer-tutorial-docker-cache-
     - name: run	test 3
       run: docker run --rm nipype_tutorial:latest python /home/neuro/nipype_tutorial/test_notebooks.py 3
diff --git a/generate.sh b/generate.sh
index 3c2f44d..81ec0f1 100644
--- a/generate.sh
+++ b/generate.sh
@@ -2,6 +2,16 @@
 
 set -e
 
+NIPYPE_BRANCH=${1:-"master"}
+case $NIPYPE_BRANCH in
+  master)
+    NIPYPE_URL="https://github.com/nipy/nipype/tarball/master"
+  ;;
+  *)
+    NIPYPE_URL="git+https://github.com/nipy/nipype.git@${NIPYPE_BRANCH}"
+  ;;
+esac
+
 # Generate Dockerfile
 generate_docker() {
   docker run --rm kaczmarj/neurodocker:master generate docker \
@@ -17,7 +27,7 @@ generate_docker() {
            --miniconda \
              conda_install="python=3.8 pytest jupyter jupyterlab jupyter_contrib_nbextensions
                             traits pandas matplotlib scikit-learn scikit-image seaborn nbformat nb_conda" \
-             pip_install="https://github.com/nipy/nipype/tarball/master+%20%20%20%20%20%20%20%20%20%20%20%20%20pip_install="$NIPYPE_URL
                           pybids==0.13.1
                           nilearn datalad[full] nipy duecredit nbval niflow-nipype1-workflows" \
              create_env="neuro" \
@@ -54,9 +64,9 @@ generate_singularity() {
            --user=neuro \
            --workdir /home/neuro \
            --miniconda \
-             conda_install="python=3.7 pytest jupyter jupyterlab jupyter_contrib_nbextensions
+             conda_install="python=3.8 pytest jupyter jupyterlab jupyter_contrib_nbextensions
                             traits pandas matplotlib scikit-learn scikit-image seaborn nbformat nb_conda" \
-             pip_install="https://github.com/nipy/nipype/tarball/master+%20%20%20%20%20%20%20%20%20%20%20%20%20pip_install="$NIPYPE_URL
                           pybids==0.13.1
                           nilearn datalad[full] nipy duecredit nbval niflow-nipype1-workflows" \
              create_env="neuro" \