diff --git a/docs/reference/ocm_add_routingslips.md b/docs/reference/ocm_add_routingslips.md
index 4bebc50df7..968d9ad83f 100644
--- a/docs/reference/ocm_add_routingslips.md
+++ b/docs/reference/ocm_add_routingslips.md
@@ -94,10 +94,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_bootstrap_configuration.md b/docs/reference/ocm_bootstrap_configuration.md
index 92396ca672..c74726be34 100644
--- a/docs/reference/ocm_bootstrap_configuration.md
+++ b/docs/reference/ocm_bootstrap_configuration.md
@@ -75,10 +75,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_bootstrap_package.md b/docs/reference/ocm_bootstrap_package.md
index 19e343b811..a752fdca38 100644
--- a/docs/reference/ocm_bootstrap_package.md
+++ b/docs/reference/ocm_bootstrap_package.md
@@ -156,10 +156,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_check_componentversions.md b/docs/reference/ocm_check_componentversions.md
index 23f9849220..9689f20306 100644
--- a/docs/reference/ocm_check_componentversions.md
+++ b/docs/reference/ocm_check_componentversions.md
@@ -63,10 +63,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_create.md b/docs/reference/ocm_create.md
index eb4db9987a..70c319cbee 100644
--- a/docs/reference/ocm_create.md
+++ b/docs/reference/ocm_create.md
@@ -21,7 +21,6 @@ ocm create [<options>] <sub command> ...
 
 ##### Sub Commands
 
-* [ocm create <b>componentarchive</b>](ocm_create_componentarchive.md)	 &mdash; (DEPRECATED) create new component archive
 * [ocm create <b>rsakeypair</b>](ocm_create_rsakeypair.md)	 &mdash; create RSA public key pair
 * [ocm create <b>transportarchive</b>](ocm_create_transportarchive.md)	 &mdash; create new OCI/OCM transport  archive
 
diff --git a/docs/reference/ocm_create_componentarchive.md b/docs/reference/ocm_create_componentarchive.md
deleted file mode 100644
index f95d8403dc..0000000000
--- a/docs/reference/ocm_create_componentarchive.md
+++ /dev/null
@@ -1,62 +0,0 @@
-## ocm create componentarchive &mdash; (DEPRECATED) Create New Component Archive
-
-### Synopsis
-
-```bash
-ocm create componentarchive [<options>] <component> <version> --provider <provider-name> {--provider <label>=<value>} {<label>=<value>}
-```
-
-#### Aliases
-
-```text
-componentarchive, comparch, ca
-```
-
-### Options
-
-```text
-  -F, --file string            target file/directory (default "component-archive")
-  -f, --force                  remove existing content
-  -h, --help                   help for componentarchive
-  -p, --provider stringArray   provider attribute
-  -S, --scheme string          schema version (default "v2")
-  -t, --type string            archive format (directory, tar, tgz) (default "directory")
-```
-
-### Description
-
-Create a new component archive. This might be either a directory prepared
-to host component version content or a tar/tgz file (see option --type).
-
-A provider must be specified, additional provider labels are optional.
-
-
-The <code>--type</code> option accepts a file format for the
-target archive to use. It is only evaluated if the target
-archive does not exist yet. The following formats are supported:
-- directory
-- tar
-- tgz
-
-The default format is <code>directory</code>.
-
-
-If the option <code>--scheme</code> is given, the specified component descriptor format is used/generated.
-
-The following schema versions are supported for explicit conversions:
-  - <code>ocm.software/v3alpha1</code>
-  - <code>v2</code> (default)
-
-### Examples
-
-```bash
-$ ocm create componentarchive --file myfirst --provider acme.org --provider email=alice@acme.org acme.org/demo 1.0
-```
-
-### SEE ALSO
-
-#### Parents
-
-* [ocm create](ocm_create.md)	 &mdash; Create transport or component archive
-* [ocm](ocm.md)	 &mdash; Open Component Model command line client
-
diff --git a/docs/reference/ocm_describe_package.md b/docs/reference/ocm_describe_package.md
index def83647ae..b22262610d 100644
--- a/docs/reference/ocm_describe_package.md
+++ b/docs/reference/ocm_describe_package.md
@@ -66,10 +66,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_download_cli.md b/docs/reference/ocm_download_cli.md
index ff71ec89dd..34fdab53db 100644
--- a/docs/reference/ocm_download_cli.md
+++ b/docs/reference/ocm_download_cli.md
@@ -76,10 +76,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_download_componentversions.md b/docs/reference/ocm_download_componentversions.md
index 79dbd5c69e..359df96a98 100644
--- a/docs/reference/ocm_download_componentversions.md
+++ b/docs/reference/ocm_download_componentversions.md
@@ -62,10 +62,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_download_resources.md b/docs/reference/ocm_download_resources.md
index fd14528178..09e3012282 100644
--- a/docs/reference/ocm_download_resources.md
+++ b/docs/reference/ocm_download_resources.md
@@ -101,10 +101,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_get_componentversions.md b/docs/reference/ocm_get_componentversions.md
index ceebb7e970..58b5e14b5a 100644
--- a/docs/reference/ocm_get_componentversions.md
+++ b/docs/reference/ocm_get_componentversions.md
@@ -72,10 +72,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_get_references.md b/docs/reference/ocm_get_references.md
index 684f1b4787..c518a857b0 100644
--- a/docs/reference/ocm_get_references.md
+++ b/docs/reference/ocm_get_references.md
@@ -73,10 +73,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_get_resources.md b/docs/reference/ocm_get_resources.md
index 9790deeb88..c7ef77e761 100644
--- a/docs/reference/ocm_get_resources.md
+++ b/docs/reference/ocm_get_resources.md
@@ -73,10 +73,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_get_routingslips.md b/docs/reference/ocm_get_routingslips.md
index a5402ac441..576b1dab42 100644
--- a/docs/reference/ocm_get_routingslips.md
+++ b/docs/reference/ocm_get_routingslips.md
@@ -72,10 +72,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_get_sources.md b/docs/reference/ocm_get_sources.md
index fc32e41373..339692caea 100644
--- a/docs/reference/ocm_get_sources.md
+++ b/docs/reference/ocm_get_sources.md
@@ -73,10 +73,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_hash_componentversions.md b/docs/reference/ocm_hash_componentversions.md
index 4c5e46bdca..1a38a166a9 100644
--- a/docs/reference/ocm_hash_componentversions.md
+++ b/docs/reference/ocm_hash_componentversions.md
@@ -116,10 +116,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_install_plugins.md b/docs/reference/ocm_install_plugins.md
index 9c20720c97..02b045c7be 100644
--- a/docs/reference/ocm_install_plugins.md
+++ b/docs/reference/ocm_install_plugins.md
@@ -65,10 +65,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_list_componentversions.md b/docs/reference/ocm_list_componentversions.md
index 630d009e9b..95ddc71d05 100644
--- a/docs/reference/ocm_list_componentversions.md
+++ b/docs/reference/ocm_list_componentversions.md
@@ -71,10 +71,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_ocm.md b/docs/reference/ocm_ocm.md
index 2c1f092df8..ff385ece4f 100644
--- a/docs/reference/ocm_ocm.md
+++ b/docs/reference/ocm_ocm.md
@@ -22,7 +22,6 @@ ocm ocm [<options>] <sub command> ...
 ##### Sub Commands
 
 * ocm ocm <b>commontransportarchive</b>	 &mdash; Commands acting on common transport archives
-* ocm ocm <b>componentarchive</b>	 &mdash; Commands acting on component archives
 * ocm ocm <b>componentversions</b>	 &mdash; Commands acting on components
 * ocm ocm <b>plugins</b>	 &mdash; Commands related to OCM plugins
 * ocm ocm <b>pubsub</b>	 &mdash; Commands acting on sub/sub specifications
diff --git a/docs/reference/ocm_show_versions.md b/docs/reference/ocm_show_versions.md
index 075203cf3c..831d24c717 100644
--- a/docs/reference/ocm_show_versions.md
+++ b/docs/reference/ocm_show_versions.md
@@ -59,10 +59,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_sign_componentversions.md b/docs/reference/ocm_sign_componentversions.md
index fa9a0d7d17..c3ecf6f017 100644
--- a/docs/reference/ocm_sign_componentversions.md
+++ b/docs/reference/ocm_sign_componentversions.md
@@ -83,10 +83,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_transfer.md b/docs/reference/ocm_transfer.md
index 9a9cad036f..7285b0b873 100644
--- a/docs/reference/ocm_transfer.md
+++ b/docs/reference/ocm_transfer.md
@@ -23,6 +23,5 @@ ocm transfer [<options>] <sub command> ...
 
 * [ocm transfer <b>artifacts</b>](ocm_transfer_artifacts.md)	 &mdash; transfer OCI artifacts
 * [ocm transfer <b>commontransportarchive</b>](ocm_transfer_commontransportarchive.md)	 &mdash; transfer transport archive
-* [ocm transfer <b>componentarchive</b>](ocm_transfer_componentarchive.md)	 &mdash; (DEPRECATED) transfer component archive to some component repository
 * [ocm transfer <b>componentversions</b>](ocm_transfer_componentversions.md)	 &mdash; transfer component version
 
diff --git a/docs/reference/ocm_transfer_componentarchive.md b/docs/reference/ocm_transfer_componentarchive.md
deleted file mode 100644
index a4fe9e4e8f..0000000000
--- a/docs/reference/ocm_transfer_componentarchive.md
+++ /dev/null
@@ -1,96 +0,0 @@
-## ocm transfer componentarchive &mdash; (DEPRECATED) Transfer Component Archive To Some Component Repository
-
-### Synopsis
-
-```bash
-ocm transfer componentarchive [<options>]  <source> <target>
-```
-
-#### Aliases
-
-```text
-componentarchive, comparch, ca
-```
-
-### Options
-
-```text
-  -L, --copy-local-resources   transfer referenced local resources by-value
-  -V, --copy-resources         transfer referenced resources by-value
-      --copy-sources           transfer referenced sources by-value
-      --enforce                enforce transport as if target version were not present
-  -h, --help                   help for componentarchive
-      --lookup stringArray     repository name or spec for closure lookup fallback
-      --no-update              don't touch existing versions in target
-  -f, --overwrite              overwrite existing component versions
-  -t, --type string            archive format (directory, tar, tgz) (default "directory")
-```
-
-### Description
-
-Transfer a component archive to some component repository. This might
-be a CTF Archive or a regular repository.
-If the type CTF is specified the target must already exist, if CTF flavor
-is specified it will be created if it does not exist.
-
-Besides those explicitly known types a complete repository spec might be configured,
-either via inline argument or command configuration file and name.
-
-
-The <code>--type</code> option accepts a file format for the
-target archive to use. It is only evaluated if the target
-archive does not exist yet. The following formats are supported:
-- directory
-- tar
-- tgz
-
-The default format is <code>directory</code>.
-
-\
-If a component lookup for building a reference closure is required
-the <code>--lookup</code>  option can be used to specify a fallback
-lookup repository. By default, the component versions are searched in
-the repository holding the component version for which the closure is
-determined. For *Component Archives* this is never possible, because
-it only contains a single component version. Therefore, in this scenario
-this option must always be specified to be able to follow component
-references.
-
-
-With the option <code>--no-update</code> existing versions in the target
-repository will not be touched at all. An additional specification of the
-option <code>--overwrite</code> is ignored. By default, updates of
-volatile (non-signature-relevant) information is enabled, but the
-modification of non-volatile data is prohibited unless the overwrite
-option is given.
-
-
-If the option <code>--overwrite</code> is given, component versions in the
-target repository will be overwritten, if they already exist, but with different digest.
-If the option <code>--enforce</code> is given, component versions in the
-target repository will be transported as if they were not present on the target side,
-regardless of their state (this is independent on their actual state, even identical
-versions are re-transported).
-
-
-If the option <code>--copy-resources</code> is given, all referential
-resources will potentially be localized, mapped to component version local
-resources in the target repository. If the option <code>--copy-local-resources</code>
-is given, instead, only resources with the relation <code>local</code> will be
-transferred. This behaviour can be further influenced by specifying a transfer
-script with the <code>script</code> option family.
-
-
-If the option <code>--copy-sources</code> is given, all referential
-sources will potentially be localized, mapped to component version local
-resources in the target repository.
-This behaviour can be further influenced by specifying a transfer script
-with the <code>script</code> option family.
-
-### SEE ALSO
-
-#### Parents
-
-* [ocm transfer](ocm_transfer.md)	 &mdash; Transfer artifacts or components
-* [ocm](ocm.md)	 &mdash; Open Component Model command line client
-
diff --git a/docs/reference/ocm_transfer_componentversions.md b/docs/reference/ocm_transfer_componentversions.md
index 1c235f0e82..8a3a9be36d 100644
--- a/docs/reference/ocm_transfer_componentversions.md
+++ b/docs/reference/ocm_transfer_componentversions.md
@@ -84,10 +84,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/docs/reference/ocm_verify_componentversions.md b/docs/reference/ocm_verify_componentversions.md
index dabdd5d270..015de6b495 100644
--- a/docs/reference/ocm_verify_componentversions.md
+++ b/docs/reference/ocm_verify_componentversions.md
@@ -80,10 +80,8 @@ For the *Common Transport Format* the types <code>directory</code>,
 Using the JSON variant any repository types supported by the
 linked library can be used:
 
-Dedicated OCM repository types:
-  - <code>ComponentArchive</code>: v1
-
 OCI Repository types (using standard component repository to OCI mapping):
+
   - <code>CommonTransportFormat</code>: v1
   - <code>OCIRegistry</code>: v1
   - <code>oci</code>: v1
diff --git a/hack/generate-docs/cobradoc/md_docs.go b/hack/generate-docs/cobradoc/md_docs.go
index 0b7ea0a0ad..afb1ad8ae4 100644
--- a/hack/generate-docs/cobradoc/md_docs.go
+++ b/hack/generate-docs/cobradoc/md_docs.go
@@ -139,7 +139,7 @@ func GenMarkdownCustom(cmd *cobra.Command, w io.Writer, linkHandler func(string)
 
 		subheader := false
 		for _, child := range children {
-			if OverviewOnly(child) || !child.IsAvailableCommand() || child.IsAdditionalHelpTopicCommand() {
+			if OverviewOnly(child) || !child.IsAvailableCommand() || child.IsAdditionalHelpTopicCommand() || IsDeprecated(child) {
 				continue
 			}
 			if header && !subheader {
@@ -266,6 +266,10 @@ func DocuCommandPath(cmd *cobra.Command) string {
 	return cmd.CommandPath()
 }
 
+func IsDeprecated(cmd *cobra.Command) bool {
+	return cmd.Deprecated != ""
+}
+
 func ExampleCodeStyle(cmd *cobra.Command) string {
 	if cmd.Annotations != nil {
 		if p, ok := cmd.Annotations["ExampleCodeStyle"]; ok {