diff --git a/clusters/core/addons/argo-cd/templates/external-secrets/externalsecret-argocd-github.yaml b/clusters/core/addons/argo-cd/templates/external-secrets/externalsecret-argocd-vcs.yaml
similarity index 100%
rename from clusters/core/addons/argo-cd/templates/external-secrets/externalsecret-argocd-github.yaml
rename to clusters/core/addons/argo-cd/templates/external-secrets/externalsecret-argocd-vcs.yaml
diff --git a/clusters/core/addons/argo-cd/templates/external-secrets/externalsecret-keycloak-client-secret.yaml b/clusters/core/addons/argo-cd/templates/external-secrets/keycloak-client-argocd-secret.yaml
similarity index 100%
rename from clusters/core/addons/argo-cd/templates/external-secrets/externalsecret-keycloak-client-secret.yaml
rename to clusters/core/addons/argo-cd/templates/external-secrets/keycloak-client-argocd-secret.yaml
diff --git a/clusters/core/addons/argo-cd/values.yaml b/clusters/core/addons/argo-cd/values.yaml
index 4dffd8b..252a209 100644
--- a/clusters/core/addons/argo-cd/values.yaml
+++ b/clusters/core/addons/argo-cd/values.yaml
@@ -112,4 +112,4 @@ eso:
       # -- Defines SecretStore provider configuration.
       providerConfig: {}
       #  gcpsm:
-      #    projectID: "alphabet-123"
\ No newline at end of file
+      #    projectID: "alphabet-123"
diff --git a/clusters/core/addons/atlantis/values.yaml b/clusters/core/addons/atlantis/values.yaml
index 87f10c0..f49ddb2 100644
--- a/clusters/core/addons/atlantis/values.yaml
+++ b/clusters/core/addons/atlantis/values.yaml
@@ -56,4 +56,4 @@ eso:
       # -- Defines SecretStore provider configuration.
       providerConfig: {}
       #  gcpsm:
-      #    projectID: "alphabet-123"
\ No newline at end of file
+      #    projectID: "alphabet-123"
diff --git a/clusters/core/addons/defectdojo/templates/external-secrets/externalsecret-defectdojo-extrasecrets.yaml b/clusters/core/addons/defectdojo/templates/external-secrets/defectdojo-extrasecrets.yaml
similarity index 100%
rename from clusters/core/addons/defectdojo/templates/external-secrets/externalsecret-defectdojo-extrasecrets.yaml
rename to clusters/core/addons/defectdojo/templates/external-secrets/defectdojo-extrasecrets.yaml
diff --git a/clusters/core/addons/defectdojo/templates/external-secrets/externalsecret-defectdojo-redis-specific.yaml b/clusters/core/addons/defectdojo/templates/external-secrets/defectdojo-redis-specific.yaml
similarity index 100%
rename from clusters/core/addons/defectdojo/templates/external-secrets/externalsecret-defectdojo-redis-specific.yaml
rename to clusters/core/addons/defectdojo/templates/external-secrets/defectdojo-redis-specific.yaml
diff --git a/clusters/core/addons/defectdojo/templates/external-secrets/externalsecret-defectdojo.yaml b/clusters/core/addons/defectdojo/templates/external-secrets/defectdojo.yaml
similarity index 100%
rename from clusters/core/addons/defectdojo/templates/external-secrets/externalsecret-defectdojo.yaml
rename to clusters/core/addons/defectdojo/templates/external-secrets/defectdojo.yaml
diff --git a/clusters/core/addons/defectdojo/templates/external-secrets/externalsecret-keycloak-client-defectdojo-secret.yaml b/clusters/core/addons/defectdojo/templates/external-secrets/keycloak-client-defectdojo-secret.yaml
similarity index 100%
rename from clusters/core/addons/defectdojo/templates/external-secrets/externalsecret-keycloak-client-defectdojo-secret.yaml
rename to clusters/core/addons/defectdojo/templates/external-secrets/keycloak-client-defectdojo-secret.yaml
diff --git a/clusters/core/addons/fluent-bit/templates/external-secrets/externalsecret-fluentbit-creds.yaml b/clusters/core/addons/fluent-bit/templates/external-secrets/fluentbit-creds.yaml
similarity index 100%
rename from clusters/core/addons/fluent-bit/templates/external-secrets/externalsecret-fluentbit-creds.yaml
rename to clusters/core/addons/fluent-bit/templates/external-secrets/fluentbit-creds.yaml
diff --git a/clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-centralized-minio-users.yaml b/clusters/core/addons/harbor-ha-okd/templates/external-secrets/centralized-minio-users.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-centralized-minio-users.yaml
rename to clusters/core/addons/harbor-ha-okd/templates/external-secrets/centralized-minio-users.yaml
diff --git a/clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-harbor-s3.yaml b/clusters/core/addons/harbor-ha-okd/templates/external-secrets/harbor-s3.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-harbor-s3.yaml
rename to clusters/core/addons/harbor-ha-okd/templates/external-secrets/harbor-s3.yaml
diff --git a/clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-harbor.yaml b/clusters/core/addons/harbor-ha-okd/templates/external-secrets/harbor.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-harbor.yaml
rename to clusters/core/addons/harbor-ha-okd/templates/external-secrets/harbor.yaml
diff --git a/clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-keycloak-client-harbor-secret.yaml b/clusters/core/addons/harbor-ha-okd/templates/external-secrets/keycloak-client-harbor-secret.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-keycloak-client-harbor-secret.yaml
rename to clusters/core/addons/harbor-ha-okd/templates/external-secrets/keycloak-client-harbor-secret.yaml
diff --git a/clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-minio-root-admin-ui.yaml b/clusters/core/addons/harbor-ha-okd/templates/external-secrets/minio-admin-ui.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-minio-root-admin-ui.yaml
rename to clusters/core/addons/harbor-ha-okd/templates/external-secrets/minio-admin-ui.yaml
diff --git a/clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-redis-creds.yaml b/clusters/core/addons/harbor-ha-okd/templates/external-secrets/redis-creds.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha-okd/templates/external-secrets/externalsecret-redis-creds.yaml
rename to clusters/core/addons/harbor-ha-okd/templates/external-secrets/redis-creds.yaml
diff --git a/clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-centralized-minio-users.yaml b/clusters/core/addons/harbor-ha/templates/external-secrets/centralized-minio-users.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-centralized-minio-users.yaml
rename to clusters/core/addons/harbor-ha/templates/external-secrets/centralized-minio-users.yaml
diff --git a/clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-harbor-s3.yaml b/clusters/core/addons/harbor-ha/templates/external-secrets/harbor-s3.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-harbor-s3.yaml
rename to clusters/core/addons/harbor-ha/templates/external-secrets/harbor-s3.yaml
diff --git a/clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-harbor.yaml b/clusters/core/addons/harbor-ha/templates/external-secrets/harbor.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-harbor.yaml
rename to clusters/core/addons/harbor-ha/templates/external-secrets/harbor.yaml
diff --git a/clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-keycloak-client-harbor-secret.yaml b/clusters/core/addons/harbor-ha/templates/external-secrets/keycloak-client-harbor-secret.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-keycloak-client-harbor-secret.yaml
rename to clusters/core/addons/harbor-ha/templates/external-secrets/keycloak-client-harbor-secret.yaml
diff --git a/clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-minio-root-admin-ui.yaml b/clusters/core/addons/harbor-ha/templates/external-secrets/minio-admin-ui.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-minio-root-admin-ui.yaml
rename to clusters/core/addons/harbor-ha/templates/external-secrets/minio-admin-ui.yaml
diff --git a/clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-redis-creds.yaml b/clusters/core/addons/harbor-ha/templates/external-secrets/redis-creds.yaml
similarity index 100%
rename from clusters/core/addons/harbor-ha/templates/external-secrets/externalsecret-redis-creds.yaml
rename to clusters/core/addons/harbor-ha/templates/external-secrets/redis-creds.yaml
diff --git a/clusters/core/addons/harbor/templates/external-secrets/externalsecret-harbor.yaml b/clusters/core/addons/harbor/templates/external-secrets/harbor.yaml
similarity index 100%
rename from clusters/core/addons/harbor/templates/external-secrets/externalsecret-harbor.yaml
rename to clusters/core/addons/harbor/templates/external-secrets/harbor.yaml
diff --git a/clusters/core/addons/harbor/templates/external-secrets/externalsecret-keycloak-client-harbor-secret.yaml b/clusters/core/addons/harbor/templates/external-secrets/keycloak-client-harbor-secret.yaml
similarity index 100%
rename from clusters/core/addons/harbor/templates/external-secrets/externalsecret-keycloak-client-harbor-secret.yaml
rename to clusters/core/addons/harbor/templates/external-secrets/keycloak-client-harbor-secret.yaml
diff --git a/clusters/core/addons/keycloak-postgresql/templates/external-secrets/externalsecret-keycloak-postgresql.yaml b/clusters/core/addons/keycloak-postgresql/templates/external-secrets/keycloak-postgresql.yaml
similarity index 100%
rename from clusters/core/addons/keycloak-postgresql/templates/external-secrets/externalsecret-keycloak-postgresql.yaml
rename to clusters/core/addons/keycloak-postgresql/templates/external-secrets/keycloak-postgresql.yaml
diff --git a/clusters/core/addons/keycloak/templates/external-secrets/externalsecret-keycloak-admin-creds.yaml b/clusters/core/addons/keycloak/templates/external-secrets/keycloak-admin-creds.yaml
similarity index 100%
rename from clusters/core/addons/keycloak/templates/external-secrets/externalsecret-keycloak-admin-creds.yaml
rename to clusters/core/addons/keycloak/templates/external-secrets/keycloak-admin-creds.yaml
diff --git a/clusters/core/addons/kibana/templates/external-secrets/externalsecret-keycloak-client-grafana-secret.yaml b/clusters/core/addons/kibana/templates/external-secrets/keycloak-client-kibana-secret.yaml
similarity index 100%
rename from clusters/core/addons/kibana/templates/external-secrets/externalsecret-keycloak-client-grafana-secret.yaml
rename to clusters/core/addons/kibana/templates/external-secrets/keycloak-client-kibana-secret.yaml
diff --git a/clusters/core/addons/kuberocketci-rbac/templates/external-secrets/externalsecret-keycloak-client-shared-secret.yaml b/clusters/core/addons/kuberocketci-rbac/templates/external-secrets/keycloak-client-shared-secret.yaml
similarity index 100%
rename from clusters/core/addons/kuberocketci-rbac/templates/external-secrets/externalsecret-keycloak-client-shared-secret.yaml
rename to clusters/core/addons/kuberocketci-rbac/templates/external-secrets/keycloak-client-shared-secret.yaml
diff --git a/clusters/core/addons/kuberocketci-rbac/templates/external-secrets/externalsecret-keycloak.yaml b/clusters/core/addons/kuberocketci-rbac/templates/external-secrets/keycloak.yaml
similarity index 100%
rename from clusters/core/addons/kuberocketci-rbac/templates/external-secrets/externalsecret-keycloak.yaml
rename to clusters/core/addons/kuberocketci-rbac/templates/external-secrets/keycloak.yaml
diff --git a/clusters/core/addons/nexus-operator/templates/external-secret/nexus-admin-password-secret.yaml b/clusters/core/addons/nexus-operator/templates/external-secret/nexus-admin-password.yaml
similarity index 100%
rename from clusters/core/addons/nexus-operator/templates/external-secret/nexus-admin-password-secret.yaml
rename to clusters/core/addons/nexus-operator/templates/external-secret/nexus-admin-password.yaml
diff --git a/clusters/core/addons/nexus/templates/external-secrets/externalsecret-keycloak-client-secret.yaml b/clusters/core/addons/nexus/templates/external-secrets/keycloak-client-nexus-secret.yaml
similarity index 100%
rename from clusters/core/addons/nexus/templates/external-secrets/externalsecret-keycloak-client-secret.yaml
rename to clusters/core/addons/nexus/templates/external-secrets/keycloak-client-nexus-secret.yaml
diff --git a/clusters/core/addons/nexus/templates/external-secrets/externalsecret-oauth2-proxy-secret.yaml b/clusters/core/addons/nexus/templates/external-secrets/oauth2-proxy.yaml
similarity index 100%
rename from clusters/core/addons/nexus/templates/external-secrets/externalsecret-oauth2-proxy-secret.yaml
rename to clusters/core/addons/nexus/templates/external-secrets/oauth2-proxy.yaml
diff --git a/clusters/core/addons/opensearch/templates/external-secrets/externalsecret-fluentbit.yaml b/clusters/core/addons/opensearch/templates/external-secrets/fluentbit-creds.yaml
similarity index 100%
rename from clusters/core/addons/opensearch/templates/external-secrets/externalsecret-fluentbit.yaml
rename to clusters/core/addons/opensearch/templates/external-secrets/fluentbit-creds.yaml
diff --git a/clusters/core/addons/opensearch/templates/external-secrets/externalsecret-keycloak-client-secret.yaml b/clusters/core/addons/opensearch/templates/external-secrets/keycloak-client-opensearch-secret.yaml
similarity index 100%
rename from clusters/core/addons/opensearch/templates/external-secrets/externalsecret-keycloak-client-secret.yaml
rename to clusters/core/addons/opensearch/templates/external-secrets/keycloak-client-opensearch-secret.yaml
diff --git a/clusters/core/addons/opensearch/templates/external-secrets/externalsecret-opensearch.yaml b/clusters/core/addons/opensearch/templates/external-secrets/opensearch-admin-creds.yaml
similarity index 100%
rename from clusters/core/addons/opensearch/templates/external-secrets/externalsecret-opensearch.yaml
rename to clusters/core/addons/opensearch/templates/external-secrets/opensearch-admin-creds.yaml
diff --git a/clusters/core/addons/opensearch/templates/external-secrets/externalsecret-dashboard.yaml b/clusters/core/addons/opensearch/templates/external-secrets/opensearch-dashboards-account.yaml
similarity index 100%
rename from clusters/core/addons/opensearch/templates/external-secrets/externalsecret-dashboard.yaml
rename to clusters/core/addons/opensearch/templates/external-secrets/opensearch-dashboards-account.yaml
diff --git a/clusters/core/addons/prometheus-operator/templates/external-secrets/externalsecret-grafana-admin-creds.yaml b/clusters/core/addons/prometheus-operator/templates/external-secrets/grafana-admin-creds.yaml
similarity index 100%
rename from clusters/core/addons/prometheus-operator/templates/external-secrets/externalsecret-grafana-admin-creds.yaml
rename to clusters/core/addons/prometheus-operator/templates/external-secrets/grafana-admin-creds.yaml
diff --git a/clusters/core/addons/prometheus-operator/templates/external-secrets/externalsecret-keycloak-client-grafana-secret.yaml b/clusters/core/addons/prometheus-operator/templates/external-secrets/keycloak-client-grafana-secret.yaml
similarity index 100%
rename from clusters/core/addons/prometheus-operator/templates/external-secrets/externalsecret-keycloak-client-grafana-secret.yaml
rename to clusters/core/addons/prometheus-operator/templates/external-secrets/keycloak-client-grafana-secret.yaml
diff --git a/clusters/core/addons/report-portal/templates/external-secrets/externalsecret-reportportal-keycloak-client-creds.yaml b/clusters/core/addons/report-portal/templates/external-secrets/keycloak-client-report-portal-secret.yaml
similarity index 100%
rename from clusters/core/addons/report-portal/templates/external-secrets/externalsecret-reportportal-keycloak-client-creds.yaml
rename to clusters/core/addons/report-portal/templates/external-secrets/keycloak-client-report-portal-secret.yaml
diff --git a/clusters/core/addons/report-portal/templates/external-secrets/externalsecret-reportportal-minio-creds.yaml b/clusters/core/addons/report-portal/templates/external-secrets/reportportal-minio-creds.yaml
similarity index 100%
rename from clusters/core/addons/report-portal/templates/external-secrets/externalsecret-reportportal-minio-creds.yaml
rename to clusters/core/addons/report-portal/templates/external-secrets/reportportal-minio-creds.yaml
diff --git a/clusters/core/addons/report-portal/templates/external-secrets/externalsecret-reportportal-postgresql-creds.yaml b/clusters/core/addons/report-portal/templates/external-secrets/reportportal-postgresql-creds.yaml
similarity index 100%
rename from clusters/core/addons/report-portal/templates/external-secrets/externalsecret-reportportal-postgresql-creds.yaml
rename to clusters/core/addons/report-portal/templates/external-secrets/reportportal-postgresql-creds.yaml
diff --git a/clusters/core/addons/report-portal/templates/external-secrets/externalsecret-reportportal-rabbitmq-creds.yaml b/clusters/core/addons/report-portal/templates/external-secrets/reportportal-rabbitmq-creds.yaml
similarity index 100%
rename from clusters/core/addons/report-portal/templates/external-secrets/externalsecret-reportportal-rabbitmq-creds.yaml
rename to clusters/core/addons/report-portal/templates/external-secrets/reportportal-rabbitmq-creds.yaml
diff --git a/clusters/core/addons/sonar-operator/templates/external-secrets/externalsecret-sonar-admin-password-secret.yaml b/clusters/core/addons/sonar-operator/templates/external-secrets/sonar-admin-password.yaml
similarity index 100%
rename from clusters/core/addons/sonar-operator/templates/external-secrets/externalsecret-sonar-admin-password-secret.yaml
rename to clusters/core/addons/sonar-operator/templates/external-secrets/sonar-admin-password.yaml
diff --git a/clusters/core/addons/vault-kms/templates/external-secrets/externalsecret-keycloak-client-vault-secret.yaml b/clusters/core/addons/vault-kms/templates/external-secrets/keycloak-client-vault-secret.yaml
similarity index 100%
rename from clusters/core/addons/vault-kms/templates/external-secrets/externalsecret-keycloak-client-vault-secret.yaml
rename to clusters/core/addons/vault-kms/templates/external-secrets/keycloak-client-vault-secret.yaml
diff --git a/clusters/core/addons/vault-okd/templates/external-secrets/externalsecret-keycloak-client-vault-secret.yaml b/clusters/core/addons/vault-okd/templates/external-secrets/keycloak-client-vault-secret.yaml
similarity index 100%
rename from clusters/core/addons/vault-okd/templates/external-secrets/externalsecret-keycloak-client-vault-secret.yaml
rename to clusters/core/addons/vault-okd/templates/external-secrets/keycloak-client-vault-secret.yaml