diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index 7c709892..340536ea 100644
--- a/.github/workflows/pr-close.yml
+++ b/.github/workflows/pr-close.yml
@@ -18,8 +18,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        package: [bitnami/postgresql,bitnami/postgresql-ha,bitnami/pgpool, postgres/postgres]
-
+        package: [bitnami/postgresql, bitnami/postgresql-ha, bitnami/pgpool, mongo, postgres]
     steps:
       - uses: actions/delete-package-versions@v4
         with:
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 6cc77a14..a80a9a6c 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -19,11 +19,15 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        package: [bitnami/postgresql,bitnami/postgresql-ha, postgres/postgres]
+        package: [bitnami/postgresql, bitnami/postgresql-ha, postgres]
         tag: [12, 13, 14, 15, 16]
         include:
           - package: bitnami/pgpool
             tag: 4
+          - package: mongo
+            tag: 6
+          - package: mongo
+            tag: 7
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
diff --git a/mongo/6/Dockerfile b/mongo/6/Dockerfile
new file mode 100644
index 00000000..ed34b43a
--- /dev/null
+++ b/mongo/6/Dockerfile
@@ -0,0 +1 @@
+FROM mongo:6.0.11
diff --git a/mongo/7/Dockerfile b/mongo/7/Dockerfile
new file mode 100644
index 00000000..fed16fe9
--- /dev/null
+++ b/mongo/7/Dockerfile
@@ -0,0 +1 @@
+FROM mongo:7.0.2
diff --git a/postgres/postgres/12/Dockerfile b/postgres/12/Dockerfile
similarity index 100%
rename from postgres/postgres/12/Dockerfile
rename to postgres/12/Dockerfile
diff --git a/postgres/postgres/13/Dockerfile b/postgres/13/Dockerfile
similarity index 100%
rename from postgres/postgres/13/Dockerfile
rename to postgres/13/Dockerfile
diff --git a/postgres/postgres/14/Dockerfile b/postgres/14/Dockerfile
similarity index 100%
rename from postgres/postgres/14/Dockerfile
rename to postgres/14/Dockerfile
diff --git a/postgres/postgres/15/Dockerfile b/postgres/15/Dockerfile
similarity index 100%
rename from postgres/postgres/15/Dockerfile
rename to postgres/15/Dockerfile
diff --git a/postgres/postgres/16/Dockerfile b/postgres/16/Dockerfile
similarity index 100%
rename from postgres/postgres/16/Dockerfile
rename to postgres/16/Dockerfile