diff --git a/charts/crossplane-efs/Chart.yaml b/charts/crossplane-efs/Chart.yaml
index 75b345d..2d48aac 100644
--- a/charts/crossplane-efs/Chart.yaml
+++ b/charts/crossplane-efs/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "1.1"
 description: "Helm Chart for installing a Custom Crossplane API, allowing to create an EFS Filesystem."
 name: crossplane-efs
-version: 0.3.0
+version: 0.4.0
 home: https://github.com/dvpe-cloud/dvpe-helm
 keywords:
   - dvpe-helm
diff --git a/charts/crossplane-efs/README.md b/charts/crossplane-efs/README.md
index 72cb188..a0ef1ab 100644
--- a/charts/crossplane-efs/README.md
+++ b/charts/crossplane-efs/README.md
@@ -1,6 +1,6 @@
 # crossplane-efs
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![AppVersion: 1.1](https://img.shields.io/badge/AppVersion-1.1-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![AppVersion: 1.1](https://img.shields.io/badge/AppVersion-1.1-informational?style=flat-square)
 
 Helm Chart for installing a Custom Crossplane API, allowing to create an EFS Filesystem.
 
diff --git a/charts/crossplane-efs/templates/composition.yaml b/charts/crossplane-efs/templates/composition.yaml
index d91ae5b..063e0aa 100644
--- a/charts/crossplane-efs/templates/composition.yaml
+++ b/charts/crossplane-efs/templates/composition.yaml
@@ -4,9 +4,9 @@
 apiVersion: apiextensions.crossplane.io/v1
 kind: Composition
 metadata:
-  name: {{ .Values.composition.efs.name }}.{{ .Values.xrd.version }}
+  name: {{ .Values.composition.efs.name }}
   labels:
-    crossplane.io/xrd: elasticfilesystems.{{ .Values.xrd.apiGroup }}.{{ .Values.xrd.version }}
+    crossplane.io/xrd: elasticfilesystems.{{ .Values.xrd.apiGroup }}
 spec:
   writeConnectionSecretsToNamespace: crossplane-system
   compositeTypeRef:
@@ -159,7 +159,8 @@ spec:
               kind: StorageClass
               metadata:
                 annotations:
-                  restrictedNamespaces: ""
+                  "restrictedNamespaces": ""
+                  "wadtfy.bmwgroup.net/restricted-namespaces": ""
                 labels:
                   "crossplane-efs/created-by": crossplane
                   "crossplane-efs/project-id":
@@ -184,6 +185,8 @@ spec:
       patches:
         - fromFieldPath: "metadata.labels[crossplane.io/claim-namespace]"
           toFieldPath: "spec.forProvider.manifest.metadata.annotations[restrictedNamespaces]"
+        - fromFieldPath: "metadata.labels[crossplane.io/claim-namespace]"
+          toFieldPath: "spec.forProvider.manifest.metadata.annotations[wadtfy.bmwgroup.net/restricted-namespaces]"
         - fromFieldPath: "spec.id"
           toFieldPath: "spec.forProvider.manifest.metadata.labels[crossplane-efs/project-id]"
         - fromFieldPath: "status.fileSystemID"
diff --git a/charts/crossplane-efs/templates/network/composition.yaml b/charts/crossplane-efs/templates/network/composition.yaml
index 1bc1da6..9f04a45 100644
--- a/charts/crossplane-efs/templates/network/composition.yaml
+++ b/charts/crossplane-efs/templates/network/composition.yaml
@@ -4,9 +4,9 @@
 apiVersion: apiextensions.crossplane.io/v1
 kind: Composition
 metadata:
-  name: {{ .Values.composition.efs.network.name }}.{{ .Values.xrd.version }}
+  name: {{ .Values.composition.efs.network.name }}
   labels:
-    crossplane.io/xrd: efsnetworks.{{ .Values.xrd.apiGroup }}.{{ .Values.xrd.version }}
+    crossplane.io/xrd: efsnetworks.{{ .Values.xrd.apiGroup }}
 spec:
   writeConnectionSecretsToNamespace: crossplane-system
   compositeTypeRef:
diff --git a/charts/crossplane-efs/templates/network/xrd.yaml b/charts/crossplane-efs/templates/network/xrd.yaml
index 95db73f..75278d7 100644
--- a/charts/crossplane-efs/templates/network/xrd.yaml
+++ b/charts/crossplane-efs/templates/network/xrd.yaml
@@ -5,7 +5,7 @@
 apiVersion: apiextensions.crossplane.io/v1
 kind: CompositeResourceDefinition
 metadata:
-  name: efsnetworks.{{ .Values.xrd.apiGroup }}.{{ .Values.xrd.version }}
+  name: efsnetworks.{{ .Values.xrd.apiGroup }}
 spec:
   group: {{ .Values.xrd.apiGroup }}
   names:
diff --git a/charts/crossplane-efs/templates/xrd.yaml b/charts/crossplane-efs/templates/xrd.yaml
index 770c7fe..184c875 100644
--- a/charts/crossplane-efs/templates/xrd.yaml
+++ b/charts/crossplane-efs/templates/xrd.yaml
@@ -5,7 +5,7 @@
 apiVersion: apiextensions.crossplane.io/v1
 kind: CompositeResourceDefinition
 metadata:
-  name: elasticfilesystems.{{ .Values.xrd.apiGroup }}.{{ .Values.xrd.version }}
+  name: elasticfilesystems.{{ .Values.xrd.apiGroup }}
 spec:
   group: {{ .Values.xrd.apiGroup }}
   names: