diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4785d2539b..8c536ae6144 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Added SLE16 and openSUSE Leap 16 as supported clients
 - Explained how to generate the proxy certificates on a peripheral server 
   (bsc#1249425)
 - Improved procedure formatting for better clarity in Administration
diff --git a/modules/client-configuration/pages/clients-opensuseleap.adoc b/modules/client-configuration/pages/clients-opensuseleap.adoc
index 21b75b4278e..bcdcb388ed8 100644
--- a/modules/client-configuration/pages/clients-opensuseleap.adoc
+++ b/modules/client-configuration/pages/clients-opensuseleap.adoc
@@ -1,21 +1,25 @@
 [[clients-opensuseleap]]
-= Registering {opensuse} Leap Clients
+= Registering {leap} Clients
 :description: Register openSUSE Leap clients with SUSE Manager using Salt, then configure required channels for successful registration
 :revdate: 2024-06-07
 :page-revdate: {revdate}
 
 This section contains information about registering clients running {opensuse} operating systems.
-{productname} supports {opensuse} Leap 15 clients using {salt}.
+{productname} supports {leap} 15 and {leap} 16 clients using {salt} using {salt}.
 
-Bootstrapping is supported for starting {opensuse} clients and performing initial state runs such as setting repositories and performing profile updates.
+Bootstrapping is supported for starting {leap} clients and performing initial state runs such as setting repositories and performing profile updates.
 
 
 
 == Add Software Channels
 
-Before you register {opensuse} clients to your {productname} Server, you need to add the required software channels, and synchronize them.
+Before you register {leap} clients to your {productname} Server, you need to add the required software channels, and synchronize them.
+
+The architectures currently supported are:
+
+* {leap} 15: `x86_64` and `aarch64`.
+* {leap} 16: `x86_64`, `aarch64`, `ppc64le` and `s390x`
 
-The architectures currently supported are: `x86_64` and `aarch64`.
 For full list of supported products and architectures, see xref:client-configuration:supported-features.adoc[].
 
 ifndef::backend-pdf[]
@@ -32,20 +36,23 @@ ifeval::[{suma-content} == true]
 
 [[opensuse-channels-wizard]]
 [cols="1,1", options="header"]
-.{opensuse} Products - WebUI
+.{opensuse} Products - {webui}
 |===
 
 | OS Version
 | Product Name
 
-| {opensuse} Leap 15.6
-| {opensuse} Leap 15.6 x86_64
+| {leap} 16.0
+| {leap} 16.0 x86_64
+
+| {leap} 15.6
+| {leap} 15.6 x86_64
 
-| {opensuse} Leap 15.5
-| {opensuse} Leap 15.5 x86_64
+| {leap} 15.5
+| {leap} 15.5 x86_64
 
-| {opensuse} Leap 15.4
-| {opensuse} Leap 15.4 x86_64
+| {leap} 15.4
+| {leap} 15.4 x86_64
 
 |===
 
@@ -66,9 +73,10 @@ The channels you need for this procedure are:
 |===
 
 | OS Version | Base Channel
-| {opensuse} Leap 15.6 | opensuse-leap-15.6-pool
-| {opensuse} Leap 15.5 | opensuse-leap-15.5-pool
-| {opensuse} Leap 15.4 | opensuse-leap-15.4-pool
+| {leap} 16.0 | opensuse-leap-16.0
+| {leap} 15.6 | opensuse-leap-15.6-pool
+| {leap} 15.5 | opensuse-leap-15.5-pool
+| {leap} 15.4 | opensuse-leap-15.4-pool
 
 |===
 
@@ -83,34 +91,6 @@ endif::[]
 endif::[]
 
 
-ifeval::[{uyuni-content} == true]
-[[opensuse-leap-channels-cli]]
-[cols="1,1,1,1"]
-.{opensuse} Channels - CLI
-|===
-
-| OS Version               | {opensuse} Leap 15.6               | {opensuse} Leap 15.5               | {opensuse} Leap 15.4
-| Base Channel             | opensuse_leap15_6                  | opensuse_leap15_5                  | opensuse_leap15_4
-| Client Channel           | opensuse_leap15_6-uyuni-client     | opensuse_leap15_5-uyuni-client     | opensuse_leap15_4-uyuni-client
-| Updates Channel          | opensuse_leap15_6-updates          | opensuse_leap15_5-updates          | opensuse_leap15_4-updates
-| Non-OSS Channel          | opensuse_leap15_6-non-oss          | opensuse_leap15_5-non-oss          | opensuse_leap15_4-non-oss
-| Non-OSS Updates Channel  | opensuse_leap15_6-non-oss-updates  | opensuse_leap15_5-non-oss-updates  | opensuse_leap15_4-non-oss-updates
-| Backports Updates Channel| opensuse_leap15_6-backports-updates| opensuse_leap15_5-backports-updates| opensuse_leap15_4-backports-updates
-| SLE Updates Channel      | opensuse_leap15_6-sle-updates      | opensuse_leap15_5-sle-updates      | opensuse_leap15_4-sle-updates
-
-|===
-
-ifndef::backend-pdf[]
-include::client-configuration:partial$addchannels_novendor_cli.adoc[]
-endif::[]
-
-ifdef::backend-pdf[]
-include::../partials/addchannels_novendor_cli.adoc[]
-endif::[]
-
-endif::[]
-
-
 == Check Synchronization Status
 
 ifeval::[{suma-content} == true]
@@ -147,7 +127,7 @@ endif::[]
 
 [IMPORTANT]
 ====
-{opensuse} channels can be very large.
+{leap} channels can be very large.
 Synchronization can sometimes take several hours.
 ====
 
diff --git a/modules/client-configuration/pages/clients-sle.adoc b/modules/client-configuration/pages/clients-sle.adoc
index 9044468535a..332b8f5c971 100644
--- a/modules/client-configuration/pages/clients-sle.adoc
+++ b/modules/client-configuration/pages/clients-sle.adoc
@@ -33,12 +33,15 @@ The products you need for this procedure are:
 
 [[sle-channels-wizard]]
 [cols="1,1", options="header"]
-.SLE Products - WebUI
+.SLE Products - {webui}
 |===
 
 | OS Version
 | Product Name
 
+| {sles} 16.0 
+| SUSE Linux Enterprise Server 16.0 x86_64
+
 | {sles} 15 SP7
 | SUSE Linux Enterprise Server 15 SP7 x86_64
 
@@ -84,6 +87,9 @@ The channels you need for this procedure are:
 | OS Version
 | Base Channel
 
+| {sles} 16.0
+| sle-product-sles-16.0-x86_64
+
 | {sles} 15 SP7
 | sle-product-sles15-sp7-pool-x86_64
 
@@ -144,6 +150,12 @@ To add the client tools, add these channels from the command prompt:
 | OS Version
 | Client Channel
 
+| {sles} 16.0
+| sles16-0-uyuni-client
+
+| {sles} 15 SP7
+| sles15-sp7-uyuni-client
+
 | {sles} 15 SP6
 | sles15-sp6-uyuni-client
 
@@ -246,6 +258,14 @@ Use the same GPG key for both {sles}{nbsp}15 and {sles}{nbsp}12 clients.
 The correct key is called ``sle12-gpg-pubkey-39db7c82.key``.
 ====
 
+////
+[NOTE]
+====
+{sles}{nbsp}16 clients use a different GPG key.
+The correct key is called ``XXXXXXXXXX``.
+====
+////
+
 endif::[]
 
 
diff --git a/modules/client-configuration/pages/supported-features-sles.adoc b/modules/client-configuration/pages/supported-features-sles.adoc
index ba3722ed6af..b04e69bac65 100644
--- a/modules/client-configuration/pages/supported-features-sles.adoc
+++ b/modules/client-configuration/pages/supported-features-sles.adoc
@@ -1,18 +1,18 @@
 [[supported-features-sles]]
-= Supported {slsa} and {opensuse} Features
+= Supported {slsa} and {leap} Features
 :description: Learn about feature availability on SUSE and openSUSE clients regarding registration, package installation, and system management
 :revdate: 2024-05-10
 :page-revdate: {revdate}
 
 
-This table lists the availability of various features on {suse} and {opensuse} clients.
+This table lists the availability of various features on {suse} and {leap} clients.
 This table covers all variants of the {sle} operating system, including {slsa}, {sleda}, {sles} for SAP, and {sles} for HPC.
 
 [IMPORTANT]
 ====
 The operating system you run on a client is supported by the organization that supplies the operating system.
 {sle} is supported by {suse}.
-{opensuse} is supported by the {suse} community.
+{leap} is supported by the {suse} community.
 ====
 
 The icons in this table indicate:
@@ -22,229 +22,317 @@ The icons in this table indicate:
 * {question} the feature is under consideration, and may or may not be made available at a later date
 
 
-[cols="1,1,1,1", options="header"]
+[cols="1,1,1,1,1,1", options="header"]
 .Supported Features on {suse} and {opensuse} Operating Systems
 |===
 
 | Feature
 | {sle}{nbsp}12
 | {sle}{nbsp}15
-| {opensuse}{nbsp}15
+| {sle}{nbsp}16
+| {opensuse}{nbsp}Leap 15
+| {opensuse}{nbsp}Leap 16
 
 | Client
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | System packages
 | {suse}
 | {suse}
+| {suse}
+| {opensuse} Community
 | {opensuse} Community
 
 | Registration
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Install packages
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Apply patches
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Remote commands
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | System package states
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | System custom states
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Group custom states
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Organization custom states
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | System set manager (SSM)
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Product migration
 | {check}
 | {check}
+| {cross}
 | {check}
+| {cross}
 
 | Basic Virtual Guest Management {star}
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Advanced Virtual Guest Management {star}
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Virtual Guest Installation ({ay}), as Host OS
 | {cross}
 | {cross}
 | {cross}
+| {check}
+| {check}
 
 | Virtual Guest Installation (image template), as Host OS
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Virtual Guest Management
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | System deployment (PXE/{ay})
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | System redeployment ({ay})
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Contact methods
 | {cross}
 | {cross}
+| {cross}
+| {check} ZeroMQ, Salt-SSH
 | {check} ZeroMQ, Salt-SSH
 
 | Works with {productname} Proxy
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Action chains
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Staging (pre-download of packages)
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Duplicate package reporting
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | CVE auditing
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | SCAP auditing
 | {check}
 | {check}
+| {question}
 | {check}
+| {question}
 
 | Package verification
 | {cross}
 | {cross}
 | {cross}
+| {check}
+| {check}
 
 | Package locking
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | System locking
 | {cross}
 | {cross}
 | {cross}
+| {check}
+| {check}
 
 | Maintenance Windows
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | System snapshot
 | {cross}
 | {cross}
 | {cross}
+| {check}
+| {check}
 
 | Configuration file management
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Package profiles
 | {check} Profiles supported, Sync not supported
 | {check} Profiles supported, Sync not supported
 | {check} Profiles supported, Sync not supported
+| {check} Profiles supported, Sync not supported
+| {check} Profiles supported, Sync not supported
 
 | Power management
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Monitoring server
 | {check}
 | {check}
+| {question}
 | {check}
+| {question}
 
 | Monitored clients
 | {check}
 | {check}
+| {question}
 | {check}
+| {question}
 
 | Docker buildhost
 | {check}
 | {check}
+| {check}
+| {question}
 | {question}
 
 | Build Docker image with OS
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | Kiwi buildhost
 | {check}
 | {question}
 | {question}
+| {question}
+| {question}
 
 | Build Kiwi image with OS
 | {check}
 | {question}
+| {question}
+| {cross}
 | {cross}
 
 | Recurring Actions
 | {check}
 | {check}
 | {check}
+| {check}
+| {check}
 
 | AppStreams
 | N/A
 | N/A
 | N/A
+| N/A
+| N/A
 
 | Yomi
 | {cross}
 | {check}
 | {check}
+| {check}
+| {check}
 
 |===
 
diff --git a/modules/client-configuration/pages/supported-features.adoc b/modules/client-configuration/pages/supported-features.adoc
index fb5e5036d3a..eb45e0df231 100644
--- a/modules/client-configuration/pages/supported-features.adoc
+++ b/modules/client-configuration/pages/supported-features.adoc
@@ -43,13 +43,13 @@ ifeval::[{suma-content} == true]
 | {ibmz}
 | {aarch64}
 
-| {sle} 15, 12
+| {sle} 16, 15, 12
 | {check}
 | {check}
 | {check}
 | {check}
 
-| {sles} for SAP 15, 12
+| {sles} for SAP 16, 15, 12
 | {check}
 | {check}
 | {cross}
@@ -67,7 +67,14 @@ ifeval::[{suma-content} == true]
 | {cross}
 | {check}
 
-| {opensuse} Leap 15
+
+| {leap} 16
+| {check}
+| {check}
+| {check}
+| {check}
+
+| {leap} 15
 | {check}
 | {cross}
 | {cross}