diff --git a/source/includes/list-mongodb-enterprise-packages.rst b/source/includes/list-mongodb-enterprise-packages.rst
index f078aa6aa3f..f7bbe9b9510 100644
--- a/source/includes/list-mongodb-enterprise-packages.rst
+++ b/source/includes/list-mongodb-enterprise-packages.rst
@@ -12,20 +12,34 @@ repository, and contains the following officially-supported packages:
     - A ``metapackage`` that automatically installs the component
       packages listed below.
 
-  * - ``{+package-name-enterprise+}-server``
-    - Contains the :binary:`~bin.mongod` daemon and associated
-      configuration and init scripts.
+  * - ``{+package-name-enterprise+}-database``
+    - A ``metapackage`` that automatically installs the component
+      packages listed below.
 
-  * - ``{+package-name-enterprise+}-mongos``
-    - Contains the :binary:`~bin.mongos` daemon.
+      .. list-table::
+         :header-rows: 1
+         :widths: 50 50
 
-  * - ``{+package-name-enterprise+}-shell``
-    - Contains the :binary:`~bin.mongo` shell.
+         * - Package Name
+           - Description
+
+         * - ``{+package-name-enterprise+}-server``
+           - Contains the :binary:`~bin.mongod` daemon and associated
+             configuration and init scripts.
+
+         * - ``{+package-name-enterprise+}-mongos``
+           - Contains the :binary:`~bin.mongos` daemon.
 
-  * - ``{+package-name-enterprise+}-cryptd``
-    - Contains the :ref:`mongocryptd <csfle-encryption-components>`
-      binary
+         * - ``{+package-name-enterprise+}-shell``
+           - Contains the :binary:`~bin.mongo` shell.
 
+         * - ``{+package-name-enterprise+}-cryptd``
+           - Contains the :ref:`mongocryptd <csfle-encryption-components>`
+             binary
+
+  * - ``mongodb-mongosh``
+    - Contains the :mongosh:`mongosh </>` shell.
+ 
   * - ``{+package-name-enterprise+}-tools``
     - A ``metapackage`` that automatically installs the component
       packages listed below:
@@ -56,4 +70,3 @@ repository, and contains the following officially-supported packages:
              - :binary:`~bin.mongokerberos`
              - :ref:`install-compass` script
              - ``mongodecrypt`` binary
-
diff --git a/source/includes/list-mongodb-org-packages.rst b/source/includes/list-mongodb-org-packages.rst
index 4c580aebb4a..feeb1f79b8c 100644
--- a/source/includes/list-mongodb-org-packages.rst
+++ b/source/includes/list-mongodb-org-packages.rst
@@ -15,20 +15,33 @@ repository, and contains the following officially-supported packages:
     - A ``metapackage`` that automatically installs the component
       packages listed below.
 
-  * - ``{+package-name-org+}-server``
+  * - ``{+package-name-org+}-database``
+    - A ``metapackage`` that automatically installs the component
+      packages listed below.
+
+      .. list-table::
+         :header-rows: 1
+         :widths: 50 50
+
+         * - Package Name
+           - Description
+
+         * - ``{+package-name-org+}-server``
+           - Contains the :binary:`~bin.mongod` daemon, associated init
+             script, and a :ref:`configuration file
+             <conf-file>` (``/etc/mongod.conf``). You
+             can use the initialization script to start :binary:`~bin.mongod`
+             with the configuration file. For details, see the "Run MongoDB
+             Community Edition" section, above.
 
-    - Contains the :binary:`~bin.mongod` daemon, associated init
-      script, and a :ref:`configuration file
-      <conf-file>` (``/etc/mongod.conf``). You
-      can use the initialization script to start :binary:`~bin.mongod`
-      with the configuration file. For details, see the "Run MongoDB
-      Community Edition" section, above.
+         * - ``{+package-name-org+}-mongos``
+           - Contains the :binary:`~bin.mongos` daemon.
 
-  * - ``{+package-name-org+}-mongos``
-    - Contains the :binary:`~bin.mongos` daemon.
+         * - ``{+package-name-org+}-shell``
+           - Contains the legacy :binary:`~bin.mongo` shell.
 
-  * - ``{+package-name-org+}-shell``
-    - Contains the :binary:`~bin.mongo` shell.
+  * - ``mongodb-mongosh``
+    - Contains the :mongosh:`mongosh </>` shell.
 
   * - ``{+package-name-org+}-tools``
     - A ``metapackage`` that automatically installs the component
diff --git a/source/includes/release-pinning.yaml b/source/includes/release-pinning.yaml
index ee278b72865..33c0079965b 100644
--- a/source/includes/release-pinning.yaml
+++ b/source/includes/release-pinning.yaml
@@ -1,42 +1,42 @@
 ref: pin-repo-to-version-yum
 language: 'sh'
 code: |
-  sudo yum install -y {+package-name-org+}-{+release+} {+package-name-org+}-server-{+release+} {+package-name-org+}-shell-{+release+} {+package-name-org+}-mongos-{+release+} {+package-name-org+}-tools-{+release+}
+  sudo yum install -y {+package-name-org+}-{+release+} {+package-name-org+}-database-{+release+} {+package-name-org+}-server-{+release+} {+package-name-org+}-shell-{+release+} {+package-name-org+}-mongos-{+release+} {+package-name-org+}-tools-{+release+}
 ---
 ref: pin-repo-to-version-yum-enterprise
 language: 'sh'
 code: |
-  sudo yum install -y {+package-name-enterprise+}-{+release+} {+package-name-enterprise+}-server-{+release+} {+package-name-enterprise+}-shell-{+release+} {+package-name-enterprise+}-mongos-{+release+} {+package-name-enterprise+}-tools-{+release+}
+  sudo yum install -y {+package-name-enterprise+}-{+release+} {+package-name-enterprise+}-database-{+release+} {+package-name-enterprise+}-server-{+release+} {+package-name-enterprise+}-shell-{+release+} {+package-name-enterprise+}-mongos-{+release+} {+package-name-enterprise+}-tools-{+release+}
 ---
 ref: pin-repo-to-version-deb
 language: 'sh'
 code: |
-  sudo apt-get install -y {+package-name-org+}={+release+} {+package-name-org+}-server={+release+} {+package-name-org+}-shell={+release+} {+package-name-org+}-mongos={+release+} {+package-name-org+}-tools={+release+}
+  sudo apt-get install -y {+package-name-org+}={+release+} {+package-name-org+}-database={+release+} {+package-name-org+}-server={+release+} {+package-name-org+}-shell={+release+} {+package-name-org+}-mongos={+release+} {+package-name-org+}-tools={+release+}
 ---
 ref: pin-repo-to-version-deb-enterprise
 language: 'sh'
 code: |
-  sudo apt-get install -y {+package-name-enterprise+}={+release+} {+package-name-enterprise+}-server={+release+} {+package-name-enterprise+}-shell={+release+} {+package-name-enterprise+}-mongos={+release+} {+package-name-enterprise+}-tools={+release+}
+  sudo apt-get install -y {+package-name-enterprise+}={+release+} {+package-name-org+}-database={+release+} {+package-name-enterprise+}-server={+release+} {+package-name-enterprise+}-shell={+release+} {+package-name-enterprise+}-mongos={+release+} {+package-name-enterprise+}-tools={+release+}
 ---
 ref: pin-repo-suse
 language: 'sh'
 code: |
-  sudo zypper install {+package-name-org+}-{+release+} {+package-name-org+}-server-{+release+} {+package-name-org+}-shell-{+release+} {+package-name-org+}-mongos-{+release+} {+package-name-org+}-tools-{+release+}
+  sudo zypper install {+package-name-org+}-{+release+} {+package-name-org+}-database-{+release+} {+package-name-org+}-server-{+release+} {+package-name-org+}-shell-{+release+} {+package-name-org+}-mongos-{+release+} {+package-name-org+}-tools-{+release+}
 ---
 ref: pin-repo-suse-enterprise
 language: 'sh'
 code: |
-  sudo zypper install {+package-name-enterprise+}-{+release+} {+package-name-enterprise+}-server-{+release+} {+package-name-enterprise+}-shell-{+release+} {+package-name-enterprise+}-mongos-{+release+} {+package-name-enterprise+}-tools-{+release+}
+  sudo zypper install {+package-name-enterprise+}-{+release+} {+package-name-enterprise+}-database-{+release+} {+package-name-enterprise+}-server-{+release+} {+package-name-enterprise+}-shell-{+release+} {+package-name-enterprise+}-mongos-{+release+} {+package-name-enterprise+}-tools-{+release+}
 ---
 ref: pin-repo-suse-lock
 language: 'sh'
 code: |
-  sudo zypper addlock {+package-name-org+}-{+release+} {+package-name-org+}-server-{+release+} {+package-name-org+}-shell-{+release+} {+package-name-org+}-mongos-{+release+} {+package-name-org+}-tools-{+release+}
+  sudo zypper addlock {+package-name-org+}-{+release+} {+package-name-org+}-database-{+release+} {+package-name-org+}-server-{+release+} {+package-name-org+}-shell-{+release+} {+package-name-org+}-mongos-{+release+} {+package-name-org+}-tools-{+release+}
 ---
 ref: pin-repo-suse-lock-enterprise
 language: 'sh'
 code: |
-  sudo zypper addlock {+package-name-enterprise+}-{+release+} {+package-name-enterprise+}-server-{+release+} {+package-name-enterprise+}-shell-{+release+} {+package-name-enterprise+}-mongos-{+release+} {+package-name-enterprise+}-tools-{+release+}
+  sudo zypper addlock {+package-name-enterprise+}-{+release+} {+package-name-enterprise+}-database-{+release+} {+package-name-enterprise+}-server-{+release+} {+package-name-enterprise+}-shell-{+release+} {+package-name-enterprise+}-mongos-{+release+} {+package-name-enterprise+}-tools-{+release+}
 ---
 ref: pin-version-intro
 pre: |
diff --git a/source/includes/steps-install-mongodb-enterprise-on-red-hat.yaml b/source/includes/steps-install-mongodb-enterprise-on-red-hat.yaml
index 0cdda51dc17..d6c62b5d8e6 100644
--- a/source/includes/steps-install-mongodb-enterprise-on-red-hat.yaml
+++ b/source/includes/steps-install-mongodb-enterprise-on-red-hat.yaml
@@ -69,5 +69,5 @@ action:
     language: sh
     copyable: true
     code: |
-      exclude=mongodb-enterprise,mongodb-enterprise-server,mongodb-enterprise-shell,mongodb-enterprise-mongos,mongodb-enterprise-tools
+      exclude=mongodb-enterprise,mongodb-enterprise-database,mongodb-enterprise-server,mongodb-enterprise-shell,mongodb-enterprise-mongos,mongodb-enterprise-tools
 ...
diff --git a/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml b/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml
index f0bd8bc917a..9703719e9a9 100644
--- a/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml
+++ b/source/includes/steps-install-mongodb-enterprise-on-ubuntu.yaml
@@ -94,6 +94,7 @@ action:
     code: |
       echo "{+package-name-enterprise+} hold" | sudo dpkg --set-selections
       echo "{+package-name-enterprise+}-server hold" | sudo dpkg --set-selections
+      echo "{+package-name-enterprise+}-database hold" | sudo dpkg --set-selections
       echo "{+package-name-enterprise+}-shell hold" | sudo dpkg --set-selections
       echo "{+package-name-enterprise+}-mongos hold" | sudo dpkg --set-selections
       echo "{+package-name-enterprise+}-tools hold" | sudo dpkg --set-selections
diff --git a/source/includes/steps-install-mongodb-on-red-hat.yaml b/source/includes/steps-install-mongodb-on-red-hat.yaml
index 903f42dde49..682703d0a58 100644
--- a/source/includes/steps-install-mongodb-on-red-hat.yaml
+++ b/source/includes/steps-install-mongodb-on-red-hat.yaml
@@ -57,5 +57,5 @@ action:
       the following ``exclude`` directive to your ``/etc/yum.conf`` file:
     language: ini
     code: |
-      exclude=mongodb-org,mongodb-org-server,mongodb-org-shell,mongodb-org-mongos,mongodb-org-tools
+      exclude=mongodb-org,mongodb-org-database,mongodb-org-server,mongodb-org-shell,mongodb-org-mongos,mongodb-org-tools
 ...
diff --git a/source/includes/steps-install-mongodb-on-ubuntu.yaml b/source/includes/steps-install-mongodb-on-ubuntu.yaml
index a63add3ee06..44df87e36d4 100644
--- a/source/includes/steps-install-mongodb-on-ubuntu.yaml
+++ b/source/includes/steps-install-mongodb-on-ubuntu.yaml
@@ -142,6 +142,7 @@ content: |
    .. code-block:: bash
 
       echo "{+package-name-org+} hold" | sudo dpkg --set-selections
+      echo "{+package-name-org+}-database hold" | sudo dpkg --set-selections
       echo "{+package-name-org+}-server hold" | sudo dpkg --set-selections
       echo "{+package-name-org+}-shell hold" | sudo dpkg --set-selections
       echo "{+package-name-org+}-mongos hold" | sudo dpkg --set-selections