diff --git a/src/runtime/config/configuration-clh.toml.in b/src/runtime/config/configuration-clh.toml.in
index afb5370757..4afafaf08d 100644
--- a/src/runtime/config/configuration-clh.toml.in
+++ b/src/runtime/config/configuration-clh.toml.in
@@ -19,7 +19,8 @@ image = "@IMAGEPATH@"
 # Toggling that setting may trigger different hardware features, ranging
 # from memory encryption to both memory and CPU-state encryption and integrity.
 # The Kata Containers runtime dynamically detects the available feature set and
-# aims at enabling the largest possible one.
+# aims at enabling the largest possible one, returning an error if none is
+# available, or none is supported by the hypervisor.
 #
 # Known limitations:
 # * Does not work by design:
@@ -28,6 +29,9 @@ image = "@IMAGEPATH@"
 #   - Memory Hotplug
 #   - NVDIMM devices
 #
+# Supported TEEs:
+# * Intel TDX
+#
 # Default false
 # confidential_guest = true
 
@@ -37,7 +41,7 @@ image = "@IMAGEPATH@"
 #
 # For more information about firmwared that can be used with specific TEEs,
 # please, refer to:
-# * TDX:
+# * Intel TDX:
 #   - td-shim: https://github.com/confidential-containers/td-shim
 #
 # firmware = "@FIRMWAREPATH@"
diff --git a/src/runtime/config/configuration-qemu.toml.in b/src/runtime/config/configuration-qemu.toml.in
index 00c5dbfff0..af5c583647 100644
--- a/src/runtime/config/configuration-qemu.toml.in
+++ b/src/runtime/config/configuration-qemu.toml.in
@@ -20,7 +20,8 @@ machine_type = "@MACHINETYPE@"
 # Toggling that setting may trigger different hardware features, ranging
 # from memory encryption to both memory and CPU-state encryption and integrity.
 # The Kata Containers runtime dynamically detects the available feature set and
-# aims at enabling the largest possible one.
+# aims at enabling the largest possible one, returning an error if none is
+# available, or none is supported by the hypervisor.
 #
 # Known limitations:
 # * Does not work by design: