diff --git a/source/get-started/bare-metal-install-desktop.rst b/source/get-started/bare-metal-install-desktop.rst
index 8f8d1383..4ff6f823 100644
--- a/source/get-started/bare-metal-install-desktop.rst
+++ b/source/get-started/bare-metal-install-desktop.rst
@@ -344,8 +344,10 @@ boot partition
 
 #. Select :guilabel:`Add`.
 
-swap partition
---------------
+swap partition (optional)
+-------------------------
+
+A swapfile is generated by default during installation. However, if you prefer to create a swap partition, follow the steps below.
 
 #. With :guilabel:`unallocated` highlighted, select from the menu
    :menuselection:`Partition --> New`.
@@ -643,16 +645,16 @@ Create partitions per requirements in Table 1.
      - /boot
      - 150MB
 
-   * - ``linux-swap``
-     - swap
-     -
-     - 256MB
-
    * - ``ext[234], XFS, or f2fs``
      - root
      - /
      - *Size depends upon use case/desired bundles.*
 
+.. note:: 
+   
+   A 64MiB swapfile is generated by default. The default size may be set
+   manually with the ``--swap-file-size`` command-line option.
+
 Troubleshooting
 ***************
 
diff --git a/source/get-started/bare-metal-install-server.rst b/source/get-started/bare-metal-install-server.rst
index c1e50c11..c76294ff 100644
--- a/source/get-started/bare-metal-install-server.rst
+++ b/source/get-started/bare-metal-install-server.rst
@@ -318,8 +318,11 @@ boot partition
 
 Now follow the same process to configure the remaining partitions.
 
-swap partition
---------------
+swap partition (optional)
+-------------------------
+
+A swapfile is generated by default during installation. However, if you
+prefer to create a swap partition, follow the steps below. 
 
 #. Use the :kbd:`Up/Down` arrow to select free space.
 
@@ -915,16 +918,16 @@ Create partitions per requirements in Table 1.
      - /boot
      - 150MB
 
-   * - ``linux-swap``
-     - swap
-     -
-     - 256MB
-
    * - ``ext[234], `XFS`, or f2fs``
      - root
      - /
      - *Size depends upon use case/desired bundles.*
 
+.. note:: 
+   
+   A 64MiB swapfile is generated by default. The default size may be set
+   manually with the ``--swap-file-size`` command-line option.
+
 Troubleshooting
 ***************