diff --git a/cookbook/configuration/index.rst b/cookbook/configuration/index.rst
index c53f6e0a6bd..11838c6fa38 100644
--- a/cookbook/configuration/index.rst
+++ b/cookbook/configuration/index.rst
@@ -12,4 +12,3 @@ Configuration
     apache_router
     web_server_configuration
     configuration_organization
-    mongodb_session_storage
\ No newline at end of file
diff --git a/cookbook/doctrine/index.rst b/cookbook/doctrine/index.rst
index 1c9565871c5..d14ecb20536 100644
--- a/cookbook/doctrine/index.rst
+++ b/cookbook/doctrine/index.rst
@@ -15,4 +15,5 @@ Doctrine
     mapping_model_classes
     registration_form
     pdo_session_storage
+    mongodb_session_storage
     console
diff --git a/cookbook/configuration/mongodb_session_storage.rst b/cookbook/doctrine/mongodb_session_storage.rst
similarity index 100%
rename from cookbook/configuration/mongodb_session_storage.rst
rename to cookbook/doctrine/mongodb_session_storage.rst
diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
index e7e5b7e1d99..39304dd2620 100644
--- a/cookbook/map.rst.inc
+++ b/cookbook/map.rst.inc
@@ -34,11 +34,11 @@
   * :doc:`/cookbook/configuration/using_parameters_in_dic`
   * :doc:`/cookbook/configuration/front_controllers_and_kernel`
   * :doc:`/cookbook/configuration/external_parameters`
-  * :doc:`/cookbook/doctrine/pdo_session_storage`
   * :doc:`/cookbook/configuration/apache_router`
   * :doc:`/cookbook/configuration/web_server_configuration`
   * :doc:`/cookbook/configuration/configuration_organization`
-  * :doc:`/cookbook/configuration/mongodb_session_storage`
+  * (configuration) :doc:`/cookbook/doctrine/pdo_session_storage`
+  * (configuration) :doc:`/cookbook/doctrine/mongodb_session_storage`
 
 * :doc:`/cookbook/console/index`
 
@@ -77,8 +77,9 @@
   * :doc:`/cookbook/doctrine/resolve_target_entity`
   * :doc:`/cookbook/doctrine/mapping_model_classes`
   * :doc:`/cookbook/doctrine/registration_form`
+  * :doc:`/cookbook/doctrine/pdo_session_storage`
+  * :doc:`/cookbook/doctrine/mongodb_session_storage`
   * :doc:`/cookbook/doctrine/console`
-  * (configuration) :doc:`/cookbook/doctrine/pdo_session_storage`
 
 * :doc:`/cookbook/email/index`
 
@@ -94,7 +95,7 @@
   * :doc:`/cookbook/event_dispatcher/before_after_filters`
   * :doc:`/cookbook/event_dispatcher/class_extension`
   * :doc:`/cookbook/event_dispatcher/method_behavior`
-  * (service container) :doc:`/cookbook/event_dispatcher/event_listener`
+  * :doc:`/cookbook/event_dispatcher/event_listener`
 
 * :doc:`/cookbook/form/index`
 
@@ -179,9 +180,9 @@
 
 * :doc:`/cookbook/service_container/index`
 
-  * :doc:`/cookbook/event_dispatcher/event_listener`
   * :doc:`/cookbook/service_container/scopes`
   * :doc:`/cookbook/service_container/compiler_passes`
+  * (Event Dispatcher) :doc:`/cookbook/event_dispatcher/event_listener`
 
 * :doc:`/cookbook/session/index`
 
@@ -189,8 +190,8 @@
   * :doc:`/cookbook/session/locale_sticky_session`
   * :doc:`/cookbook/session/sessions_directory`
   * :doc:`/cookbook/session/php_bridge`
-  * (configuration) :doc:`/cookbook/doctrine/pdo_session_storage`
-  * (configuration) :doc:`/cookbook/configuration/mongodb_session_storage`
+  * (doctrine) :doc:`/cookbook/doctrine/pdo_session_storage`
+  * (doctrine) :doc:`/cookbook/doctrine/mongodb_session_storage`
   * :doc:`/cookbook/session/avoid_session_start`
 
 * **PSR-7**
diff --git a/cookbook/session/sessions_directory.rst b/cookbook/session/sessions_directory.rst
index 13414826dc0..3b62b62cb95 100644
--- a/cookbook/session/sessions_directory.rst
+++ b/cookbook/session/sessions_directory.rst
@@ -95,7 +95,7 @@ that your current sessions aren't lost when you clear Symfony's cache.
     :doc:`/components/http_foundation/session_configuration` for a
     discussion of session save handlers. There are also entries in the cookbook
     about storing sessions in a :doc:`relational database </cookbook/doctrine/pdo_session_storage>`
-    or a :doc:`NoSQL database </cookbook/configuration/mongodb_session_storage>`.
+    or a :doc:`NoSQL database </cookbook/doctrine/mongodb_session_storage>`.
 
 To change the directory in which Symfony saves session data, you only need
 change the framework configuration. In this example, you will change the
diff --git a/redirection_map b/redirection_map
index d98d5e697e3..2abbaf55500 100644
--- a/redirection_map
+++ b/redirection_map
@@ -27,4 +27,5 @@
 /cookbook/upgrading /cookbook/upgrade/index
 /cookbook/security/voters_data_permission /cookbook/security/voters
 /cookbook/configuration/pdo_session_storage /cookbook/doctrine/pdo_session_storage
+/cookbook/configuration/mongodb_session_storage /cookbook/doctrine/mongodb_session_storage
 /cookbook/service_container/event_listener /cookbook/event_dispatcher/event_listener