diff --git a/doc/source/planning/kubernetes/starlingx-hardware-requirements.rst b/doc/source/planning/kubernetes/starlingx-hardware-requirements.rst
index e521b51d6..371f100ba 100755
--- a/doc/source/planning/kubernetes/starlingx-hardware-requirements.rst
+++ b/doc/source/planning/kubernetes/starlingx-hardware-requirements.rst
@@ -18,168 +18,41 @@ guaranteed.
 
 .. _starlingx-hardware-requirements-section-N10044-N10024-N10001:
 
--------------------------------------
-Controller, worker, and storage hosts
--------------------------------------
-
-.. Row alterations don't work with spans
-
-|row-alt-off|
-
-.. _starlingx-hardware-requirements-table-nvy-52x-p5:
-
-.. table:: Table 1. Hardware Requirements — |prod| Standard Configuration
-    :widths: auto
-
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Minimum Requirement                                       | Controller                                                                                                                                                                                                                                                       | Storage                                                                                      | Worker                                                                                |
-    +===========================================================+==================================================================================================================================================================================================================================================================+==============================================================================================+=======================================================================================+
-    | Minimum Qty of Servers                                    | 2 \(required\)                                                                                                                                                                                                                                                   | \(if Ceph storage used\)                                                                     | 2 ‒ 100                                                                               |
-    |                                                           |                                                                                                                                                                                                                                                                  |                                                                                              |                                                                                       |
-    |                                                           |                                                                                                                                                                                                                                                                  | 2 ‒ 8 \(for replication factor 2\)                                                           |                                                                                       |
-    |                                                           |                                                                                                                                                                                                                                                                  |                                                                                              |                                                                                       |
-    |                                                           |                                                                                                                                                                                                                                                                  | 3 ‒ 9 \(for replication factor 3\)                                                           |                                                                                       |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Minimum Processor Class                                   | Dual-CPU Intel® Xeon® E5 26xx Family \(SandyBridge\) 8 cores/socket                                                                                                                                                                                                                                                                                                                                                                                     |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Minimum Memory                                            | 64 GB                                                                                                                                                                                                                                                            | 64 GB                                                                                        | 32 GB                                                                                 |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Minimum Primary Disk \(two-disk hardware RAID suggested\) | 500 GB - SSD or NVMe                                                                                                                                                                                                                                             | 120 GB \(min. 10K RPM\)                                                                                                                                                              |
-    |                                                           |                                                                                                                                                                                                                                                                  |                                                                                                                                                                                      |
-    +                                                           +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    |                                                           | .. note::                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-    |                                                           |     Installation on software RAID is not supported.                                                                                                                                                                                                                                                                                                                                                                                                     |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Additional Disks                                          | 1 X 500 GB \(min 10K RPM\)                                                                                                                                                                                                                                       | 500 GB \(min. 10K RPM\) for OSD storage                                                      | 500 GB \(min. 10K RPM\) — 1 or more                                                   |
-    |                                                           |                                                                                                                                                                                                                                                                  |                                                                                              |                                                                                       |
-    |                                                           | \(not required for systems with dedicated storage nodes\)                                                                                                                                                                                                        | one or more SSDs or NVMe drives \(recommended for Ceph journals\); min. 1024 MiB per journal | .. note::                                                                             |
-    |                                                           |                                                                                                                                                                                                                                                                  |                                                                                              |     Single-disk hosts are supported, but must not be used for local ephemeral storage |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Network Ports                                             | \(Typical deployment\)                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-    |                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    |                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    |                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    |                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    |                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    +                                                           +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    |                                                           | -   Mgmt and Cluster Host: 2 x 10GE LAG \(shared interface\)                                                                                                                                                                                                     | -   Mgmt and Cluster Host: 2 x 10GE LAG \(shared interface\)                                 | -   Mgmt and Cluster Host: 2 x 10GE LAG \(shared interface\)                          |
-    |                                                           |                                                                                                                                                                                                                                                                  |                                                                                              |                                                                                       |
-    |                                                           | -   OAM: 2 x 1GE LAG                                                                                                                                                                                                                                             |                                                                                              | -   Optionally external network ports 2 x 10GE LAG                                    |
-    |                                                           |                                                                                                                                                                                                                                                                  |                                                                                              |                                                                                       |
-    |                                                           | -   Optionally external network ports 2 x 10GE LAG                                                                                                                                                                                                               |                                                                                              |                                                                                       |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Board Management Controller \(BMC\)                       | 1 \(required\)                                                                                                                                                                                                                                                   | 1 \(required\)                                                                               | 1 \(required\)                                                                        |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | USB Interface                                             | 1                                                                                                                                                                                                                                                                | not required                                                                                                                                                                         |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Power Profile                                             | Max Performance                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    |                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    |                                                           | Min Proc Idle Power:No C States                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Boot Order                                                | HD, PXE, USB                                                                                                                                                                                                                                                     | HD, PXE                                                                                                                                                                              |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | BIOS Mode                                                 | BIOS or UEFI                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-    |                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-    |                                                           | .. note::                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-    |                                                           |     UEFI Secure Boot and UEFI PXE boot over IPv6 are not supported. On systems with an IPv6 management network, you can use a separate IPv4 network for PXE boot. [#]_                                                                                                                                                                                                                                                                                  |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Intel Hyperthreading                                      | Disabled or Enabled                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-    | Intel Virtualization \(VTD, VTX\)                         | Disabled                                                                                                                                                                                                                                                                                                                                                        | Enabled                                                                               |
-    +-----------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------+
-
-.. [#] For more information, see :ref:`PXE Boot Network <network-planning-the-pxe-boot-network>`.
+------------------
+All-in-One Simplex
+------------------
 
 .. _starlingx-hardware-requirements-section-N102D0-N10024-N10001:
 
---------------------------------
-Combined controller-worker hosts
---------------------------------
+.. include:: /shared/_includes/prepare-servers-for-installation-91baad307173.rest
+   :start-after: begin-min-hw-reqs-sx
+   :end-before: end-min-hw-reqs-sx
 
+-----------------
+All-in-One Duplex
+-----------------
 
-Hardware requirements for a |prod| Simplex or Duplex configuration are listed
-in the following table.
+.. include:: /shared/_includes/prepare-servers-for-installation-91baad307173.rest
+   :start-after: begin-min-hw-reqs-dx
+   :end-before: end-min-hw-reqs-dx
 
-.. _starlingx-hardware-requirements-table-cb2-lfx-p5:
+.. _starlingx-hardware-requirements-table-nvy-52x-p5:
 
-.. list-table:: Table 2. Hardware Requirements — |prod| Simplex or Duplex Configuration
-   :header-rows: 1
+--------
+Standard
+--------
 
-   * - Minimum Requirement
-     - Controller + Worker
-       \(Combined Server\)
-   * - Minimum Qty of Servers
-     - Simplex―1
-       Duplex―2
-   * - Minimum Processor Class
-     - Dual-CPU Intel® Xeon® E5 26xx Family \(SandyBridge\) 8 cores/socket
+.. include:: /shared/_includes/prepare-servers-for-installation-91baad307173.rest
+   :start-after: begin-min-hw-reqs-std
+   :end-before: end-min-hw-reqs-std
 
-       or
+-------------------------------
+Stardard with dedicated storage
+-------------------------------
 
-       Single-CPU Intel Xeon D-15xx Family, 8 cores \(low-power/low-cost
-       option for Simplex deployments\)
-
-       Platform: 2x physical cores \(4x logical cores if hyper-threading\), \(by default, configurable\)
-       Application: Remaining cores
-   * - Minimum Memory
-     - -   64 GB
-
-       -   Platform:
-
-           * Socket 0: 7GB \(by default, configurable\)
-
-           * Socket 1: 1GB \(by default, configurable\)
-
-       -   Application:
-
-           * Socket 0: Remaining memory
-
-           * Socket 1: Remaining memory
-   * - Minimum Primary Disk
-     - 500 GB - |SSD| or |NVMe|
-   * - Additional Disks
-     - -   Single-disk system: N/A
-
-       -   Two-disk system:
-
-           *   1 x 500 GB SSD or |NVMe| for Persistent Volume Claim storage
-
-       -   Three-disk system:
-
-           *   1 x 500 GB \(min 10K RPM\) for Persistent Volume Claim storage
-
-           *   1 or more x 500 GB \(min. 10K RPM\) for Container ephemeral
-               disk storage
-   * - Network Ports
-     - \(Typical deployment.\)
-         -   Mgmt and Cluster Host: 2 x 10GE |LAG| \(shared interface\)
-
-             .. note::
-                Mgmt / Cluster Host ports are required for Duplex systems only.
-
-         -   OAM: 2 x 1GE LAG
-
-         -   Optionally external network ports 2 x 10GE LAG
-   * - USB Interface
-     - 1
-   * - Power Profile
-     - Max Performance
-
-       Min Proc Idle Power:No C States
-   * - Boot Order
-     - HD, |PXE|, USB
-   * - BIOS Mode
-     - BIOS or |UEFI|
-
-       .. note::
-          |UEFI| Secure Boot and |UEFI| |PXE| boot over IPv6 are not supported.
-          On systems with an IPv6 management network, you can use a separate
-          IPv4 network for |PXE| boot. For more information, see :ref:`PXE Boot
-          Network <network-planning-the-pxe-boot-network>`.
-   * - Intel Hyperthreading
-     - Disabled or Enabled
-   * - Intel Virtualization \(VTD, VTX\)
-     - Enabled
+.. include:: /shared/_includes/prepare-servers-for-installation-91baad307173.rest
+   :start-after: begin-min-hw-reqs-ded
+   :end-before: end-min-hw-reqs-ded
 
 .. _starlingx-hardware-requirements-section-if-scenarios:
 
diff --git a/doc/source/shared/_includes/prepare-servers-for-installation-91baad307173.rest b/doc/source/shared/_includes/prepare-servers-for-installation-91baad307173.rest
index c3b98adc5..8df9eea9b 100644
--- a/doc/source/shared/_includes/prepare-servers-for-installation-91baad307173.rest
+++ b/doc/source/shared/_includes/prepare-servers-for-installation-91baad307173.rest
@@ -53,15 +53,22 @@ host types are:
 
        .. note::
 
-          * Platform: 2x physical cores (4x logical cores if hyper-threading), (by
-            default, configurable)
+          * Platform: 1 physical core with HT enabled or 2 physical cores with HT
+            disabled, (by default, configurable)
+
+            The use of single physical core for platform function is only suitable for
+            Intel® 4th Generation Xeon® Scalable Processors or above and should not be
+            configured for previous Intel® Xeon® CPU families. For All-In-One systems
+            with older generation processors, two physical cores (or more) must be
+            configured.
+
           * Application: Remaining cores
    * - Minimum memory
      - 64 GB
 
        * Platform:
 
-         - Socket 0: 7GB (by default, configurable)
+         - Socket 0: 10GB (by default, configurable)
 
          - Socket 1: 1GB (by default, configurable)
 
@@ -96,6 +103,9 @@ host types are:
 
    * - USB
      - 1  (Only required if used for initial installation of controller-0).
+   * - Power profile
+     - C-states (up to C6) may be configured for some use cases where application
+       workloads can tolerate additional scheduling/timer latency.
    * - Boot order
      - HD, PXE, USB
    * - BIOS mode
@@ -175,8 +185,15 @@ host types are:
 
        .. note::
 
-          * Platform: 2x physical cores (4x logical cores if hyper-threading), (by
-            default, configurable)
+          * Platform: 1 physical core with HT enabled or 2 physical cores with HT
+            disabled, (by default, configurable)
+
+            The use of single physical core for platform function is only suitable for
+            Intel® 4th Generation Xeon® Scalable Processors or above and should not be
+            configured for previous Intel® Xeon® CPU families. For All-In-One systems
+            with older generation processors, two physical cores (or more) must be
+            configured.
+
           * Application: Remaining cores
      - (Same as controller node)
    * - Minimum memory
@@ -184,7 +201,7 @@ host types are:
 
        * Platform:
 
-         - Socket 0: 7GB (by default, configurable)
+         - Socket 0: 10GB (by default, configurable)
 
          - Socket 1: 1GB (by default, configurable)
 
@@ -223,11 +240,15 @@ host types are:
        * Data: 1 or more x 10GE  (Recommended:  Data 2x10GE LAG)
 
    * - USB
-     - 1  (Only required if used for initial installation of controller-0).
+     - 1 (Only required if used for initial installation of controller-0).
      -
    * - Board Management
      - 
      - 1 |BMC|
+   * - Power profile
+     -
+     - C-states (up to C6) may be configured for some use cases where application
+       workloads can tolerate additional scheduling/timer latency.
    * - Boot order
      - HD, PXE, USB
      - HD, PXE