diff --git a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
index 48e43dede1c1dcca8c93cce42bf210f64196f24a..108f36bdf32ac63bf229c8a6fdd8804e8787354c 100644
--- a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
+++ b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
@@ -2,14 +2,14 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ozgkeycloakclients.operator.ozgcloud.de
+  name: ozgcloudkeycloakclients.operator.ozgcloud.de
 spec:
   group: operator.ozgcloud.de
   names:
     kind: OzgCloudKeycloakClient
     listKind: OzgCloudKeycloakClientList
-    plural: ozgkeycloakclients
-    singular: ozgkeycloakclient
+    plural: ozgcloudkeycloakclients
+    singular: ozgcloudkeycloakclient
   scope: Namespaced
   versions:
   - name: v1
diff --git a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
index 8f97e2a4322e87db2f6e43b7b92405286c0732da..4e2991e5284721a5538a38d5f0d072b5cf72a62d 100644
--- a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
+++ b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
@@ -2,14 +2,14 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ozgkeycloakgroups.operator.ozgcloud.de
+  name: ozgcloudkeycloakgroups.operator.ozgcloud.de
 spec:
   group: operator.ozgcloud.de
   names:
     kind: OzgCloudKeycloakGroup
     listKind: OzgCloudKeycloakGroupList
-    plural: ozgkeycloakgroups
-    singular: ozgkeycloakgroup
+    plural: ozgcloudkeycloakgroups
+    singular: ozgcloudkeycloakgroup
   scope: Namespaced
   versions:
   - name: v1
diff --git a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
index 7a0a715c565c68c469f5d481c726eed3c3546728..d07a971b56465878743ec8a89c5b3e66f8c54db8 100644
--- a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
+++ b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
@@ -2,14 +2,14 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ozgkeycloakrealms.operator.ozgcloud.de
+  name: ozgcloudkeycloakrealms.operator.ozgcloud.de
 spec:
   group: operator.ozgcloud.de
   names:
     kind: OzgCloudKeycloakRealm
     listKind: OzgCloudKeycloakRealmList
-    plural: ozgkeycloakrealms
-    singular: ozgkeycloakrealm
+    plural: ozgcloudkeycloakrealms
+    singular: ozgcloudkeycloakrealm
   scope: Namespaced
   versions:
   - name: v1
diff --git a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
index e3a24f2e6fe032abc0435df081971a0bf9d27f99..a00d4569981e461bc5809198ac62ccff2adf7b31 100644
--- a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
+++ b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
@@ -2,14 +2,14 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: ozgkeycloakusers.operator.ozgcloud.de
+  name: ozgcloudkeycloakusers.operator.ozgcloud.de
 spec:
   group: operator.ozgcloud.de
   names:
     kind: OzgCloudKeycloakUser
     listKind: OzgCloudKeycloakUserList
-    plural: ozgkeycloakusers
-    singular: ozgkeycloakuser
+    plural: ozgcloudkeycloakusers
+    singular: ozgcloudkeycloakuser
   scope: Namespaced
   versions:
   - name: v1