diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index c2a0df8cd..40d183033 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -141,6 +141,6 @@ class ServiceDatabase extends BaseModel
             str($this->databaseType())->contains('postgres') ||
             str($this->databaseType())->contains('postgis') ||
             str($this->databaseType())->contains('mariadb') ||
-            str($this->databaseType())->contains('mongodb');
+            str($this->databaseType())->contains('mongo');
     }
 }
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index de80adbef..313df34a7 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -682,8 +682,10 @@ function isDatabaseImage(?string $image = null)
         $image = str($image)->append(':latest');
     }
     $imageName = $image->before(':');
-    if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
-        return true;
+    foreach (DATABASE_DOCKER_IMAGES as $database_docker_image) {
+        if (str($imageName)->contains($database_docker_image)) {
+            return true;
+        }
     }
 
     return false;