diff --git a/src/main/helm/templates/ozg_operator_secrets_read_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
similarity index 89%
rename from src/main/helm/templates/ozg_operator_secrets_read_role.yaml
rename to src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role.yaml
index 59365c0d3c902a96334ea4cd7d8b65cab9d7849b..aac7f74a5b94d7ef0d3c5e76a75bee83b3d086e1 100644
--- a/src/main/helm/templates/ozg_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-alfa
+  name: ozgcloud-keycloak-operator-secrets-read-role-alfa
   namespace: {{ include "app.namespace" $ }}
 rules:
   - apiGroups:
diff --git a/src/main/helm/templates/ozg_operator_secrets_read_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
similarity index 68%
rename from src/main/helm/templates/ozg_operator_secrets_read_role_binding.yaml
rename to src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
index f0ffb889f43c5c923bc3e4f1590eb85b442473a5..deb14859f8ec076370be684d804f8771c3db470f 100644
--- a/src/main/helm/templates/ozg_operator_secrets_read_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_read_role_binding.yaml
@@ -2,14 +2,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: ozg-operator-secrets-read-role-binding-alfa
+  name: ozgcloud-keycloak-operator-secrets-read-role-binding-alfa
   namespace: {{ include "app.namespace" . }}
 subjects:
   - kind: ServiceAccount
-    name: ozg-operator-serviceaccount
+    name: ozgcloud-keycloak-operator-serviceaccount
     namespace: {{ required "sso.operatorNamespace muss angegeben sein" .Values.sso.operatorNamespace }}
 roleRef:
   kind: Role
-  name: ozg-operator-secrets-read-role-alfa
+  name: ozgcloud-keycloak-operator-secrets-read-role-alfa
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/ozg_operator_secrets_write_role.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
similarity index 82%
rename from src/main/helm/templates/ozg_operator_secrets_write_role.yaml
rename to src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role.yaml
index 6f5af1057d2deffb90b12dd2d60222d12189250d..98ebcf04351ddc06feec8529bbff72b0c7ea2ebb 100644
--- a/src/main/helm/templates/ozg_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-alfa
+  name: ozgcloud-keycloak-operator-secrets-write-role-alfa
   namespace: {{ include "app.namespace" $ }}
 rules:
   - apiGroups:
diff --git a/src/main/helm/templates/ozg_operator_secrets_write_role_binding.yaml b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
similarity index 68%
rename from src/main/helm/templates/ozg_operator_secrets_write_role_binding.yaml
rename to src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
index e7b3c290fe0f21da5eb7262c5db901238dc7994b..517307c08e2a0a94f94e1062d3fcc5d3428679ce 100644
--- a/src/main/helm/templates/ozg_operator_secrets_write_role_binding.yaml
+++ b/src/main/helm/templates/ozgcloud_keycloak_operator_secrets_write_role_binding.yaml
@@ -2,14 +2,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: ozg-operator-secrets-write-role-binding-alfa
+  name: ozgcloud-keycloak-operator-secrets-write-role-binding-alfa
   namespace: {{ include "app.namespace" . }}
 subjects:
   - kind: ServiceAccount
-    name: ozg-operator-serviceaccount
+    name: ozgcloud-keycloak-operator-serviceaccount
     namespace: {{ required "sso.operatorNamespace muss angegeben sein" .Values.sso.operatorNamespace }}
 roleRef:
   kind: Role
-  name: ozg-operator-secrets-write-role-alfa
+  name: ozgcloud-keycloak-operator-secrets-write-role-alfa
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
\ No newline at end of file
diff --git a/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
similarity index 84%
rename from src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
rename to src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
index 9b23c7d5fdb137b021925e01d25df3753041b925..5260c6877a43597a263374a09db4b03ac5681a75 100644
--- a/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_binding_test.yaml
@@ -3,7 +3,7 @@ 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:
@@ -25,7 +25,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: ozg-operator-secrets-read-role-binding-alfa
+          value: ozgcloud-keycloak-operator-secrets-read-role-binding-alfa
       - equal:
           path: metadata.namespace
           value: by-helm-test
@@ -40,7 +40,7 @@ tests:
           path: subjects
           content:
             kind: ServiceAccount
-            name: ozg-operator-serviceaccount
+            name: ozgcloud-keycloak-operator-serviceaccount
             namespace: test-operator-namespace
   - it: should have roleRef values
     set:
@@ -54,7 +54,7 @@ tests:
           value: Role
       - equal:
           path: roleRef.name
-          value: ozg-operator-secrets-read-role-alfa
+          value: ozgcloud-keycloak-operator-secrets-read-role-alfa
       - equal:
           path: roleRef.apiGroup
           value: rbac.authorization.k8s.io
@@ -73,5 +73,5 @@ tests:
           path: subjects
           content:
             kind: ServiceAccount
-            name: ozg-operator-serviceaccount
+            name: ozgcloud-keycloak-operator-serviceaccount
             namespace: test-operator-namespace
\ No newline at end of file
diff --git a/src/test/helm/ozg_operator_secrets_read_role_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
similarity index 92%
rename from src/test/helm/ozg_operator_secrets_read_role_test.yaml
rename to src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
index d96e2437115fca748c952d3009a84c740d9237ac..2466ec7fa40dffe6b98c5c472989b398cc2ffb5d 100644
--- a/src/test/helm/ozg_operator_secrets_read_role_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_read_role_test.yaml
@@ -3,7 +3,7 @@ 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:
@@ -23,7 +23,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: ozg-operator-secrets-read-role-alfa
+          value: ozgcloud-keycloak-operator-secrets-read-role-alfa
       - equal:
           path: metadata.namespace
           value: by-helm-test
diff --git a/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
similarity index 84%
rename from src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
rename to src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
index 3402bf88f4bf59989d0fd1a0110bfb82e122ec4f..018e058be037ed3cefc00a6ad37b4bdcff205888 100644
--- a/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_binding_test.yaml
@@ -3,7 +3,7 @@ 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:
@@ -25,7 +25,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: ozg-operator-secrets-write-role-binding-alfa
+          value: ozgcloud-keycloak-operator-secrets-write-role-binding-alfa
       - equal:
           path: metadata.namespace
           value: by-helm-test
@@ -40,7 +40,7 @@ tests:
           path: subjects
           content:
             kind: ServiceAccount
-            name: ozg-operator-serviceaccount
+            name: ozgcloud-keycloak-operator-serviceaccount
             namespace: test-operator-namespace
   - it: should have roleRef values
     set:
@@ -54,7 +54,7 @@ tests:
           value: Role
       - equal:
           path: roleRef.name
-          value: ozg-operator-secrets-write-role-alfa
+          value: ozgcloud-keycloak-operator-secrets-write-role-alfa
       - equal:
           path: roleRef.apiGroup
           value: rbac.authorization.k8s.io
@@ -73,5 +73,5 @@ tests:
           path: subjects
           content:
             kind: ServiceAccount
-            name: ozg-operator-serviceaccount
+            name: ozgcloud-keycloak-operator-serviceaccount
             namespace: test-operator-namespace
\ No newline at end of file
diff --git a/src/test/helm/ozg_operator_secrets_write_role_test.yaml b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
similarity index 90%
rename from src/test/helm/ozg_operator_secrets_write_role_test.yaml
rename to src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
index 0c08c0a8aef78ecd5a75ac46f388a459eee9bfac..16b4766bd43a05be653660156121188006654d56 100644
--- a/src/test/helm/ozg_operator_secrets_write_role_test.yaml
+++ b/src/test/helm/ozgcloud_keycloak_operator_secrets_write_role_test.yaml
@@ -3,7 +3,7 @@ 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:
@@ -23,7 +23,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: ozg-operator-secrets-write-role-alfa
+          value: ozgcloud-keycloak-operator-secrets-write-role-alfa
       - equal:
           path: metadata.namespace
           value: by-helm-test