diff --git a/.changelog b/.changelog
index 93520a93e39..77637486d6c 100644
--- a/.changelog
+++ b/.changelog
@@ -371,6 +371,7 @@
   Upgrade Guide
 - Documented AWS Permissions for Virtual Host Manager in VHM and
   Amazon Web Services chapter in the Client Configuration Guide
+- Documented Debian 12 as a supported client OS in Client Configuration Guide
 
 # Last packaged: 2021-09-21 (Uyuni 2021.09)
 
diff --git a/modules/client-configuration/pages/clients-debian.adoc b/modules/client-configuration/pages/clients-debian.adoc
index 7dc2dfa8b74..b45ff647236 100644
--- a/modules/client-configuration/pages/clients-debian.adoc
+++ b/modules/client-configuration/pages/clients-debian.adoc
@@ -60,6 +60,7 @@ The products you need for this procedure are:
 | OS Version  | Product Name
 | {debian} 10 | Debian 10
 | {debian} 11 | Debian 11
+| {debian} 12 | Debian 12
 |===
 
 include::snippets/addchannels_vendor_webui.adoc[]
@@ -75,6 +76,7 @@ The channels you need for this procedure are:
 | OS Version  | Product Name
 | {debian} 10 | debian-10-pool-amd64
 | {debian} 11 | debian-11-pool-amd64
+| {debian} 12 | debian-12-pool-amd64
 |===
 
 include::snippets/addchannels_vendor_cli.adoc[]
@@ -109,6 +111,12 @@ The channels you need for this procedure are:
 | debian-11-amd64-main-updates-uyuni
 | debian-11-amd64-main-security-uyuni
 
+| {debian} 12
+| debian-12-pool-amd64-uyuni
+| debian-12-amd64-uyuni-client
+| debian-12-amd64-main-updates-uyuni
+| debian-12-amd64-main-security-uyuni
+
 |===
 
 include::snippets/addchannels_novendor_cli.adoc[]
diff --git a/modules/client-configuration/pages/supported-features-debian.adoc b/modules/client-configuration/pages/supported-features-debian.adoc
index b714245ca32..64b125916ca 100644
--- a/modules/client-configuration/pages/supported-features-debian.adoc
+++ b/modules/client-configuration/pages/supported-features-debian.adoc
@@ -18,181 +18,224 @@ The icons in this table indicate:
 * {salt} the feature is supported only on Salt clients.
 
 
-[cols="1,1,1", options="header"]
+[cols="1,1,1,1", options="header"]
 .Supported Features on {debian} Operating Systems
 |===
 
 | Feature
 | {debian}{nbsp}10
 | {debian}{nbsp}11
+| {debian}{nbsp}12
 
 | Client
 | {check}
 | {check}
+| {check}
 
 | System packages
 | {debian} Community
 | {debian} Community
+| {debian} Community
 
 | Registration
 | {salt}
 | {salt}
+| {salt}
 
 | Install packages
 | {salt}
 | {salt}
+| {salt}
 
 | Apply patches
 | {question}
 | {question}
+| {question}
 
 | Remote commands
 | {salt}
 | {salt}
+| {salt}
 
 | System package states
 | {salt}
 | {salt}
+| {salt}
 
 | System custom states
 | {salt}
 | {salt}
+| {salt}
 
 | Group custom states
 | {salt}
 | {salt}
+| {salt}
 
 | Organization custom states
 | {salt}
 | {salt}
+| {salt}
 
 | System set manager (SSM)
 | {salt}
 | {salt}
+| {salt}
 
 | Product migration
 | N/A
 | N/A
+| N/A
 
 | Basic Virtual Guest Management {star}
 | {salt}
 | {salt}
+| {salt}
 
 | Advanced Virtual Guest Management {star}
 | {salt}
 | {salt}
+| {salt}
 
 | Virtual Guest Installation (Kickstart), as Host OS
 | {cross}
 | {cross}
+| {cross}
 
 | Virtual Guest Installation (image template), as Host OS
 | {salt}
 | {salt}
+| {salt}
 
 | System deployment (PXE/Kickstart)
 | {cross}
 | {cross}
+| {cross}
 
 | System redeployment (Kickstart)
 | {cross}
 | {cross}
+| {cross}
 
 | Contact methods
 | {salt}: ZeroMQ, Salt-SSH
 | {salt}: ZeroMQ, Salt-SSH
+| {salt}: ZeroMQ, Salt-SSH
 
 | Works with {productname} Proxy
 | {salt}
 | {salt}
+| {salt}
 
 | Action chains
 | {salt}
 | {salt}
+| {salt}
 
 | Staging (pre-download of packages)
 | {salt}
 | {salt}
+| {salt}
 
 | Duplicate package reporting
 | {salt}
 | {salt}
+| {salt}
 
 | CVE auditing
 | {question}
 | {question}
+| {question}
 
 | SCAP auditing
 | {question}
 | {question}
+| {question}
 
 | Package verification
 | {cross}
 | {cross}
+| {cross}
 
 | Package locking
 | {check}
 | {check}
+| {check}
 
 | System locking
 | {cross}
 | {cross}
+| {cross}
 
 | Maintenance Windows
 | {check}
 | {check}
+| {check}
 
 | System snapshot
 | {cross}
 | {cross}
+| {cross}
 
 | Configuration file management
 | {salt}
 | {salt}
+| {salt}
 
 | Package profiles
 | {salt}: Profiles supported, Sync not supported
 | {salt}: Profiles supported, Sync not supported
+| {salt}: Profiles supported, Sync not supported
 
 | Power management
 | {check}
 | {check}
+| {check}
 
 | Monitoring server
 | {cross}
 | {cross}
+| {cross}
 
 | Monitoring clients
 | {salt}
 | {salt}
+| {salt}
 
 | Docker buildhost
 | {question}
 | {question}
+| {question}
 
 | Build Docker image with OS
 | {salt}
 | {salt}
+| {salt}
 
 | Kiwi buildhost
 | {cross}
 | {cross}
+| {cross}
 
 | Build Kiwi image with OS
 | {cross}
 | {cross}
+| {cross}
 
 | Recurring Actions
 | {salt}
 | {salt}
+| {salt}
 
 | AppStreams
 | N/A
 | N/A
+| N/A
 
 | Yomi
 | N/A
 | N/A
+| N/A
 
 |===
 
diff --git a/modules/client-configuration/pages/supported-features.adoc b/modules/client-configuration/pages/supported-features.adoc
index 9d86cb7c714..8b1476344da 100644
--- a/modules/client-configuration/pages/supported-features.adoc
+++ b/modules/client-configuration/pages/supported-features.adoc
@@ -104,6 +104,10 @@ ifeval::[{suma-content} == true]
 | {x86_64}
 | {check}
 
+| {debian} 12
+| {x86_64}
+| {check}
+
 | {oracle} 7
 | {x86_64}, {aarch64}
 | {check}
@@ -229,6 +233,10 @@ ifeval::[{uyuni-content} == true]
 | {x86_64}
 | {check}
 
+| {debian} 12
+| {x86_64}
+| {check}
+
 | {oracle} 7
 | {x86_64}, {aarch64}
 | {check}
diff --git a/modules/installation-and-upgrade/pages/client-requirements.adoc b/modules/installation-and-upgrade/pages/client-requirements.adoc
index eaeb4e8c772..4683aacabb0 100644
--- a/modules/installation-and-upgrade/pages/client-requirements.adoc
+++ b/modules/installation-and-upgrade/pages/client-requirements.adoc
@@ -83,6 +83,10 @@ ifeval::[{suma-content} == true]
 | {x86_64}
 | {check}
 
+| {debian} 12
+| {x86_64}
+| {check}
+
 | {oracle} 7
 | {x86_64}, {aarch64}
 | {check}
@@ -200,6 +204,10 @@ ifeval::[{uyuni-content} == true]
 | {x86_64}
 | {check}
 
+| {debian} 12
+| {x86_64}
+| {check}
+
 | {oracle} 7
 | {x86_64}, {aarch64}
 | {check}