diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 58e27c79a..d41ba7f26 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -2,7 +2,7 @@
 # Check https://confluence.atlassian.com/x/5Q4SMw for more examples.
 # -----
 # Our custom docker image from Docker Hub as the build environment.
-image: dellaert/ubuntu-boost-tbb-eigen3:xenial
+image: dellaert/ubuntu-boost-tbb-eigen3:bionic
 
 pipelines:
   default:
@@ -11,5 +11,5 @@ pipelines:
           - mkdir build
           - cd build
           - cmake -DGTSAM_USE_SYSTEM_EIGEN=ON -DGTSAM_USE_EIGEN_MKL=OFF .. 
-          - make -j4
-          - make -j4 check
\ No newline at end of file
+          - make -j2
+          - make -j2 check
\ No newline at end of file
diff --git a/docker/ubuntu-boost-tbb-eigen3/Dockerfile b/docker/ubuntu-boost-tbb-eigen3/Dockerfile
index dda4fbbaf..33aa1ab96 100644
--- a/docker/ubuntu-boost-tbb-eigen3/Dockerfile
+++ b/docker/ubuntu-boost-tbb-eigen3/Dockerfile
@@ -1,5 +1,5 @@
 # Get the base Ubuntu image from Docker Hub
-FROM ubuntu:xenial
+FROM ubuntu:bionic
 
 # Update apps on the base image
 RUN apt-get -y update && apt-get install -y