diff --git a/dev-project/entrypoint.sh b/dev-project/entrypoint.sh
index 99ccd2f7a..509d7be6a 100755
--- a/dev-project/entrypoint.sh
+++ b/dev-project/entrypoint.sh
@@ -19,9 +19,10 @@ apt-get install -y --no-install-recommends \
   libaio1 \
   mariadb-client \
   mbuffer \
-  mongodb-database-tools \
-  mongodb-org-shell \
-  postgresql-client
+  postgresql-client \
+  mongo-tools \
+  mongocli \
+  mongodb-mongosh
 
 rm -rf /var/lib/apt/lists/* \
 
diff --git a/dev-project/mongo/init_rs.sh b/dev-project/mongo/init_rs.sh
index 23fc993e4..5f2cb5d00 100755
--- a/dev-project/mongo/init_rs.sh
+++ b/dev-project/mongo/init_rs.sh
@@ -1,6 +1,6 @@
 echo 'Initializing MongoDB ReplicaSet'
 
-mongo mongodb://$TAP_MONGODB_HOST:$TAP_MONGODB_PORT/admin?authSource=admin -u $TAP_MONGODB_ROOT_USER -p $TAP_MONGODB_ROOT_PASSWORD <<EOF
+mongosh mongodb://$TAP_MONGODB_HOST:$TAP_MONGODB_PORT/admin?authSource=admin -u $TAP_MONGODB_ROOT_USER -p $TAP_MONGODB_ROOT_PASSWORD <<EOF
   db.getName();
   let cfg = {};
   rs.initiate({
diff --git a/singer-connectors/target-postgres/requirements.txt b/singer-connectors/target-postgres/requirements.txt
index 0c0edb51e..28b0c92cc 100644
--- a/singer-connectors/target-postgres/requirements.txt
+++ b/singer-connectors/target-postgres/requirements.txt
@@ -1 +1 @@
-pipelinewise-target-postgres==2.1.1
+pipelinewise-target-postgres==2.1.2