diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70abb020ee..ebf12c2f19 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,8 +71,8 @@ jobs:
             MONGODB_TOPOLOGY: replicaset
             MONGODB_STORAGE_ENGINE: wiredTiger
             NODE_VERSION: 14.16.0
-          - name: Mongo 3.6, Standalone, MMAPv1
-            MONGODB_VERSION: 3.6.23
+          - name: Mongo 4.0, Standalone, MMAPv1
+            MONGODB_VERSION: 4.0.23
             MONGODB_TOPOLOGY: standalone
             MONGODB_STORAGE_ENGINE: mmapv1
             NODE_VERSION: 14.16.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe4720b1e5..d94ba8ece0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -96,6 +96,7 @@ ___
 - EXPERIMENTAL: Added new page router with placeholder rendering and localization of custom and feature pages such as password reset and email verification (Manuel Trezza) [#6891](https://github.com/parse-community/parse-server/issues/6891)
 - EXPERIMENTAL: Added custom routes to easily customize flows for password reset, email verification or build entirely new flows (Manuel Trezza) [#7231](https://github.com/parse-community/parse-server/issues/7231)
 - Remove support for Node 10 which has reached its End-of-Life support date (Manuel Trezza) [#7314](https://github.com/parse-community/parse-server/pull/7314)
+- Remove support for MongoDB 3.6 which has reached its End-of-Life support date (Manuel Trezza) [#7315](https://github.com/parse-community/parse-server/pull/7315)
 ### Other Changes
 - Fix error when a not yet inserted job is updated (Antonio Davi Macedo Coelho de Castro) [#7196](https://github.com/parse-community/parse-server/pull/7196)
 - request.context for afterFind triggers (dblythy) [#7078](https://github.com/parse-community/parse-server/pull/7078)
diff --git a/README.md b/README.md
index 8016b2d7fc..ddd7e0f2fe 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
     <a href="https://community.parseplatform.org/"><img alt="Join the conversation" src="https://img.shields.io/discourse/https/community.parseplatform.org/topics.svg"></a>
     <a href="https://snyk.io/test/github/parse-community/parse-server"><img alt="Snyk badge" src="https://snyk.io/test/github/parse-community/parse-server/badge.svg"></a>
     <a href="https://nodejs.org/"><img alt="Node.js 12,14,15" src="https://img.shields.io/badge/nodejs-12,_14,_15-green.svg?logo=node.js&style=flat"></a>
-    <a href="https://www.mongodb.com/"><img alt="MongoDB 3.6,4.0,4.2,4.4" src="https://img.shields.io/badge/mongodb-3.6,_4.0,_4.2,_4.4-green.svg?logo=mongodb&style=flat"></a>
+    <a href="https://www.mongodb.com/"><img alt="MongoDB 4.0,4.2,4.4" src="https://img.shields.io/badge/mongodb-4.0,_4.2,_4.4-green.svg?logo=mongodb&style=flat"></a>
    <a href="https://www.postgresql.org"> <img alt="PostgreSQL 10,11,12,13" src="https://img.shields.io/badge/postgresql-10,_11,_12,_13-green.svg?logo=postgresql&style=flat"></a>
 </p>
 
@@ -121,7 +121,6 @@ Parse Server is continuously tested with the most recent releases of MongoDB to
 
 | Version     | Latest Patch Version | End-of-Life Date | Compatibility      |
 |-------------|----------------------|------------------|--------------------|
-| MongoDB 3.6 | 3.6.23               | April 2021       | ✅ Fully compatible |
 | MongoDB 4.0 | 4.0.23               | January 2022     | ✅ Fully compatible |
 | MongoDB 4.2 | 4.2.13               | TBD              | ✅ Fully compatible |
 | MongoDB 4.4 | 4.4.4                | TBD              | ✅ Fully compatible |
diff --git a/resources/ci/ciCheck.js b/resources/ci/ciCheck.js
index 0686931833..ed94af7a9b 100644
--- a/resources/ci/ciCheck.js
+++ b/resources/ci/ciCheck.js
@@ -33,8 +33,7 @@ async function checkMongoDbVersions() {
     releasedVersions,
     latestComponent: CiVersionCheck.versionComponents.path,
     ignoreReleasedVersions: [
-      '<3.6.0', // These versions have reached their MongoDB end-of-life support date
-      '~3.7.0', // This is a development release according to MongoDB support
+      '<4.0.0', // These versions have reached their MongoDB end-of-life support date
       '~4.1.0', // This is a development release according to MongoDB support
       '~4.3.0', // This is a development release according to MongoDB support
       '~4.7.0', // This is a development release according to MongoDB support