diff --git a/docker/_base/build.pkr.hcl b/docker/_base/build.pkr.hcl
index f90b115..8e32375 100644
--- a/docker/_base/build.pkr.hcl
+++ b/docker/_base/build.pkr.hcl
@@ -2,7 +2,7 @@
 source "docker" "autogenerated_1" {
   changes = ["VOLUME /data", "WORKDIR /data", "ENTRYPOINT /bin/bash"]
   commit  = true
-  image   = "buildpack-deps:buster"
+  image   = "buildpack-deps:bullseye"
   pull    = true
 }
 
diff --git a/roles/prepare/vars/main.yml b/roles/prepare/vars/main.yml
index 46a0294..e37982f 100644
--- a/roles/prepare/vars/main.yml
+++ b/roles/prepare/vars/main.yml
@@ -31,7 +31,8 @@ common_packages:
   - "postgresql-client"
   # Blocked by https://github.com/dbcli/mssql-cli/pull/505
   #- "mssql-tools"
-  - "mongo-tools"
+  #- "mongocli"
+  #- "mongodb-database-tools"
 snap_packages:
   - jq
   - yq
@@ -41,7 +42,7 @@ apt_keys:
   - "https://packages.microsoft.com/keys/microsoft.asc"
 apt_repos:
   - "deb https://apt.kubernetes.io/ kubernetes-xenial main"
-  - "deb http://packages.cloud.google.com/apt cloud-sdk main"
+  - "deb https://packages.cloud.google.com/apt cloud-sdk main"
   - "deb https://packages.microsoft.com/debian/10/prod buster main"
 helm_plugins:
   - "https://github.com/databus23/helm-diff"