diff --git a/dev-project/docker-compose.yml b/dev-project/docker-compose.yml
index 51b33c961..9a96a1567 100644
--- a/dev-project/docker-compose.yml
+++ b/dev-project/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   ### Primary container with PipelineWise CLI
   pipelinewise:
-    image: python:3.8-slim-buster
+    image: ubuntu:20.04
     container_name: pipelinewise_dev
     working_dir: /opt/pipelinewise
     entrypoint: /opt/pipelinewise/dev-project/entrypoint.sh
diff --git a/dev-project/entrypoint.sh b/dev-project/entrypoint.sh
index 32e3be878..b7fd4fa6a 100755
--- a/dev-project/entrypoint.sh
+++ b/dev-project/entrypoint.sh
@@ -3,6 +3,9 @@
 set -e
 
 apt update
+
+DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
+
 apt install -y --no-install-recommends \
   wget \
   gnupg \
@@ -12,18 +15,21 @@ apt install -y --no-install-recommends \
   libaio1 \
   mariadb-client \
   mbuffer \
-  postgresql-client
+  postgresql-client \
+  python3 \
+  python3-pip \
+  python3-venv
 
 apt upgrade -y
 # rm -rf /var/lib/apt/lists/* \
 
 # Do a bunch of Mongo things
-wget -q https://downloads.mongodb.com/compass/mongodb-mongosh_2.2.6_arm64.deb
-apt install ./mongodb-mongosh_2.2.6_arm64.deb
-rm -f mongodb-mongosh_2.2.6_arm64.deb
-wget -q https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2004-arm64-100.9.4.deb
-apt install ./mongodb-database-tools-ubuntu2004-arm64-100.9.4.deb
-rm -f mongodb-database-tools-ubuntu2004-arm64-100.9.4.deb
+wget -q --no-check-certificate https://downloads.mongodb.com/compass/mongodb-mongosh_2.2.9_arm64.deb
+apt install ./mongodb-mongosh_2.2.9_arm64.deb
+rm -f mongodb-mongosh_2.2.9_arm64.deb
+wget -q --no-check-certificate https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2004-arm64-100.9.5.deb
+apt install ./mongodb-database-tools-ubuntu2004-arm64-100.9.5.deb
+rm -f mongodb-database-tools-ubuntu2004-arm64-100.9.5.deb
 dev-project/mongo/initiate-replica-set.sh
 
 # Install Oracle Instant Client required for tap-oracle