diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index 1e5509d9114b14284a7e5f49361332832cff0107..3ebada5829b7fa6037191e94526161b7dbedd78e 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -5,7 +5,7 @@ apiVersion: api.kop-stack.de/v1
 kind: KopKeycloakClient
 {{- else }}
 apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakClient
+kind: OzgCloudKeycloakClient
 {{- end }}
 metadata:
   name: {{ include "app.generateKeycloakClientRessourceName" $client.client_name }}
diff --git a/src/main/helm/templates/keycloak-crd.yaml b/src/main/helm/templates/keycloak-crd.yaml
index 3829005d084993961d01170e63029ee2119803ac..45ef2e768ee0be6ca465e66ed98226f58a20097a 100644
--- a/src/main/helm/templates/keycloak-crd.yaml
+++ b/src/main/helm/templates/keycloak-crd.yaml
@@ -1,6 +1,6 @@
 ---
 apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakRealm
+kind: OzgCloudKeycloakRealm
 metadata:
   name: {{ include "app.namespace" . }}-keycloak
   namespace: {{ include "app.namespace" . }}
diff --git a/src/main/helm/templates/keycloak-group-crd.yaml b/src/main/helm/templates/keycloak-group-crd.yaml
index 08ace771845abd63881de647f49bacac63cd3a79..9f557969d664a464f7df6091421cc4ada9ec0bc7 100644
--- a/src/main/helm/templates/keycloak-group-crd.yaml
+++ b/src/main/helm/templates/keycloak-group-crd.yaml
@@ -1,7 +1,7 @@
 {{ range $group := .Values.sso.keycloak_groups }}
 ---
 apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakGroup
+kind: OzgCloudKeycloakGroup
 metadata:
   name: {{ include "app.generateKeycloakGroupRessourceName" (deepCopy $group.name) }}
   namespace: {{ include "app.namespace" $ }}
diff --git a/src/main/helm/templates/keycloak-user-crd.yaml b/src/main/helm/templates/keycloak-user-crd.yaml
index 38593ecf9dec8944c2553a2d03d266dd055e4ed5..531c2d4233d9790cfe6e3eff41e3ba8d902223fb 100644
--- a/src/main/helm/templates/keycloak-user-crd.yaml
+++ b/src/main/helm/templates/keycloak-user-crd.yaml
@@ -5,7 +5,7 @@ apiVersion: api.kop-stack.de/v1
 kind: KopKeycloakUser
 {{- else }}
 apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakUser
+kind: OzgCloudKeycloakUser
 {{- end }}
 metadata:
   name: {{ include "app.generateKeycloakUserRessourceName" (deepCopy $user.name) }}
diff --git a/src/test/helm/keycloak-client-crd-test.yaml b/src/test/helm/keycloak-client-crd-test.yaml
index 4b929a7c1de225ef193472fcfab732f0b16d2280..f84809c0bff91e37867b7c39821eb4f234ab7d9e 100644
--- a/src/test/helm/keycloak-client-crd-test.yaml
+++ b/src/test/helm/keycloak-client-crd-test.yaml
@@ -38,7 +38,7 @@ tests:
       - isAPIVersion:
           of: operator.ozgcloud.de/v1
       - isKind:
-          of: OzgKeycloakClient
+          of: OzgCloudKeycloakClient
   - it: should have metadata
     set:
       sso:
diff --git a/src/test/helm/keycloak-crd-test.yaml b/src/test/helm/keycloak-crd-test.yaml
index 5dc0ab1ee61151906906ddf32f314b23e6b3cd46..973e898b2b10a5846a92de7daa84295b1a900454 100644
--- a/src/test/helm/keycloak-crd-test.yaml
+++ b/src/test/helm/keycloak-crd-test.yaml
@@ -34,7 +34,7 @@ tests:
       - isAPIVersion:
           of: operator.ozgcloud.de/v1
       - isKind:
-          of: OzgKeycloakRealm
+          of: OzgCloudKeycloakRealm
   - it: should have metadata
     asserts:
       - equal:
diff --git a/src/test/helm/keycloak-group-crd-test.yaml b/src/test/helm/keycloak-group-crd-test.yaml
index 13cd56118c820dbb33a70e2132bbca063e6a1f77..d549158977db88203d38a1092f52c78f4dab4705 100644
--- a/src/test/helm/keycloak-group-crd-test.yaml
+++ b/src/test/helm/keycloak-group-crd-test.yaml
@@ -41,7 +41,7 @@ tests:
       - isAPIVersion:
           of: operator.ozgcloud.de/v1
       - isKind:
-          of: OzgKeycloakGroup
+          of: OzgCloudKeycloakGroup
   - it: should have metadata
     set:
       sso:
diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml
index d2a2cf7da26608830ac5199401d2da1619ebbac5..5d8bf3dbeb34f2c620efc8d9f78d7534e019240f 100644
--- a/src/test/helm/keycloak-user-crd-test.yaml
+++ b/src/test/helm/keycloak-user-crd-test.yaml
@@ -38,7 +38,7 @@ tests:
       - isAPIVersion:
           of: operator.ozgcloud.de/v1
       - isKind:
-          of: OzgKeycloakUser
+          of: OzgCloudKeycloakUser
   - it: should have metadata
     set:
       sso: