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 100%
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
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 90%
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 eeb9eb0c9592ba8a8c461dacbbe9451971c80aba..2fbe6c8b1a57d6c2a44a7c10e54bbeca3cd67466 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
@@ -6,7 +6,7 @@ metadata:
   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
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 100%
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
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 90%
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 84d879684ce3e7ddc07a5f378c576c9aeaab90c5..d6b4532de317b272d582a1f5b77061f1dc4f8804 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
@@ -6,7 +6,7 @@ metadata:
   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
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 96%
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 0f5af4d7917005c4a75a99aa646e35b61de4a33d..b62f1fd261d38a175d1b21f12eeac669d6b0c053 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
@@ -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:
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 100%
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
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 96%
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 3074359a849c64ed470424e5e1535f2c6b984b7d..e6fe2a412fa1ef9982816b8ac7461c82d57a48a4 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
@@ -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:
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 100%
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