diff --git a/docker/Dockerfile b/docker/Dockerfile
index 71cc3e2..e45356d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,7 +20,7 @@ RUN wget http://launchpadlibrarian.net/165141962/libeigen3-dev_3.2.0-8_all.deb \
 # install jupyter
 RUN apt-get install -y gfortran build-essential python-numpy-dev \
     && pip install --upgrade pip \
-    && /usr/local/bin/pip install jupyter
+    && /usr/local/bin/pip install "notebook<5.5"
 
 # Dependencies - RPFITS
 RUN wget ftp://ftp.atnf.csiro.au/pub/software/rpfits/rpfits-2.24.tar.gz \
diff --git a/singularity/Singularity.docker b/singularity/Singularity.docker
index 428e550..d144ce7 100644
--- a/singularity/Singularity.docker
+++ b/singularity/Singularity.docker
@@ -14,6 +14,9 @@ IncludeCmd: no
     # Remove Juputer user imported from Docker
     sed -i '/jupyter/d' /etc/passwd
     sed -i '/jupyter/d' /etc/shadow
+    # In docker we use jupyter notebook 5.4, however, in Singularity we
+    # can use the most recent version
+    /usr/local/bin/pip install -U --upgrade-strategy=eager notebook
 
 %environment
   unset XDG_RUNTIME_DIR