diff --git a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
index 9762e390a8..7bbeb3f446 100644
--- a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
+++ b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 // Code generated by controller-gen. DO NOT EDIT.
diff --git a/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
index 6a7dd3b77b..3a04649356 100644
--- a/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
+++ b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 // Code generated by controller-gen. DO NOT EDIT.
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index f2bd9a4dcb..3b66ff8440 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -2301,6 +2301,13 @@ base Maven specification
 
 additional repositories
 
+|`servers` +
+*xref:#_camel_apache_org_v1_Server[[\]Server]*
+|
+
+
+Servers (auth)
+
 
 |===
 
@@ -2346,6 +2353,7 @@ the Maven settings.
 |
 
 
+Deprecated: use CASecrets
 The Secret name and key, containing the CA certificate(s) used to connect
 to remote Maven repositories.
 It can contain X.509 certificates, and PKCS#7 formatted certificate chains.
@@ -2353,6 +2361,18 @@ A JKS formatted keystore is automatically created to store the CA certificate(s)
 and configured to be used as a trusted certificate(s) by the Maven commands.
 Note that the root CA certificates are also imported into the created keystore.
 
+|`caSecrets` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#secretkeyselector-v1-core[[\]Kubernetes core/v1.SecretKeySelector]*
+|
+
+
+The Secrets name and key, containing the CA certificate(s) used to connect
+to remote Maven repositories.
+It can contain X.509 certificates, and PKCS#7 formatted certificate chains.
+A JKS formatted keystore is automatically created to store the CA certificate(s),
+and configured to be used as a trusted certificate(s) by the Maven commands.
+Note that the root CA certificates are also imported into the created keystore.
+
 |`extension` +
 *xref:#_camel_apache_org_v1_MavenArtifact[[\]MavenArtifact]*
 |
@@ -2484,6 +2504,16 @@ the specification
 
 |===
 
+[#_camel_apache_org_v1_Properties]
+=== Properties(`map[string]string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_Server, Server>>
+
+
+
+
 [#_camel_apache_org_v1_PublishTask]
 === PublishTask
 
@@ -2856,6 +2886,58 @@ string
 used by the ImageStream
 
 
+|===
+
+[#_camel_apache_org_v1_Server]
+=== Server
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_MavenBuildSpec, MavenBuildSpec>>
+
+
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`-` +
+encoding/xml.Name
+|
+
+
+
+
+|`id` +
+string
+|
+
+
+
+
+|`username` +
+string
+|
+
+
+
+
+|`password` +
+string
+|
+
+
+
+
+|`configuration` +
+*xref:#_camel_apache_org_v1_Properties[Properties]*
+|
+
+
+
+
+
 |===
 
 [#_camel_apache_org_v1_SourceSpec]
diff --git a/docs/modules/traits/pages/mount.adoc b/docs/modules/traits/pages/mount.adoc
index cd9d549490..fe5a40f8b0 100644
--- a/docs/modules/traits/pages/mount.adoc
+++ b/docs/modules/traits/pages/mount.adoc
@@ -45,6 +45,10 @@ Syntax: [configmap\|secret]:name[/key][@path], where name represents the resourc
 | []string
 | A list of Persistent Volume Claims to be mounted. Syntax: [pvcname:/container/path]
 
+| mount.pvcs
+| []string
+| A list of Persistent Volume Claims to be created and mounted. Syntax: [pvcname:storageClassName:requestedQuantity:/container/path]
+
 |===
 
 // End of autogenerated code - DO NOT EDIT! (configuration)
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index b1f04c1f68..e787e152d4 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 // Code generated by controller-gen. DO NOT EDIT.
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index b2148b9e29..e760a6b422 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 // Code generated by controller-gen. DO NOT EDIT.
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 8317239b51..930a63da47 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -837,6 +837,10 @@ traits:
   - name: volumes
     type: '[]string'
     description: 'A list of Persistent Volume Claims to be mounted. Syntax: [pvcname:/container/path]'
+  - name: pvcs
+    type: '[]string'
+    description: 'A list of Persistent Volume Claims to be created and mounted. Syntax:
+      [pvcname:storageClassName:requestedQuantity:/container/path]'
 - name: openapi
   platform: true
   profiles: