diff --git a/daprdocs/content/en/reference/cli/dapr-mtls.md b/daprdocs/content/en/reference/cli/mtls/_index.md
similarity index 84%
rename from daprdocs/content/en/reference/cli/dapr-mtls.md
rename to daprdocs/content/en/reference/cli/mtls/_index.md
index de31910ab..bd46e2bb3 100644
--- a/daprdocs/content/en/reference/cli/dapr-mtls.md
+++ b/daprdocs/content/en/reference/cli/mtls/_index.md
@@ -7,7 +7,11 @@ description: "Detailed information on the mtls CLI command"
 
 ## Description
 
-Check if mTLS is enabled. Supported platforms: Kubernetes
+Check if mTLS is enabled.
+
+## Supported platforms
+
+- [Kubernetes]({{< ref kubernetes >}})
 
 ## Usage
 
diff --git a/daprdocs/content/en/reference/cli/dapr-mtls-expiry.md b/daprdocs/content/en/reference/cli/mtls/dapr-mtls-expiry.md
similarity index 73%
rename from daprdocs/content/en/reference/cli/dapr-mtls-expiry.md
rename to daprdocs/content/en/reference/cli/mtls/dapr-mtls-expiry.md
index 1dce2ca7c..f02022d72 100644
--- a/daprdocs/content/en/reference/cli/dapr-mtls-expiry.md
+++ b/daprdocs/content/en/reference/cli/mtls/dapr-mtls-expiry.md
@@ -3,12 +3,18 @@ type: docs
 title: "mtls expiry CLI command reference"
 linkTitle: "mtls expiry"
 description: "Detailed information on the mtls expiry CLI command"
+weight: 2000
 ---
 
 ## Description
 
 Checks the expiry of the root certificate
 
+## Supported platforms
+
+- [Self-Hosted]({{< ref self-hosted >}})
+- [Kubernetes]({{< ref kubernetes >}})
+
 ## Usage
 ```bash
 dapr mtls expiry [flags]
diff --git a/daprdocs/content/en/reference/cli/dapr-mtls--export.md b/daprdocs/content/en/reference/cli/mtls/dapr-mtls-export.md
similarity index 83%
rename from daprdocs/content/en/reference/cli/dapr-mtls--export.md
rename to daprdocs/content/en/reference/cli/mtls/dapr-mtls-export.md
index 83e8fe267..46a23bddb 100644
--- a/daprdocs/content/en/reference/cli/dapr-mtls--export.md
+++ b/daprdocs/content/en/reference/cli/mtls/dapr-mtls-export.md
@@ -3,12 +3,18 @@ type: docs
 title: "mtls export CLI command reference"
 linkTitle: "mtls export"
 description: "Detailed information on the mtls export CLI command"
+weight: 1000
 ---
 
 ## Description
 
 Export the root CA, issuer cert and key from Kubernetes to local files
 
+## Supported platforms
+
+- [Self-Hosted]({{< ref self-hosted >}})
+- [Kubernetes]({{< ref kubernetes >}})
+
 ## Usage
 ```bash
 dapr mtls export [flags]