diff --git a/src/main/helm/templates/keycloak-user-crd.yaml b/src/main/helm/templates/keycloak-user-crd.yaml
index 1800e7a79dfd86fcee095f7df760cd054ae71d8d..03d3ae0b47ccdf5546f4b9f586dfece1c9a077e7 100644
--- a/src/main/helm/templates/keycloak-user-crd.yaml
+++ b/src/main/helm/templates/keycloak-user-crd.yaml
@@ -1,7 +1,7 @@
 {{ if .Values.sso.api_user }}
 ---
 apiVersion: operator.ozgcloud.de/v1
-kind: OzgCloudKeycloakUser
+kind: OzgKeycloakUser
 metadata:
   name: {{ include "app.generateKeycloakUserRessourceName" . }}
   namespace: {{ include "app.namespace" . }}
diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml
index 7003396f23b25269fd64137dd62f7778decfc060..59177f41c61e960d0d761900cdcc28f28b1e368c 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: OzgCloudKeycloakUser
+          of: OzgKeycloakUser
   - it: should have metadata
     set:
       sso:
diff --git a/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
index b62f1fd261d38a175d1b21f12eeac669d6b0c053..447e1fee434a0489e0e9bd4e049387a5af8c76d4 100644
--- a/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
@@ -1,9 +1,9 @@
-suite: test ozg_operator_secrets_read_role_binding
+suite: test ozgcloud_keycloak_operator_secrets_read_role_binding
 release:
   name: alfa
   namespace: by-helm-test
 templates:
-  - templates/ozg_operator_secrets_read_role_binding.yaml
+  - templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
 tests:
   - it: should contain header data
     set:
diff --git a/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
index 2f1468152fbfe6bfbde2f651208cbac7dca7ec46..d2561e2e221c843a511c3f853ec554ae367d5929 100644
--- a/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
@@ -1,9 +1,9 @@
-suite: test ozg_operator_secrets_read_role
+suite: test ozgcloud_keycloak_operator_secrets_read_role
 release:
   name: alfa
   namespace: by-helm-test
 templates:
-  - templates/ozg_operator_secrets_read_role.yaml
+  - templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
 tests:
   - it: should contain header data
     set:
diff --git a/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
index e6fe2a412fa1ef9982816b8ac7461c82d57a48a4..5cad4dbdfdb9ebddbcbfaabfc4c1b71ecaaad9d2 100644
--- a/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
@@ -1,9 +1,9 @@
-suite: test ozg_operator_secrets_role_binding
+suite: test ozgcloud_keycloak_operator_secrets_role_binding
 release:
   name: alfa
   namespace: by-helm-test
 templates:
-  - templates/ozg_operator_secrets_write_role_binding.yaml
+  - templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
 tests:
   - it: should contain header data
     set:
@@ -17,7 +17,7 @@ tests:
       - isKind:
           of: RoleBinding
   - it: should have metadata
-    set:
+    Set:
       sso:
         api_user:
           - name: apiuser
diff --git a/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
index 215f844ac8bf083005d8ca12441e0fcd9d58cf4e..a334dbfa7b547e9ccd51093ab13bb7fad504209e 100644
--- a/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
@@ -1,9 +1,9 @@
-suite: test ozg_operator_secrets_write_role
+suite: test ozgcloud_keycloak_operator_secrets_write_role
 release:
   name: alfa
   namespace: by-helm-test
 templates:
-  - templates/ozg_operator_secrets_write_role.yaml
+  - templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
 tests:
   - it: should contain header data
     set: