diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12230f3fbf3..a0908975860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Added SLE16 and openSUSE Leap 16 as supported clients
 - Improved procedure formatting for better clarity in Administration
   Guide (bsc#1253660)
 - Added links to man pages for createrepo_c and reprepro to
diff --git a/modules/client-configuration/pages/clients-sle.adoc b/modules/client-configuration/pages/clients-sle.adoc
index 9044468535a..bb0cebaa8bc 100644
--- a/modules/client-configuration/pages/clients-sle.adoc
+++ b/modules/client-configuration/pages/clients-sle.adoc
@@ -39,6 +39,9 @@ The products you need for this procedure are:
 | OS Version
 | Product Name
 
+| {sles} 16 
+| SUSE Linux Enterprise Server 16 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
+| sle-product-sles16-pool-x86_64
+
 | {sles} 15 SP7
 | sle-product-sles15-sp7-pool-x86_64
 
diff --git a/modules/client-configuration/pages/supported-features-sles.adoc b/modules/client-configuration/pages/supported-features-sles.adoc
index ba3722ed6af..8e9dfe02984 100644
--- a/modules/client-configuration/pages/supported-features-sles.adoc
+++ b/modules/client-configuration/pages/supported-features-sles.adoc
@@ -22,149 +22,205 @@ 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}
 | {check}
+| {check}
+| {check}
 
 | 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}
 | {check}
+| {check}
+| {check}
 
 | Package verification
 | {cross}
 | {cross}
 | {cross}
+| {check}
+| {check}
 
 | Package locking
 | {check}
@@ -175,76 +231,106 @@ The icons in this table indicate:
 | {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..dbe6661a69a 100644
--- a/modules/client-configuration/pages/supported-features.adoc
+++ b/modules/client-configuration/pages/supported-features.adoc
@@ -43,7 +43,7 @@ ifeval::[{suma-content} == true]
 | {ibmz}
 | {aarch64}
 
-| {sle} 15, 12
+| {sle} 16, 15, 12
 | {check}
 | {check}
 | {check}
@@ -67,7 +67,7 @@ ifeval::[{suma-content} == true]
 | {cross}
 | {check}
 
-| {opensuse} Leap 15
+| {opensuse} Leap 16, 15
 | {check}
 | {cross}
 | {cross}