diff --git a/src/main/helm/templates/keycloak-user-crd.yaml b/src/main/helm/templates/keycloak-user-crd.yaml
index 03d3ae0b47ccdf5546f4b9f586dfece1c9a077e7..1800e7a79dfd86fcee095f7df760cd054ae71d8d 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: OzgKeycloakUser
+kind: OzgCloudKeycloakUser
 metadata:
   name: {{ include "app.generateKeycloakUserRessourceName" . }}
   namespace: {{ include "app.namespace" . }}
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 104939f0714adf8706a379ca0e686ff762453c8d..e8a339f4fd8344ec1e426ecc3b7fc6452eb06fb3 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -45,7 +45,7 @@ spec:
   - to:
     - podSelector:
         matchLabels:
-          component: ozg-mongodb
+          component: ozgcloud-mongodb
     ports:
       - port: 27017
         protocol: TCP
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
index 72c233c8a71e1f20c4cb36e6632011775c20c193..02f30c4d6e6e6e12209b0832495852dbc4f58497 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: ozg-operator-secrets-read-role-user-manager
+  name: ozgcloud-keycloak-operator-secrets-read-role-user-manager
   namespace: {{ include "app.namespace" $ }}
 rules:
   - apiGroups:
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
index 2fbe6c8b1a57d6c2a44a7c10e54bbeca3cd67466..fdcf591e4bce23591d62e06622edccaaf81e7821 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: ozg-operator-secrets-read-role-binding-user-manager
+  name: ozgcloud-keycloak-operator-secrets-read-role-binding-user-manager
   namespace: {{ include "app.namespace" . }}
 subjects:
   - kind: ServiceAccount
@@ -10,6 +10,6 @@ subjects:
     namespace: {{ required "sso.operatorNamespace muss angegeben sein" .Values.sso.operatorNamespace }}
 roleRef:
   kind: Role
-  name: ozg-operator-secrets-read-role-user-manager
+  name: ozgcloud-keycloak-operator-secrets-read-role-user-manager
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
index b4b25822f9f5495046a47aff5c20859e389fc253..f5f02cf36921c472bee3e8ad5a33cc90ee69c9b1 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: ozg-operator-secrets-write-role-user-manager
+  name: ozgcloud-keycloak-operator-secrets-write-role-user-manager
   namespace: {{ include "app.namespace" $ }}
 rules:
   - apiGroups:
diff --git a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
index d6b4532de317b272d582a1f5b77061f1dc4f8804..ad6a1e1141feb98aa4e9df6eda829149347dd4f4 100644
--- a/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: ozg-operator-secrets-write-role-binding-user-manager
+  name: ozgcloud-keycloak-operator-secrets-write-role-binding-user-manager
   namespace: {{ include "app.namespace" . }}
 subjects:
   - kind: ServiceAccount
@@ -10,6 +10,6 @@ subjects:
     namespace: {{ required "sso.operatorNamespace muss angegeben sein" .Values.sso.operatorNamespace }}
 roleRef:
   kind: Role
-  name: ozg-operator-secrets-write-role-user-manager
+  name: ozgcloud-keycloak-operator-secrets-write-role-user-manager
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
\ No newline at end of file
diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml
index 59177f41c61e960d0d761900cdcc28f28b1e368c..7003396f23b25269fd64137dd62f7778decfc060 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:
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index a4c438630fadb4c135c8f1ca774d0be14e136254..ed301b85485858a7b7c41b758b8a9adda4f12001 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -61,7 +61,7 @@ tests:
             - to:
               - podSelector: 
                   matchLabels:
-                    component: ozg-mongodb
+                    component: ozgcloud-mongodb
               ports:
                 - port: 27017
                   protocol: TCP
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 447e1fee434a0489e0e9bd4e049387a5af8c76d4..3acc4647aae75a30637491d988d399085b6a276a 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
@@ -25,7 +25,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: ozg-operator-secrets-read-role-binding-user-manager
+          value: ozgcloud-keycloak-operator-secrets-read-role-binding-user-manager
       - equal:
           path: metadata.namespace
           value: by-helm-test
@@ -54,7 +54,7 @@ tests:
           value: Role
       - equal:
           path: roleRef.name
-          value: ozg-operator-secrets-read-role-user-manager
+          value: ozgcloud-keycloak-operator-secrets-read-role-user-manager
       - equal:
           path: roleRef.apiGroup
           value: rbac.authorization.k8s.io
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 d2561e2e221c843a511c3f853ec554ae367d5929..4464f2f2ede235ba32da45a0dcfc10e2aa582c9b 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
@@ -23,7 +23,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: ozg-operator-secrets-read-role-user-manager
+          value: ozgcloud-keycloak-operator-secrets-read-role-user-manager
       - equal:
           path: metadata.namespace
           value: by-helm-test
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 a274845f9c4617d19d0f482bd4c21028b2fcd33f..0522ac029b8512e76e162023cbaa0d5ade5d9af2 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
@@ -25,7 +25,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: ozg-operator-secrets-write-role-binding-user-manager
+          value: ozgcloud-keycloak-operator-secrets-write-role-binding-user-manager
       - equal:
           path: metadata.namespace
           value: by-helm-test
@@ -54,7 +54,7 @@ tests:
           value: Role
       - equal:
           path: roleRef.name
-          value: ozg-operator-secrets-write-role-user-manager
+          value: ozgcloud-keycloak-operator-secrets-write-role-user-manager
       - equal:
           path: roleRef.apiGroup
           value: rbac.authorization.k8s.io
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 a334dbfa7b547e9ccd51093ab13bb7fad504209e..f5a365040075125f0a02784ee1e800f97561456f 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
@@ -23,7 +23,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: ozg-operator-secrets-write-role-user-manager
+          value: ozgcloud-keycloak-operator-secrets-write-role-user-manager
       - equal:
           path: metadata.namespace
           value: by-helm-test