diff --git a/api/crds/manifests/core.openmcp.cloud_memberoverrides.yaml b/api/crds/manifests/core.openmcp.cloud_memberoverrides.yaml
index 6a8bee6..b4da13e 100644
--- a/api/crds/manifests/core.openmcp.cloud_memberoverrides.yaml
+++ b/api/crds/manifests/core.openmcp.cloud_memberoverrides.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.3
+    controller-gen.kubebuilder.io/version: v0.18.0
   name: memberoverrides.core.openmcp.cloud
 spec:
   group: core.openmcp.cloud
diff --git a/api/crds/manifests/core.openmcp.cloud_projects.yaml b/api/crds/manifests/core.openmcp.cloud_projects.yaml
index ad42a38..5c8942f 100644
--- a/api/crds/manifests/core.openmcp.cloud_projects.yaml
+++ b/api/crds/manifests/core.openmcp.cloud_projects.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.3
+    controller-gen.kubebuilder.io/version: v0.18.0
   name: projects.core.openmcp.cloud
 spec:
   group: core.openmcp.cloud
diff --git a/api/crds/manifests/core.openmcp.cloud_workspaces.yaml b/api/crds/manifests/core.openmcp.cloud_workspaces.yaml
index f398f2e..0fd30f3 100644
--- a/api/crds/manifests/core.openmcp.cloud_workspaces.yaml
+++ b/api/crds/manifests/core.openmcp.cloud_workspaces.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.3
+    controller-gen.kubebuilder.io/version: v0.18.0
   name: workspaces.core.openmcp.cloud
 spec:
   group: core.openmcp.cloud
diff --git a/hack/common b/hack/common
index 80bfca5..30b714e 160000
--- a/hack/common
+++ b/hack/common
@@ -1 +1 @@
-Subproject commit 80bfca5ddf3186e97df6b7d1acdea035f6ba4632
+Subproject commit 30b714e2e9f8af9bca37dc6dfa9890f479a37b23