diff --git a/scripts/ynh_mongo_db__2 b/scripts/ynh_mongo_db__2
index e86fb4b..af675f4 100644
--- a/scripts/ynh_mongo_db__2
+++ b/scripts/ynh_mongo_db__2
@@ -314,7 +314,7 @@ ynh_install_mongo() {
 
 	ynh_print_info --message="Installing MongoDB Community Edition ..."
 	local mongo_debian_release=$(ynh_get_debian_release)
-  local mongo_packages="mongodb-org"
+  local mongo_packages="mongodb-org-server mongodb-database-tools mongodb-org-shell"
 
 	if [[ $(cat /proc/cpuinfo) != *"avx"* && "$mongo_version" != "4.4" ]]; then
     ynh_print_warn --message="Installing Mongo 4.4 as $mongo_version is not compatible with your cpu (see https://docs.mongodb.com/manual/administration/production-notes/#x86_64)."
@@ -322,8 +322,8 @@ ynh_install_mongo() {
   fi
   if [[ "$mongo_version" == "4.4" ]]; then
     ynh_print_warn --message="Switching to special package install for Mongo 4.4 to see if that works."
-    #mongo_debian_release=buster
-    mongo_packages="mongodb-org-server mongodb-org-tools mongodb-mongosh-shared-openssl11"
+    mongo_debian_release=buster
+    mongo_packages="mongodb-org-server mongodb-database-tools mongodb-mongosh-shared-openssl11"
   fi
 
 	ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian $mongo_debian_release/mongodb-org/$mongo_version main" --package="$mongo_packages" --key="https://www.mongodb.org/static/pgp/server-$mongo_version.asc"