diff --git a/daprdocs/content/en/operations/support/breaking-changes-and-deprecations.md b/daprdocs/content/en/operations/support/breaking-changes-and-deprecations.md
index 3d2893576..76c71eed3 100644
--- a/daprdocs/content/en/operations/support/breaking-changes-and-deprecations.md
+++ b/daprdocs/content/en/operations/support/breaking-changes-and-deprecations.md
@@ -39,6 +39,12 @@ There is a process for applying breaking changes:
    - For example, feature X is announced to be deprecated in the 1.0.0 release notes and will then be removed in 1.2.0.
 
 ## Deprecations
+Deprecations can apply to
+1. APIs, including alpha APIs
+1. Preview features
+1. Components
+1. CLI
+1. Features that could result in security vulnerabilities
 
 Deprecations appear in release notes under a section named “Deprecations”, which indicates:
 
@@ -56,6 +62,7 @@ After announcing a future breaking change, the change will happen in 2 releases
 | Java domain builder classes deprecated (Users should use [setters](https://github.com/dapr/java-sdk/issues/587) instead) | Java SDK 1.3.0 | Java SDK 1.5.0 |
 | Service invocation will no longer provide a default content type header of `application/json` when no content-type is specified. You must explicitly [set a content-type header]({{< ref "service_invocation_api.md#request-contents" >}}) for service invocation if your invoked apps rely on this header. |                 1.7.0 |                    1.9.0 |
 | gRPC service invocation using `invoke` method is deprecated. Use proxy mode service invocation instead. See [How-To: Invoke services using gRPC ]({{< ref howto-invoke-services-grpc.md >}}) to use the proxy mode.| 1.9.0 | 1.10.0 |
+| The CLI flag `--app-ssl` (in both the Dapr CLI and daprd) has been deprecated in favor of using `--app-protocol` with values `https` or `grpcs`. [daprd:6158](https://github.com/dapr/dapr/issues/6158) [cli:1267](https://github.com/dapr/cli/issues/1267)| 1.11.0 | 1.13.0 |
 
 ## Related links
 
diff --git a/daprdocs/content/en/operations/support/support-versioning.md b/daprdocs/content/en/operations/support/support-versioning.md
index bc30ca04a..132cfa382 100644
--- a/daprdocs/content/en/operations/support/support-versioning.md
+++ b/daprdocs/content/en/operations/support/support-versioning.md
@@ -58,8 +58,12 @@ The [components-contrib](https://github.com/dapr/components-contrib/) repo relea
 Note: Components have a production usage lifecycle status: Alpha, Beta and Stable. These statuses are not related to their versioning. The tables of supported components shows both their versions and their status.
 * List of [state store components]({{< ref supported-state-stores.md >}})
 * List of [pub/sub components]({{< ref supported-pubsub.md >}})
-* List of [secret store components]({{< ref supported-secret-stores.md >}})
 * List of [binding components]({{< ref supported-bindings.md >}})
+* List of [secret store components]({{< ref supported-secret-stores.md >}})
+* List of [configuration store components]({{< ref supported-configuration-stores.md >}})
+* List of [lock components]({{< ref supported-locks.md >}})
+* List of [crytpography components]({{< ref supported-cryptography.md >}})
+* List of [middleware components]({{< ref supported-middleware.md >}})
 
 For more information on component versioning  read [Version 2 and beyond of a component](https://github.com/dapr/components-contrib/blob/master/docs/developing-component.md#version-2-and-beyond-of-a-component)
 
@@ -96,6 +100,8 @@ The version for a component implementation is determined by the `.spec.version`
 ### Component deprecations
 Deprecations of components will be announced two (2) releases ahead. Deprecation of a component, results in major version update of the component version. After 2 releases, the component is unregistered from the Dapr runtime, and trying to load it will throw a fatal exception.
 
+Component deprecations and removal are announced in the release notes.
+
 ## Quickstarts and Samples
 Quickstarts in the [Quickstarts repo](https://github.com/dapr/quickstarts) are versioned with the runtime, where a table of corresponding versions is on the front page of the samples repo.  Users should only use Quickstarts corresponding to the version of the runtime being run.
 
@@ -103,3 +109,4 @@ Samples in the [Samples repo](https://github.com/dapr/samples) are each versione
 
 ## Related links
 * Read the [Supported releases]({{< ref support-release-policy.md >}})
+* Read the [Breaking Changes and Deprecation Policy]({{< ref breaking-changes-and-deprecations.md >}})