diff --git a/crds/sme.sap.com_capapplications.yaml b/crds/sme.sap.com_capapplications.yaml
index 55b21988..39364873 100644
--- a/crds/sme.sap.com_capapplications.yaml
+++ b/crds/sme.sap.com_capapplications.yaml
@@ -117,7 +117,6 @@ spec:
             required:
             - btp
             - btpAppName
-            - globalAccountId
             type: object
           status:
             properties:
diff --git a/pkg/apis/sme.sap.com/v1alpha1/types.go b/pkg/apis/sme.sap.com/v1alpha1/types.go
index 22127bed..326fb255 100644
--- a/pkg/apis/sme.sap.com/v1alpha1/types.go
+++ b/pkg/apis/sme.sap.com/v1alpha1/types.go
@@ -87,16 +87,16 @@ type CAPApplicationList struct {
 
 // CAPApplicationSpec defines the desired state of CAPApplication
 type CAPApplicationSpec struct {
-	// Domains used by the application (new)
+	// Reference to `Domain` resources used by the application
 	DomainRefs []DomainRef `json:"domainRefs,omitempty"`
-	// [DEPRECATED] Domains used by the application // Will be removed in future versions
+	// Deprecated: Domains used by the application. Will be removed in future versions, use `DomainRefs` instead
 	Domains ApplicationDomains `json:"domains,omitempty"`
-	// SAP BTP Global Account Identifier where services are entitles for the current application
-	// Will soon be deprecated, use ProviderSubaccountId instead
-	GlobalAccountId string `json:"globalAccountId"`
-	// The subaccount ID in which the application is provided (will soon replace GlobalAccountId)
+	// Deprecated: SAP BTP Global Account Identifier where services are entitled for the current application
+	// Will be removed in future versions, use `ProviderSubaccountId` instead
+	GlobalAccountId string `json:"globalAccountId,omitempty"`
+	// The subaccount ID in which the application is provided (will soon replace `GlobalAccountId``)
 	ProviderSubaccountId string `json:"providerSubaccountId,omitempty"`
-	// Short name for the application (similar to BTP XSAPPNAME)
+	// Short name for the application (BTP XSAPPNAME)
 	BTPAppName string `json:"btpAppName"`
 	// Provider subaccount where application services are created
 	Provider *BTPTenantIdentification `json:"provider,omitempty"`
diff --git a/pkg/client/applyconfiguration/sme.sap.com/v1alpha1/capapplicationspec.go b/pkg/client/applyconfiguration/sme.sap.com/v1alpha1/capapplicationspec.go
index 1c5e22fb..148c226d 100644
--- a/pkg/client/applyconfiguration/sme.sap.com/v1alpha1/capapplicationspec.go
+++ b/pkg/client/applyconfiguration/sme.sap.com/v1alpha1/capapplicationspec.go
@@ -12,16 +12,16 @@ package v1alpha1
 //
 // CAPApplicationSpec defines the desired state of CAPApplication
 type CAPApplicationSpecApplyConfiguration struct {
-	// Domains used by the application (new)
+	// Reference to `Domain` resources used by the application
 	DomainRefs []DomainRefApplyConfiguration `json:"domainRefs,omitempty"`
-	// [DEPRECATED] Domains used by the application // Will be removed in future versions
+	// Deprecated: Domains used by the application. Will be removed in future versions, use `DomainRefs` instead
 	Domains *ApplicationDomainsApplyConfiguration `json:"domains,omitempty"`
-	// SAP BTP Global Account Identifier where services are entitles for the current application
-	// Will soon be deprecated, use ProviderSubaccountId instead
+	// Deprecated: SAP BTP Global Account Identifier where services are entitles for the current application
+	// Will be removed in future versions, use `ProviderSubaccountId` instead
 	GlobalAccountId *string `json:"globalAccountId,omitempty"`
 	// The subaccount ID in which the application is provided (will soon replace GlobalAccountId)
 	ProviderSubaccountId *string `json:"providerSubaccountId,omitempty"`
-	// Short name for the application (similar to BTP XSAPPNAME)
+	// Short name for the application (BTP XSAPPNAME)
 	BTPAppName *string `json:"btpAppName,omitempty"`
 	// Provider subaccount where application services are created
 	Provider *BTPTenantIdentificationApplyConfiguration `json:"provider,omitempty"`