diff --git a/Jenkinsfile b/Jenkinsfile
index bc26f4d719833a2d1a20992adc2b524f4582d187..fc9b6ef31610afeeb323660c1205b4dec1131c25 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -241,10 +241,10 @@ pipeline {
 Void deployHelmChart(String helmChartVersion) {
     withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){
         if (isReleaseBranch()) {
-            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@goofy-'''+helmChartVersion+'''.tgz''', returnStdout: true
+            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@alfa-'''+helmChartVersion+'''.tgz''', returnStdout: true
         }
         else {
-            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@goofy-'''+helmChartVersion+'''.tgz''', returnStdout: true
+            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@alfa-'''+helmChartVersion+'''.tgz''', returnStdout: true
         }
 
         if (result != '') {
@@ -349,12 +349,12 @@ Void setNewTestVersion() {
 
 Void setNewGitopsVersion(String environment) {
     dir("gitops") {
-        def envFile = "${environment}/application/values/goofy-values.yaml"//TODO OZG-4591
+        def envFile = "${environment}/application/values/alfa-values.yaml"
 
         def envVersions = readYaml file: envFile
 
-        envVersions.goofy.image.tag = IMAGE_TAG//TODO OZG-4591
-        envVersions.goofy.helm.version = HELM_CHART_VERSION//TODO OZG-4591
+        envVersions.alfa.image.tag = IMAGE_TAG
+        envVersions.alfa.helm.version = HELM_CHART_VERSION
 
         writeYaml file: envFile, data: envVersions, overwrite: true
 
@@ -366,8 +366,7 @@ Void setNewGitopsVersion(String environment) {
 }
 
 Boolean hasValuesFileChanged(String environment) {
-    //TODO OZG-4591
-    return sh (script: "git status | grep '${environment}/application/values/goofy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+    return sh (script: "git status | grep '${environment}/application/values/alfa-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Boolean isReleaseBranch() {
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index 3fd1ad21ecc4c8258858ae2a63733d3559876241..be41a581ad1c3a89c44fd9873226fed3b46ce894 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -345,7 +345,7 @@ String getHelmChartVersion(Map applicationValues) {
 
 Void initEnvAlfaDefaultVersions() {
     if (isMasterBranch() || isReleaseBranch()) {
-        values = getApplicationValues('goofy')//TODO OZG-4591
+        values = getApplicationValues('alfa')
 
         env.ALFA_IMAGE_TAG = getImageTag(values)
         env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values)
@@ -381,7 +381,7 @@ String getRootPomVersion() {
 }
 
 Void initEnvVorgangManagerDefaultVersions() {
-    values = getApplicationValues('pluto')//TODO OZG-4591
+    values = getApplicationValues('vorgang-manager')
 
     env.VORGANG_MANAGER_IMAGE_TAG = getImageTag(values)
     env.VORGANG_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(values)
@@ -441,18 +441,18 @@ Void generateMainNamespaceYaml() {
 Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String userFolder) {
     def envValues = readYaml file: "alfa-client/apps/alfa-e2e/src/fixtures/argocd/" + valuesPathSuffix;
 
-    envValues.kop.bezeichner = bezeichner//TODO OZG-4591
-    envValues.goofy.put("image", ['tag': env.ALFA_IMAGE_TAG])//TODO OZG-4591
-    envValues.goofy.put("helm", ['version': env.ALFA_HELM_CHART_VERSION, 'repoUrl': env.ALFA_HELM_REPO_URL])//TODO OZG-4591
+    envValues.ozgcloud.bezeichner = bezeichner
+    envValues.alfa.put("image", ['tag': env.ALFA_IMAGE_TAG])
+    envValues.alfa.put("helm", ['version': env.ALFA_HELM_CHART_VERSION, 'repoUrl': env.ALFA_HELM_REPO_URL])
 
-    envValues.pluto.put("image", ['tag': env.VORGANG_MANAGER_IMAGE_TAG])//TODO OZG-4591
-    envValues.pluto.put("helm", ['version': env.VORGANG_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.VORGANG_MANAGER_HELM_REPO_URL])//TODO OZG-4591
+    envValues.vorgang-manager.put("image", ['tag': env.VORGANG_MANAGER_IMAGE_TAG])
+    envValues.vorgang-manager.put("helm", ['version': env.VORGANG_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.VORGANG_MANAGER_HELM_REPO_URL])
 
     envValues.user_manager.put("image", ['tag': env.USER_MANAGER_IMAGE_TAG])
     envValues.user_manager.put("helm", ['version': env.USER_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.USER_MANAGER_HELM_REPO_URL])
 
-    envValues.goofy.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())//TODO OZG-4591
-    envValues.goofy.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))//TODO OZG-4591
+    envValues.alfa.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())
+    envValues.alfa.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
 
     writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
 
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile-static b/alfa-client/apps/alfa-e2e/Jenkinsfile-static
index c91f3880a6a389fe53d1d4c04e991ee0217aae02..519c8fdb1a53778e93d9c4c40115888832fd6c3e 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile-static
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile-static
@@ -108,7 +108,7 @@ pipeline {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
 
-					updateGoofyToCurrentMaster();
+					updateAlfaToCurrentMaster();
 					pushGitopsRepo();
                 }
             }
@@ -256,8 +256,8 @@ def cloneGitopsRepo() {
     }
 }
 
-Void updateGoofyToCurrentMaster() {
-	def values = getApplicationValues('goofy');
+Void updateAlfaToCurrentMaster() {
+	def values = getApplicationValues('alfa');
 	def imageTag = getImageTag(values);
 	def helmVersion = getHelmVersion(values);
 
@@ -291,8 +291,8 @@ String getHelmVersion(Map applicationValues) {
 Void updateNamespaceYaml(String namespace, imageTag, helmVersion){
 	def namespaceYaml = readYaml file: "gitops/dev/namespace/namespaces/${namespace}.yaml";
 
-	namespaceYaml.goofy.image.put('tag', imageTag);
-	namespaceYaml.goofy.helm.put('version', helmVersion);
+	namespaceYaml.alfa.image.put('tag', imageTag);
+	namespaceYaml.alfa.helm.put('version', helmVersion);
 
 	writeYaml file: "gitops/dev/namespace/namespaces/${namespace}.yaml", data: namespaceYaml, overwrite: true
 
@@ -377,12 +377,12 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
     dir('alfa-client/apps/alfa-e2e/'){
         def config = readJSON file: 'cypress-ci.json'
 
-        def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace);
-        def decodedPassword = decodeString(plutoDatabaseSecret.password);
+        def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
+        def decodedPassword = decodeString(vorgangManagerDatabaseSecret.password);
         def parsablePassword = makePasswordUrlConform(decodedPassword);
 
         config.baseUrl = "https://${bezeichner}.${env.CLUSTER_BASE_URL}" as String
-        config.env.dbUrl = "mongodb://${decodeString(plutoDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
+        config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
         config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
         config.env.keycloakRealm = namespace as String
         config.env.sabineUuid = getKeycloakUuid(namespace, "sabine") as String
@@ -403,8 +403,8 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
     return "cypress-ci-"+testFolder+".config.ts"
 }
 
-Map getPlutoDatabaseSecret(String namespace) {
-    return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-pluto-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+Map getVorgangManagerDatabaseSecret(String namespace) {
+    return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-vorgang-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
 }
 
 Map getUserManagerEnv(String namespace, dbPort){
diff --git a/alfa-server/src/main/resources/application-dev.yml b/alfa-server/src/main/resources/application-dev.yml
index 66b1bb57668a073ceaeab1e2d50c1f47ed7632fa..938a6bfeef434fd896cf8f9e7a46bf172e2a5c62 100644
--- a/alfa-server/src/main/resources/application-dev.yml
+++ b/alfa-server/src/main/resources/application-dev.yml
@@ -1,6 +1,3 @@
-goofy:
-  production: false
-
 keycloak:
    auth-server-url: https://sso.dev.by.ozg-cloud.de		
    realm: by-kiel-dev		
@@ -13,5 +10,6 @@ server:
 ozgcloud:
   feature:
      vorgang-export: true
+  production: false
   stage:
     production: false
\ No newline at end of file
diff --git a/alfa-server/src/main/resources/application-e2e.yml b/alfa-server/src/main/resources/application-e2e.yml
index 50cac7fbb8d11fe5c5ad23487bcdaed4b72a05d0..ae5baeb390881e44300c36f747852218e8646893 100644
--- a/alfa-server/src/main/resources/application-e2e.yml
+++ b/alfa-server/src/main/resources/application-e2e.yml
@@ -1,16 +1,15 @@
 keycloak:
   realm: by-e2e-local-dev
-kop:
-  forwarding:
-    lninfo:
-      url: classpath:files/LandesnetzInfo.html
-  user-manager:
-    url: http://localhost:9092
     
 ozgcloud:
   feature:
      vorgang-export: true
      createBescheid: true
+  forwarding:
+    lninfo:
+      url: classpath:files/LandesnetzInfo.html
   user-assistance:
      documentation:
-        url: /assets/benutzerleitfaden/benutzerleitfaden.pdf
\ No newline at end of file
+        url: /assets/benutzerleitfaden/benutzerleitfaden.pdf
+  user-manager:
+    url: http://localhost:9092
\ No newline at end of file
diff --git a/alfa-server/src/main/resources/application-ea.yml b/alfa-server/src/main/resources/application-ea.yml
index 772c6f59fce12997ababf623f384ce1dd91510b6..eb8d789be456ec1c1a29b1cd0ecc263f5040a833 100644
--- a/alfa-server/src/main/resources/application-ea.yml
+++ b/alfa-server/src/main/resources/application-ea.yml
@@ -1,4 +1,4 @@
-kop:
+ozgcloud:
   forwarding:
     lninfo:
       url: http://lninfo.ozg-tools.svc.cluster.local/
@@ -10,7 +10,7 @@ spring:
       on-profile:
       - dev
       
-kop:
+ozgcloud:
   forwarding:
     lninfo:
       url: classpath:files/mailertable.txt
@@ -22,7 +22,7 @@ spring:
       on-profile:
       - test
       
-kop:
+ozgcloud:
   forwarding:
     lninfo:
       url: classpath:files/mailertable.txt
\ No newline at end of file
diff --git a/alfa-server/src/main/resources/application-local.yml b/alfa-server/src/main/resources/application-local.yml
index 48b03024d8f9f74e8c4aa72a27dadeb853eb6739..9f07a50d310e520c0d3437193b886a91001836cf 100644
--- a/alfa-server/src/main/resources/application-local.yml
+++ b/alfa-server/src/main/resources/application-local.yml
@@ -1,22 +1,12 @@
 logging:
   level:
-    '[de.itvsh]': INFO
     '[de.ozgcloud]': INFO
   config: classpath:log4j2-local.xml
 
-goofy:
-  production: false
-
 server:
   error:
     include-stacktrace: always
 
-kop:
-  user-manager:
-    url: http://localhost:9091
-    profile-template: /api/userProfiles/%s
-    search-template: /api/userProfiles/?searchBy={searchBy}
-
 grpc:
   client:
     user-manager:
@@ -26,11 +16,16 @@ grpc:
 ozgcloud:
   feature:
     vorgang-export: true
+  production: false
   user-assistance:
      documentation:
         url: /assets/benutzerleitfaden/benutzerleitfaden.pdf
+  user-manager:
+    url: http://localhost:9091
+    profile-template: /api/userProfiles/%s
+    search-template: /api/userProfiles/?searchBy={searchBy}
     
 keycloak:
   auth-server-url: http://localhost:8088
-  realm: sh-kiel-dev #TODO adjust
-  resource: sh-kiel-dev-goofy #TODO adjust
\ No newline at end of file
+  realm: by-kiel-dev
+  resource: by-kiel-dev-alfa
\ No newline at end of file
diff --git a/alfa-server/src/main/resources/application.yml b/alfa-server/src/main/resources/application.yml
index ba93adc361269a881e2cabe739047a48233ca434..3439f8e572f4394b839aad7bb2991652529fb567 100644
--- a/alfa-server/src/main/resources/application.yml
+++ b/alfa-server/src/main/resources/application.yml
@@ -1,7 +1,6 @@
 logging:
   level:
     ROOT: WARN
-    '[de.itvsh]': INFO
     '[de.ozgcloud]': INFO,
     '[org.springframework.security]': WARN
 
@@ -54,9 +53,6 @@ management:
       exposure:
         include: health,prometheus
 
-goofy:
-  production: true
-
 grpc:
   client:
     pluto:
@@ -66,23 +62,22 @@ grpc:
       address: static://127.0.0.1:9000
       negotiationType: TLS
 
-kop:
+ozgcloud:
   auth:
     token:
       secret: XPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6Ywoir
       validity: 60000
+  oauth2:
+    auth-server-url: ${keycloak.auth-server-url}
+    realm: ${keycloak.realm}
+    resource: ${keycloak.resource}
+    principle-attribute: preferred_username
+    issuer-uri: ${ozgcloud.oauth2.auth-server-url}/realms/${ozgcloud.oauth2.realm}
+  production: true
   upload:
     maxFileSize:
       postfachNachrichtAttachment: 3MB
       wiedervorlageAttachment: 40MB
   user-manager:
     profile-template: /api/userProfiles/%s
-    search-template: /api/userProfiles/?searchBy={searchBy}
-
-ozgcloud:
-  oauth2:
-    auth-server-url: ${keycloak.auth-server-url}
-    realm: ${keycloak.realm}
-    resource: ${keycloak.resource}
-    principle-attribute: preferred_username
-    issuer-uri: ${ozgcloud.oauth2.auth-server-url}/realms/${ozgcloud.oauth2.realm}
\ No newline at end of file
+    search-template: /api/userProfiles/?searchBy={searchBy}
\ No newline at end of file
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index 98a0a404a7e021af5821f16ef5a905405f722331..5bf9f39638b4bd7f8a87d6036abc691a7599b236 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -23,9 +23,8 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
index b2c9bd3c1ac957ff55037513a7488e3439bdc0b3..65f0ef8f07d25157d8fc52f73cc3852a13c2cd90 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/EnvironmentController.java
@@ -42,7 +42,7 @@ public class EnvironmentController {
 	private OAuth2Properties oAuth2Properties;
 
 	@Autowired
-	private GoofyProperties goofyProperties;
+	private ProductionProperties productionProperties;
 
 	@Autowired
 	private VorgangProcessorProperties vorgangProcessorProperties;
@@ -50,7 +50,7 @@ public class EnvironmentController {
 	@GetMapping
 	public FrontendEnvironment getFrontendEnvironment() {
 		return FrontendEnvironment.builder()
-				.production(goofyProperties.isProduction())
+				.production(productionProperties.isProduction())
 				.remoteHost(linkTo(RootController.class).toUri().toString())
 				.authServer(oAuth2Properties.getAuthServerUrl())
 				.clientId(oAuth2Properties.getResource())
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/GoofyProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/ProductionProperties.java
similarity index 71%
rename from alfa-service/src/main/java/de/ozgcloud/alfa/GoofyProperties.java
rename to alfa-service/src/main/java/de/ozgcloud/alfa/ProductionProperties.java
index a6535d732fc451aecc91883f2c0cc92ae375f47b..bc0b72c655bdfb435792c45e3c2999e48d641b74 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/GoofyProperties.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/ProductionProperties.java
@@ -9,10 +9,8 @@ import lombok.Setter;
 @Getter
 @Setter
 @Configuration
-@ConfigurationProperties(prefix = GoofyProperties.PREFIX)
-class GoofyProperties {
-
-	static final String PREFIX = "goofy";
+@ConfigurationProperties("ozgcloud")
+class ProductionProperties {
 
 	/**
 	 * Production mode.
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java
index 4ca743de392c7f0ea755c3cdefdcdfd5c2a3fbe9..07b5b6ad79f4709aab4116b3fbc23def19d39f20 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/UserProfileUrlProvider.java
@@ -39,8 +39,8 @@ public class UserProfileUrlProvider implements ApplicationContextAware {
 	// TODO applicationContext darf nicht static abgelegt werden - es sollte möglich
 	// sein, dass eine andere Konfiguration in der jvm läuft.
 	private static ApplicationContext applicationContext;
-	static final String URL_ROOT_KEY = "kop.user-manager.url";
-	static final String USER_PROFILES_TEMPLATE_KEY = "kop.user-manager.profile-template";
+	static final String URL_ROOT_KEY = "ozgcloud.user-manager.url";
+	static final String USER_PROFILES_TEMPLATE_KEY = "ozgcloud.user-manager.profile-template";
 
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileProperties.java
index 74d7ab1ec758e92ba510913566a4f83e16a9b919..c942028546721dd0799901f4f77f0151bcc24330 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileProperties.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileProperties.java
@@ -36,11 +36,12 @@ import lombok.Setter;
 @Getter
 @Setter
 @Configuration
-@ConfigurationProperties(BinaryFileProperties.PREFIX)
+@ConfigurationProperties("ozgcloud.upload")
 class BinaryFileProperties {
 
-	static final String PREFIX = "kop.upload";
-
+	/**
+	 * Max file data size to upload
+	 */
 	private Map<String, DataSize> maxFileSize = Collections.emptyMap();
 
 }
\ No newline at end of file
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
index d07c0a7956c415e8c80adeadd5205aa634e32ec3..7dccd3d7bdc05a2c9ffe70fbe0c81bd9108c6836 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
@@ -23,12 +23,11 @@
  */
 package de.ozgcloud.alfa.common.downloadtoken;
 
-import jakarta.validation.constraints.NotNull;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.validation.annotation.Validated;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -36,11 +35,9 @@ import lombok.Setter;
 @Setter
 @Validated
 @Configuration
-@ConfigurationProperties(DownloadTokenProperties.PREFIX)
+@ConfigurationProperties("ozgcloud.auth.token")
 public class DownloadTokenProperties {
 
-	public static final String PREFIX = "kop.auth.token";
-
 	@NotNull
 	private String secret;
 	@NotNull
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java
index 10b952c0879fd0b642f6a87f3d87ef25e5412e67..d35bc6adfdeaec6971ac8cf0257effab3c7d4bd5 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserManagerProperties.java
@@ -32,11 +32,9 @@ import lombok.Setter;
 @Getter
 @Setter
 @Configuration
-@ConfigurationProperties(UserManagerProperties.PREFIX)
+@ConfigurationProperties("ozgcloud.user-manager")
 public class UserManagerProperties {
 
-	static final String PREFIX = "kop.user-manager";
-
 	private String url;
 	private String profileTemplate;
 	private String searchTemplate;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoProperties.java
index ce322fe853a45121017ad6689f1ab28de4ed344f..fe1af614d2d57ab408c27a227c5f976b6180c4dc 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoProperties.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoProperties.java
@@ -36,7 +36,7 @@ import lombok.Setter;
 @ConfigurationProperties(prefix = LandesnetzInfoProperties.LNINFO_CONFIG_PREFIX)
 public class LandesnetzInfoProperties {
 
-	static final String LNINFO_CONFIG_PREFIX = "kop.forwarding.lninfo";
+	static final String LNINFO_CONFIG_PREFIX = "ozgcloud.forwarding.lninfo";
 
 	/**
 	 * Url of LandesnetzInfo html/file location.
diff --git a/alfa-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/alfa-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 470f71f5ce1054953e99988a49b5ee195eb7e9da..8b996c6207d544d30d16e840e708210b8dbd2ff3 100644
--- a/alfa-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/alfa-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,6 +1,6 @@
 {"properties": [
   {
-    "name": "goofy.production",
+    "name": "ozgcloud.production",
     "type": "java.lang.Boolean",
     "description": "Enables/Disables the Angular production mode. (default: true)"
   },
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
index 922fccbd7e048ebf2bd42accbaeeaa418f55527d..154de97e2243536056b9502ea6eac01d37cc2306 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/EnvironmentControllerTest.java
@@ -39,6 +39,8 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
+import com.thedeanda.lorem.LoremIpsum;
+
 import de.ozgcloud.alfa.vorgang.VorgangProcessorProperties;
 import lombok.SneakyThrows;
 
@@ -49,7 +51,7 @@ class EnvironmentControllerTest {
 	@Mock
 	private OAuth2Properties oAuth2Properties;
 	@Mock
-	private GoofyProperties goofyProperties;
+	private ProductionProperties productionProperties;
 	@Mock
 	private VorgangProcessorProperties vorgangProcessorProperties;
 
@@ -59,54 +61,54 @@ class EnvironmentControllerTest {
 	void initTest() {
 		mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
 	}
-	
+
 	@DisplayName("Get frontend environment")
 	@Nested
 	class TestGetFrontendEnvironment {
-		
-		private static final String CLIENT = "goofy";
+
+		private static final String CLIENT = LoremIpsum.getInstance().getFirstName() + "Client";
 		private static final boolean PRODUCTION = true;
 		private static final String PROCESSOR_NAME = "dummyProcessorName";
-		
+
 		@BeforeEach
 		void init() {
-			when(goofyProperties.isProduction()).thenReturn(PRODUCTION);
+			when(productionProperties.isProduction()).thenReturn(PRODUCTION);
 			when(oAuth2Properties.getResource()).thenReturn(CLIENT);
 			when(vorgangProcessorProperties.getProcessorNames()).thenReturn(List.of(PROCESSOR_NAME));
 		}
-		
+
 		@SneakyThrows
 		@Test
 		void shouldReturnOk() {
 			var response = doRequest();
-			
+
 			response.andExpect(status().isOk());
 		}
-		
+
 		@SneakyThrows
 		@Test
 		void shouldHaveProductionTrueAsDefault() {
 			var response = doRequest();
-			
+
 			response.andExpect(jsonPath("$.production").value(PRODUCTION));
 		}
-		
+
 		@SneakyThrows
 		@Test
 		void shouldHaveClientId() {
 			var response = doRequest();
-			
+
 			response.andExpect(jsonPath("$.clientId").value(CLIENT));
 		}
-		
+
 		@SneakyThrows
 		@Test
 		void shouldHaveProcessorNames() {
 			var response = doRequest();
-			
+
 			response.andExpect(jsonPath("$.processorNames").value(PROCESSOR_NAME));
 		}
-		
+
 		@SneakyThrows
 		private ResultActions doRequest() {
 			return mockMvc.perform(get(EnvironmentController.BASE_PATH));
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java
index 7f4e77c539c032dd62f161fb90adb895c5f471fc..1f05611d705fd28d50d03dd9f9851d82c202ae83 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/UserProfileUrlProviderTestFactory.java
@@ -31,14 +31,14 @@ import org.springframework.core.env.Environment;
 public class UserProfileUrlProviderTestFactory {
 	public static final String ROOT_URL = "https://localhost";
 	public static final String USER_PROFILES_API_PATH = "/api/userProfiles/";
-	public static final String KOP_USER_MANAGER_PROFILE_TEMPLATE = "kop.user-manager.profile-template";
-	public static final String KOP_USER_MANAGER_URL = "kop.user-manager.url";
+	public static final String OZGCLOUD_USER_MANAGER_PROFILE_TEMPLATE = "ozgcloud.user-manager.profile-template";
+	public static final String OZGCLOUD_USER_MANAGER_URL = "ozgcloud.user-manager.url";
 
 	public static void initUserProfileUrlProvider(UserProfileUrlProvider urlProvider) {
 		ApplicationContext context = mock(ApplicationContext.class);
 		Environment environment = mock(Environment.class);
-		when(environment.getProperty(KOP_USER_MANAGER_URL)).thenReturn(ROOT_URL);
-		when(environment.getProperty(KOP_USER_MANAGER_PROFILE_TEMPLATE)).thenReturn(USER_PROFILES_API_PATH + "%s");
+		when(environment.getProperty(OZGCLOUD_USER_MANAGER_URL)).thenReturn(ROOT_URL);
+		when(environment.getProperty(OZGCLOUD_USER_MANAGER_PROFILE_TEMPLATE)).thenReturn(USER_PROFILES_API_PATH + "%s");
 		when(context.getEnvironment()).thenReturn(environment);
 		urlProvider.setApplicationContext(context);
 	}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileITCase.java
index 6a10133bb7a092eeae2289d4fe9002a4f608820c..dcc9f9afcf7b622d9ac9e5d2f12a1a60b3bb34c2 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileITCase.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileITCase.java
@@ -61,7 +61,6 @@ class BinaryFileITCase {
 	@Nested
 	class TestUploadFile {
 
-		private final String SINGLE_PATH = BinaryFileController.PATH + "/{vorgangId}/{field}/file";
 		private final CompletableFuture<FileId> future = CompletableFuture.completedFuture(BinaryFileTestFactory.FILE_ID);
 
 		public static final byte[] DATA_OVER_3_MB = BinaryFileTestFactory.createByteOfSize(DataSize.ofMegabytes(41));
@@ -117,7 +116,8 @@ class BinaryFileITCase {
 		}
 
 		private ResultActions callEndpoint(MockMultipartFile file, String field) throws Exception {
-			return mockMvc.perform(multipart(SINGLE_PATH, VorgangHeaderTestFactory.ID, field).file(file).with(csrf()));
+			return mockMvc.perform(
+					multipart(BinaryFileController.PATH + "/{vorgangId}/{field}/file", VorgangHeaderTestFactory.ID, field).file(file).with(csrf()));
 		}
 	}
 }
\ No newline at end of file
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceITCase.java
index 74d9ef6eda8bc319a8fd7dabdfad2065bbb0d109..9d9ef6c4a960fadc0929b753584afb1f23a0fcb0 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceITCase.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceITCase.java
@@ -104,7 +104,7 @@ class PostfachNachrichtPdfServiceITCase {
 
 		@SneakyThrows
 		private File createTempFile() {
-			var tempFile = File.createTempFile("kop_nachricht_", ".pdf");
+			var tempFile = File.createTempFile("ozgcloud_nachricht_", ".pdf");
 			// tempFile.deleteOnExit();
 			return tempFile;
 		}
@@ -142,8 +142,8 @@ class PostfachNachrichtPdfServiceITCase {
 
 	private Stream<PostfachNachrichtPdfData> buildPostfachMails() {
 		return Stream.of(PostfachNachrichtPdfDataTestFactory.createBuilder().subject("hase")
-				.attachmentNames(List.of("Hase.png", "Hasenlied.mscz", "Erweitertes-Führungszeugniß.pdf", "Haftbefehl.pdf"))
-				.build(),
+						.attachmentNames(List.of("Hase.png", "Hasenlied.mscz", "Erweitertes-Führungszeugniß.pdf", "Haftbefehl.pdf"))
+						.build(),
 				PostfachNachrichtPdfDataTestFactory.create(),
 				PostfachNachrichtPdfDataTestFactory.create(),
 				PostfachNachrichtPdfDataTestFactory.create(),
diff --git a/alfa-service/src/test/resources/application-itcase.yml b/alfa-service/src/test/resources/application-itcase.yml
index 9d197cc5d6fe6d4eed19ff1b6619c47ac3437ad2..1c95835f38581eb3d13df71356d9555392f68425 100644
--- a/alfa-service/src/test/resources/application-itcase.yml
+++ b/alfa-service/src/test/resources/application-itcase.yml
@@ -2,12 +2,12 @@ logging:
   level:
     ROOT: ERROR
     
-kop:
+ozgcloud:
+  upload:
+    maxFileSize:
+      postfachNachrichtAttachment: 3MB
   user-manager:
     url: https://localhost
     internalurl: http://localhost:8080
     search-template: /api/userProfiles/?searchBy={searchBy}
     profile-template: /api/userProfiles/%s
-  upload:
-    maxFileSize:
-      postfachNachrichtAttachment: 3MB
diff --git a/alfa-service/src/test/resources/application.yml b/alfa-service/src/test/resources/application.yml
index 7925f8d6a9baaab13a82ac25aadad73b0760a63b..65c942011bb932da35071c80d984159fac487f22 100644
--- a/alfa-service/src/test/resources/application.yml
+++ b/alfa-service/src/test/resources/application.yml
@@ -1,16 +1,27 @@
 logging:
   level:
     ROOT: WARN
-    '[de.itvsh]': INFO
     '[de.ozgcloud]': INFO,
     '[org.springframework.security]': WARN
 
-
 ozgcloud:
-   keycloak:
-      auth-server-url: https://sso.dev.by.ozg-cloud.de
-      realm: by-kiel-dev
-      resource: ${jwt.auth.converter.resource-id}
+  auth:
+    token:
+      secret: XPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6Ywoir
+      validity: 60000
+  keycloak:
+    auth-server-url: https://sso.dev.by.ozg-cloud.de
+    realm: by-kiel-dev
+    resource: ${jwt.auth.converter.resource-id}
+  production: true
+  upload:
+    maxFileSize:
+      postfachNachrichtAttachment: 3MB
+      wiedervorlageAttachment: 40MB
+  user-manager:
+    url: https://localhost
+    profile-template: /api/userProfiles/%s
+    search-template: /api/userProfiles/?searchBy={searchBy}
       
 jwt:
   auth:
@@ -66,9 +77,6 @@ management:
     web:
       exposure:
         include: health,prometheus
-
-goofy:
-  production: true
     
 grpc:
   client:
@@ -77,18 +85,4 @@ grpc:
       negotiationType: PLAINTEXT
     user-manager:
       address: static://127.0.0.1:9000
-      negotiationType: TLS
-
-kop:
-  auth:
-    token:
-      secret: XPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6Ywoir
-      validity: 60000
-  upload:
-    maxFileSize:
-      postfachNachrichtAttachment: 3MB
-      wiedervorlageAttachment: 40MB
-  user-manager:
-    url: https://localhost
-    profile-template: /api/userProfiles/%s
-    search-template: /api/userProfiles/?searchBy={searchBy}
\ No newline at end of file
+      negotiationType: TLS
\ No newline at end of file
diff --git a/src/main/helm/Chart.yaml b/src/main/helm/Chart.yaml
index fbca5dd58e237a28ca637abcc0f33d8af70b39e9..57827741a713d3dca92265712d74efbeccf17dcb 100644
--- a/src/main/helm/Chart.yaml
+++ b/src/main/helm/Chart.yaml
@@ -24,7 +24,7 @@
 
 apiVersion: v1
 appVersion: "1.1"
-description: A Helm chart for Goofy
-name: goofy
+description: A Helm chart for Alfa
+name: alfa
 version: 0.0.0-MANAGED-BY-JENKINS
 icon: https://simpleicons.org/icons/helm.svg
diff --git a/src/main/helm/questions.yml b/src/main/helm/questions.yml
index 95c88220da6364cd02ae6bae0301326fc3c0fa6b..60159a956b42a75825164b2c24e70b0f663df030 100644
--- a/src/main/helm/questions.yml
+++ b/src/main/helm/questions.yml
@@ -37,18 +37,18 @@ questions:
     type: string
     label: "Override Spring boot profile"
     group: "Container"
-  - variable: kop.bundesland
-    group: "KOP"
+  - variable: ozgcloud.bundesland
+    group: "OZGCLOUD"
     label: Bundesland
     type: string
     required: true
-  - variable: kop.bezeichner
-    group: "KOP"
+  - variable: ozgcloud.bezeichner
+    group: "OZGCLOUD"
     label: "Bezeichner"
     type: string
     required: true
-  - variable: kop.environment
-    group: "KOP"
+  - variable: ozgcloud.environment
+    group: "OZGCLOUD"
     label: "Environment"
     type: string
     required: true
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 7cfd9d05f657e491f6c5c86c74144f6e5ac017ff..1eabdba9907ff2565195931b804ae2873f45248d 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -28,10 +28,10 @@
 
 {{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}}
 {{- define "app.defaultLabels" }}
-app.kubernetes.io/instance: goofy
+app.kubernetes.io/instance: alfa
 app.kubernetes.io/managed-by: {{ include "app.managedBy" . }}
 app.kubernetes.io/name: {{ include "app.name" . }}
-app.kubernetes.io/part-of: kop
+app.kubernetes.io/part-of: ozgcloud
 app.kubernetes.io/version: {{ include "app.version" . }}
 app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 helm.sh/chart: {{ include "app.chart" . }}
@@ -46,7 +46,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- if (.Values.env).overrideSpringProfiles -}}
 {{ printf "%s" (.Values.env).overrideSpringProfiles }}
 {{- else -}}
-{{ printf "oc, %s" (include "app.kopEnvironment" . ) }}
+{{ printf "oc, %s" (include "app.ozgcloudEnvironment" . ) }}
 {{- end -}}
 {{- end -}}
 
@@ -58,11 +58,11 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{ printf "%s.%s:9000" ( coalesce .Values.usermanagerName "user-manager" ) .Release.Namespace }}
 {{- end -}}
 
-{{- define "app.kop_user-manager_url" -}}
+{{- define "app.ozgcloud_user-manager_url" -}}
 {{- if (.Values).usermanagerUrl -}}
 {{ printf "%s" (.Values).usermanagerUrl }}
 {{- else -}}
-{{ printf "https://%s-%s.%s" (include "app.kopBezeichner" .) .Values.usermanagerName .Values.baseUrl }}
+{{ printf "https://%s-%s.%s" (include "app.ozgcloudBezeichner" .) .Values.usermanagerName .Values.baseUrl }}
 {{- end -}}
 {{- end -}}
 
@@ -72,25 +72,25 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end }}
 {{- end }}
 
-{{- define "app.kopBundesland" -}}
-{{- required "Bundesland muss angegeben sein" (.Values.kop).bundesland }}
+{{- define "app.ozgcloudBundesland" -}}
+{{- required "Bundesland muss angegeben sein" (.Values.ozgcloud).bundesland }}
 {{- end -}}
 
-{{- define "app.kopBezeichner" -}}
-{{ $length := len (.Values.kop).bezeichner }}
+{{- define "app.ozgcloudBezeichner" -}}
+{{ $length := len (.Values.ozgcloud).bezeichner }}
 {{- if ge 27 $length -}}
-{{- required "Bezeichner muss angegeben sein" (.Values.kop).bezeichner -}}
+{{- required "Bezeichner muss angegeben sein" (.Values.ozgcloud).bezeichner -}}
 {{- else -}}
-{{ required (printf "Bezeichner %s ist zu lang (max. 27 Zeichen)" (.Values.kop).bezeichner) nil }}
+{{ required (printf "Bezeichner %s ist zu lang (max. 27 Zeichen)" (.Values.ozgcloud).bezeichner) nil }}
 {{- end -}}
 {{- end -}}
 
-{{- define "app.kopEnvironment" -}}
-{{- required "Environment muss angegeben sein" (.Values.kop).environment -}}
+{{- define "app.ozgcloudEnvironment" -}}
+{{- required "Environment muss angegeben sein" (.Values.ozgcloud).environment -}}
 {{- end -}}
 
 {{- define "app.ssoRealm" -}}
-{{ printf "%s-%s-%s" (include "app.kopBundesland" .) ( include "app.kopBezeichner" . ) ( include "app.kopEnvironment" . ) | trunc 63 | trimSuffix "-" }}
+{{ printf "%s-%s-%s" (include "app.ozgcloudBundesland" .) ( include "app.ozgcloudBezeichner" . ) ( include "app.ozgcloudEnvironment" . ) | trunc 63 | trimSuffix "-" }}
 {{- end -}}
 
 {{- define "app.ssoClientName" -}}
@@ -104,10 +104,10 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- define "app.ssoRealmDisplayName" -}}
 {{- if (.Values.sso).displayName -}}
 {{ printf "%s" (.Values.sso).displayName }}
-{{- else if eq (include "app.kopEnvironment" . ) "prod" -}}
-{{ printf "Realm für %s" (include "app.kopBezeichner" . | title ) }}
+{{- else if eq (include "app.ozgcloudEnvironment" . ) "prod" -}}
+{{ printf "Realm für %s" (include "app.ozgcloudBezeichner" . | title ) }}
 {{- else -}}
-{{ printf "Realm für %s (%s)" (include "app.kopBezeichner" . | title ) (include "app.kopEnvironment" .) }}
+{{ printf "Realm für %s (%s)" (include "app.ozgcloudBezeichner" . | title ) (include "app.ozgcloudEnvironment" .) }}
 {{- end -}}
 {{- end -}}
 
@@ -116,7 +116,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.baseUrl" -}}
-{{ printf "https://%s.%s" (include "app.kopBezeichner" .) .Values.baseUrl }}
+{{ printf "https://%s.%s" (include "app.ozgcloudBezeichner" .) .Values.baseUrl }}
 {{- end -}}
 
 {{- define "app.generateKeycloakGroupRessourceName" -}}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index a8f02ec54ef44fa7b65ff6472f5184df667f2bef..003bfc9a9616eaffb78f8ad2acd41e65b43e99ed 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
     metadata:
       labels:
         {{- include "app.defaultLabels" . | indent 8 }}
-        component: goofy
+        component: alfa
     spec:
       topologySpreadConstraints:
       - maxSkew: 1
@@ -59,7 +59,7 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
-              - key: goofyable
+              - key: alfaable
                 operator: NotIn
                 values:
                 - "false"
@@ -79,8 +79,8 @@ spec:
           value: {{ include "app.ssoClientName" . }}
         - name: keycloak_auth-server-url
           value: {{ include "app.ssoServerUrl" . }}
-        - name: kop_user-manager_url
-          value: {{ include "app.kop_user-manager_url" . }}
+        - name: ozgcloud_user-manager_url
+          value: {{ include "app.ozgcloud_user-manager_url" . }}
         {{- if (((.Values.ozgcloud).user_assistance).documentation).url }}
         - name: ozgcloud_user-assistance_documentation_url
           value: {{ .Values.ozgcloud.user_assistance.documentation.url }}
@@ -99,7 +99,7 @@ spec:
 
         image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
         imagePullPolicy: Always
-        name: goofy
+        name: alfa
         ports:
         - containerPort: 8080
           name: 8080tcp1
@@ -162,7 +162,7 @@ spec:
       dnsConfig: {}
       dnsPolicy: ClusterFirst
       imagePullSecrets:
-      - name: goofy-image-pull-secret
+      - name: alfa-image-pull-secret
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
diff --git a/src/main/helm/templates/image-pull-secret.yaml b/src/main/helm/templates/image-pull-secret.yaml
index 54df3e3d0146c762c97344b8113a9b13149aeabe..5703ac4e5dd6cf2256d0502c5d5dc4bac6237b9e 100644
--- a/src/main/helm/templates/image-pull-secret.yaml
+++ b/src/main/helm/templates/image-pull-secret.yaml
@@ -25,7 +25,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: goofy-image-pull-secret
+  name: alfa-image-pull-secret
   namespace: {{ include "app.namespace" . }}
 type: kubernetes.io/dockerconfigjson
 data:
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index da1a9789fb1dc5410f6fb8cf5a65bc58d201eeda..99f46917b63acea9d1f90c0121fdc11955e6ebd2 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -53,5 +53,5 @@ spec:
     - hosts:
       - {{ trimPrefix "https://" ( include "app.baseUrl" . ) }}
       {{- if ne (.Values).cluster_env "dataport" }}
-      secretName: {{ .Values.kop.bezeichner }}-{{ include "app.name" . }}-tls
+      secretName: {{ .Values.ozgcloud.bezeichner }}-{{ include "app.name" . }}-tls
       {{- end }}
\ No newline at end of file
diff --git a/src/main/helm/templates/keycloak-client-crd.yaml b/src/main/helm/templates/keycloak-client-crd.yaml
index 1e5509d9114b14284a7e5f49361332832cff0107..f4873456d347c5ed937abb82a5ab8df24784c583 100644
--- a/src/main/helm/templates/keycloak-client-crd.yaml
+++ b/src/main/helm/templates/keycloak-client-crd.yaml
@@ -1,8 +1,8 @@
 {{ range $client := .Values.sso.keycloak_clients }}
 ---
-{{- if $client.kopOperator }}
-apiVersion: api.kop-stack.de/v1
-kind: KopKeycloakClient
+{{- if $client.ozgcloudOperator }}
+apiVersion: api.ozgcloud-stack.de/v1
+kind: OzgcloudKeycloakClient
 {{- else }}
 apiVersion: operator.ozgcloud.de/v1
 kind: OzgKeycloakClient
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 77478164fd9742c2e690fdd23f4f4f45940660e1..59e83c22a9cfea4aa649be131318a0ea87c38ad1 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   podSelector:
     matchLabels:
-      component: goofy
+      component: alfa
   policyTypes:
     - Ingress
     - Egress
diff --git a/src/main/helm/templates/service.yaml b/src/main/helm/templates/service.yaml
index bd6bd2ea3f5df3d5c0bd8423c47946f74ba0abf2..a4e5af637451bc9bec57890ac033cdb94e2d941a 100644
--- a/src/main/helm/templates/service.yaml
+++ b/src/main/helm/templates/service.yaml
@@ -29,7 +29,7 @@ metadata:
   namespace: {{ include "app.namespace" . }}
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
-    component: goofy-service
+    component: alfa-service
 spec:
   type: ClusterIP
   ports:
@@ -42,4 +42,4 @@ spec:
       protocol: TCP
   selector:
     {{- include "app.matchLabels" . | indent 4 }}
-    component: goofy
\ No newline at end of file
+    component: alfa
\ No newline at end of file
diff --git a/src/main/helm/templates/service_monitor.yaml b/src/main/helm/templates/service_monitor.yaml
index 970f00c68b7a5430f89df5a10d11730dcc6e5a97..2a5a656bbf5bb18e0aeb56b98c093ee2ab64fec2 100644
--- a/src/main/helm/templates/service_monitor.yaml
+++ b/src/main/helm/templates/service_monitor.yaml
@@ -29,7 +29,7 @@ metadata:
   namespace: {{ include "app.namespace" . }}
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
-    component: goofy-service-monitor
+    component: alfa-service-monitor
 spec:
   endpoints:
   - port: metrics
@@ -40,4 +40,4 @@ spec:
   selector:
     matchLabels:
       {{- include "app.matchLabels" . | indent 6 }}
-      component: goofy-service
\ No newline at end of file
+      component: alfa-service
\ No newline at end of file
diff --git a/src/main/helm/test-values.yaml b/src/main/helm/test-values.yaml
index 5e0d96cfcd9e5ccfc978a3f7f9693adb0f11fdd4..4237e8897946bb2a46d9b43317051d43a9a9e4f8 100644
--- a/src/main/helm/test-values.yaml
+++ b/src/main/helm/test-values.yaml
@@ -22,7 +22,7 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-kop:
+ozgcloud:
   bundesland: sh
   bezeichner: helm
   environment: test
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index a0cf3cd9c8e780bf0583d4cb9c32325ab092c5cb..f9191eeb7ced341e8dce26d0e91c2903dbcd2ac2 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -31,13 +31,13 @@ sso:
 
 imageCredentials:
   registry: docker.ozg-sh.de
-  username: kop
+  username: ozgcloud
   password:  
   email: webmaster@ozg-sh.de
 
 image:
   repo: docker.ozg-sh.de
-  name: goofy
+  name: alfa
   tag: latest # [default: latest]
 
 replicaCount: 2 # [default: 2]
@@ -68,7 +68,7 @@ usermanagerName: user-manager
   # displayName: "Hüttener Berge" [default: "Realm für <sso.name> (<sso.level>"] The custom display name to write on top of the login page.
 
 
-# kop:
+# ozgcloud:
 #   bundesland: sh
 #   bezeichner: kiel
 #   environment: dev
diff --git a/src/test/helm/deployment_bindings_test.yaml b/src/test/helm/deployment_bindings_test.yaml
index b10cfb4fffe37fe5749a6cb2e38a6f946d6f304a..c15ba1620117f2c0ed7087d45c0a266228fc0a1a 100644
--- a/src/test/helm/deployment_bindings_test.yaml
+++ b/src/test/helm/deployment_bindings_test.yaml
@@ -24,7 +24,7 @@
 
 suite: deployment bindings
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
diff --git a/src/test/helm/deployment_defaults_affinity_test.yaml b/src/test/helm/deployment_defaults_affinity_test.yaml
index 93278a198ab13d8c8226fc68fc25544124f8988c..54c1a8f89d582f1e69c033de1c4188cfa9ad58df 100644
--- a/src/test/helm/deployment_defaults_affinity_test.yaml
+++ b/src/test/helm/deployment_defaults_affinity_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -35,7 +35,7 @@ tests:
           of: Deployment
       - equal:
           path: spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key
-          value: goofyable
+          value: alfaable
       - equal:
           path: spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator
           value: NotIn
diff --git a/src/test/helm/deployment_defaults_annotaion_test.yaml b/src/test/helm/deployment_defaults_annotaion_test.yaml
index d6e0e9326efbcf9be4203d604b13971435e6b0a2..311f2d9b66dd9dd35454e6069218540eb39242b5 100644
--- a/src/test/helm/deployment_defaults_annotaion_test.yaml
+++ b/src/test/helm/deployment_defaults_annotaion_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/ingress.yaml
@@ -40,4 +40,4 @@ tests:
           path: spec.ingressClassName
       - equal:
           path: spec.tls[0].secretName
-          value: helm-goofy-tls
+          value: helm-alfa-tls
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index 473341be65848b9ddef1c42b6992a27c3a357f6b..f0dee202346c76fd2d05240b1db0f05ae425850f 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -24,7 +24,7 @@
 
 suite: deployment env
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index d752ae70e1a49ee6b32842944410940e0e227761..4cef56cb17882d9c1fc65dab21ffeafa2ba60eec 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -35,13 +35,13 @@ tests:
     asserts:
       - equal:
           path: metadata.labels.[app.kubernetes.io/instance]
-          value: goofy
+          value: alfa
       - equal:
           path: metadata.labels.[app.kubernetes.io/name]
-          value: goofy
+          value: alfa
       - equal:
           path: metadata.labels.[app.kubernetes.io/part-of]
-          value: kop
+          value: ozgcloud
       - equal:
           path: metadata.labels.[app.kubernetes.io/namespace]
           value: sh-helm-test
diff --git a/src/test/helm/deployment_defaults_spec_containers_health_test.yaml b/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
index 3cd90d8cc1f932742889d036d98b5c9ea936725b..94ba8b1e756aff1ba138b819c0ed1485bb74722b 100644
--- a/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
diff --git a/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml b/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
index 3cd71b32b45f0dc4ef9828b53de7506b9441b0e4..ca3da3f1d8788db76b62da17dcf6f5e074c2b0d3 100644
--- a/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
diff --git a/src/test/helm/deployment_defaults_spec_containers_test.yaml b/src/test/helm/deployment_defaults_spec_containers_test.yaml
index 47843c25e6509fa63baeeb0be7668bdbcf7040af..2fc83108825e116fb6c845c3c4b7863ff10f93d4 100644
--- a/src/test/helm/deployment_defaults_spec_containers_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -35,13 +35,13 @@ tests:
           of: Deployment
       - equal:
           path: spec.template.spec.containers[0].image
-          value: "docker.ozg-sh.de/goofy:snapshot-latest"
+          value: "docker.ozg-sh.de/alfa:snapshot-latest"
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy
           value: Always
       - equal:
           path: spec.template.spec.containers[0].name
-          value: goofy
+          value: alfa
       - equal:
           path: spec.template.spec.containers[0].ports[0].containerPort
           value: 8080
diff --git a/src/test/helm/deployment_defaults_spec_test.yaml b/src/test/helm/deployment_defaults_spec_test.yaml
index 54e6630b52b0b7fa37ec18c76b8efa2bc4e3213e..bda0c0df14063137c9e06ccf8d4423e63103dcb1 100644
--- a/src/test/helm/deployment_defaults_spec_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -44,7 +44,7 @@ tests:
           value: 10
       - equal:
           path: spec.selector.matchLabels.[app.kubernetes.io/name]
-          value: goofy
+          value: alfa
       - equal:
           path: spec.selector.matchLabels.[app.kubernetes.io/namespace]
           value: sh-helm-test
@@ -62,7 +62,7 @@ tests:
           value: ClusterFirst
       - equal:
           path: spec.template.spec.imagePullSecrets[0].name
-          value: goofy-image-pull-secret
+          value: alfa-image-pull-secret
       - equal:
           path: spec.template.spec.restartPolicy
           value: Always
diff --git a/src/test/helm/deployment_defaults_sso_test.yaml b/src/test/helm/deployment_defaults_sso_test.yaml
index 9b99145edecf163a2fbf397f14aca28709d70e88..9c4c14df0eeb7a01c11b572a386ae7634cbeed17 100644
--- a/src/test/helm/deployment_defaults_sso_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -51,7 +51,7 @@ tests:
 
   - it: check realm with long namespace
     set:
-      kop.bezeichner: eins-zwei-drei
+      ozgcloud.bezeichner: eins-zwei-drei
     asserts:
       - isKind:
           of: Deployment
diff --git a/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml b/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
index 7f2759a4a35d4576bbd864013d6098430e490287..bd7726196ac9edb79156c4f212dd05896a5fc4f3 100644
--- a/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
+++ b/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -44,4 +44,4 @@ tests:
           value: ScheduleAnyway
       - equal:
           path: spec.template.spec.topologySpreadConstraints[0].labelSelector.matchLabels.[app.kubernetes.io/name]
-          value: goofy
\ No newline at end of file
+          value: alfa
\ No newline at end of file
diff --git a/src/test/helm/deployment_imageTag_test.yaml b/src/test/helm/deployment_imageTag_test.yaml
index e420be1787ef94a33c306e49dcb5751eedfb7863..50a7ad7f6a511cb87e9024ddae0264c980d3c66d 100644
--- a/src/test/helm/deployment_imageTag_test.yaml
+++ b/src/test/helm/deployment_imageTag_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -37,4 +37,4 @@ tests:
           of: Deployment
       - equal:
           path: spec.template.spec.containers[0].image
-          value: docker.ozg-sh.de/goofy:latest
\ No newline at end of file
+          value: docker.ozg-sh.de/alfa:latest
\ No newline at end of file
diff --git a/src/test/helm/deployment_pluto_address_test.yaml b/src/test/helm/deployment_pluto_address_test.yaml
index c42fb27b3f3c1261e23be4d0c633e2d2837b9b98..ed81b0fc6284bbdbc03f61f38a2893277e314537 100644
--- a/src/test/helm/deployment_pluto_address_test.yaml
+++ b/src/test/helm/deployment_pluto_address_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
diff --git a/src/test/helm/deployment_replicas_test.yaml b/src/test/helm/deployment_replicas_test.yaml
index 1ac8fb5da71a824d8fbda40f8101c8fdb2275dbf..84c496ab9940be7242dba7d9a9fb38e86eef3780 100644
--- a/src/test/helm/deployment_replicas_test.yaml
+++ b/src/test/helm/deployment_replicas_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 25c11dc5b7e7a63038588a36f3fb23d442a5e753..f47aed0e61dfb1a345c0a9c4f0eb62f8a25451f7 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
 templates:
   - templates/deployment.yaml
 tests:
diff --git a/src/test/helm/deployment_springProfile_test.yaml b/src/test/helm/deployment_springProfile_test.yaml
index dfe87cea0813e64b582c9c313069f7d41ee93eaf..4e0548977fa5431d027e99de8d1cfb29e35dd835 100644
--- a/src/test/helm/deployment_springProfile_test.yaml
+++ b/src/test/helm/deployment_springProfile_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
diff --git a/src/test/helm/deployment_usermanager_address_test.yaml b/src/test/helm/deployment_usermanager_address_test.yaml
index 9f9242686a9ba14a13c716d7e56b7d868ef45e2f..a1b0246dec4d70e766fe6d507fdf736eb7bfcf18 100644
--- a/src/test/helm/deployment_usermanager_address_test.yaml
+++ b/src/test/helm/deployment_usermanager_address_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -36,7 +36,7 @@ tests:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: kop_user-manager_url
+            name: ozgcloud_user-manager_url
             value: https://helm-my-test-usermanager-name.test.sh.ozg-cloud.de
   - it: should use usermanager url from values
     set:
@@ -45,5 +45,5 @@ tests:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: kop_user-manager_url
+            name: ozgcloud_user-manager_url
             value: http://test.domain.local
diff --git a/src/test/helm/ingress-nginx-tests.yaml b/src/test/helm/ingress-nginx-tests.yaml
index 2e897d49e43ecbe692ca4d40770e6ddc0603dfae..6d092d18ef73a3714bf3fa6b2c5a6f8a29f1c615 100644
--- a/src/test/helm/ingress-nginx-tests.yaml
+++ b/src/test/helm/ingress-nginx-tests.yaml
@@ -24,7 +24,7 @@
 
 suite: test ingress options
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/ingress.yaml
@@ -33,7 +33,7 @@ tests:
     asserts:
       - equal:
           path: spec.tls[0].secretName
-          value: helm-goofy-tls
+          value: helm-alfa-tls
 
   - it: should not create ingress tls/ingressClass
     set:
diff --git a/src/test/helm/keycloak-client-crd-test.yaml b/src/test/helm/keycloak-client-crd-test.yaml
index 37334dedbf0deeb11c289c0a84747793d4877096..b1a89c21786809e5884a8acc61f31c41a08e117a 100644
--- a/src/test/helm/keycloak-client-crd-test.yaml
+++ b/src/test/helm/keycloak-client-crd-test.yaml
@@ -24,7 +24,7 @@
 
 suite: Keycloak Client crd
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/keycloak-client-crd.yaml
@@ -59,15 +59,15 @@ tests:
              kopOperator: true
     asserts:
       - isAPIVersion:
-          of: api.kop-stack.de/v1
+          of: api.ozgcloud-stack.de/v1
       - isKind:
-          of: KopKeycloakClient
-  - it: should have annotations for kopOperator
+          of: OzgcloudKeycloakClient
+  - it: should have annotations for ozgcloudOperator
     set:
       sso:
         keycloak_clients:
           - client_name: alfa
-            kopOperator: true
+            ozgcloudOperator: true
     asserts:
       - equal:
           path: metadata.annotations.[helm.sh/resource-policy]
@@ -75,7 +75,7 @@ tests:
   - it: should have default Values
     set:
       baseUrl: test.by.ozg-cloud.de
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -105,7 +105,7 @@ tests:
   - it: should override default redirect uris
     set:
       baseUrl: test.by.ozg-cloud.de
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -137,7 +137,7 @@ tests:
   - it: should contain additional redirect uris
     set:
       baseUrl: test.by.ozg-cloud.de
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -169,7 +169,7 @@ tests:
   - it: should contain client roles
     set:
       baseUrl: test.by.ozg-cloud.de
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -202,7 +202,7 @@ tests:
   - it: should map client protocol mapper
     set:
       baseUrl: test.by.ozg-cloud.de
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
diff --git a/src/test/helm/keycloak-crd-test.yaml b/src/test/helm/keycloak-crd-test.yaml
index 999005b02c3a2b89d1f6886de1d7010f10b63838..5dc0ab1ee61151906906ddf32f314b23e6b3cd46 100644
--- a/src/test/helm/keycloak-crd-test.yaml
+++ b/src/test/helm/keycloak-crd-test.yaml
@@ -24,7 +24,7 @@
 
 suite: Keycloak crd
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/keycloak-crd.yaml
diff --git a/src/test/helm/keycloak-group-crd-test.yaml b/src/test/helm/keycloak-group-crd-test.yaml
index a875ce9f036af394247de986306042241fc78094..13cd56118c820dbb33a70e2132bbca063e6a1f77 100644
--- a/src/test/helm/keycloak-group-crd-test.yaml
+++ b/src/test/helm/keycloak-group-crd-test.yaml
@@ -24,7 +24,7 @@
 
 suite: Keycloak Group crd
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/keycloak-group-crd.yaml
@@ -65,7 +65,7 @@ tests:
           value: false
   - it: should have Keycloak Group without attributes
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -85,7 +85,7 @@ tests:
           path: spec.group_attributes
   - it: should have Keycloak Group with attributes
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -111,7 +111,7 @@ tests:
             value: 1234
   - it: should have Keycloak Group with two attributes
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -138,7 +138,7 @@ tests:
               value: 2Zwei
   - it: should contain two Keycloak Groups
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -170,7 +170,7 @@ tests:
         documentIndex: 1
   - it: should have valid ressource name
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
diff --git a/src/test/helm/keycloak-user-crd-test.yaml b/src/test/helm/keycloak-user-crd-test.yaml
index 96c969d9347d12053d8ca8e114b6748d6d91120d..8d33dc1f26ebd8eb6a98f5c41ca13f2973be168e 100644
--- a/src/test/helm/keycloak-user-crd-test.yaml
+++ b/src/test/helm/keycloak-user-crd-test.yaml
@@ -24,7 +24,7 @@
 
 suite: Keycloak User crd
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/keycloak-user-crd.yaml
@@ -53,7 +53,7 @@ tests:
           value: by-helm-test
   - it: should have default Values
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -84,7 +84,7 @@ tests:
 
   - it: should have Keycloak User without roles
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -120,7 +120,7 @@ tests:
 
   - it: should have Keycloak User with client role
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -162,7 +162,7 @@ tests:
 
   - it: should have Keycloak User with realm role
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -202,7 +202,7 @@ tests:
 
   - it: should have Keycloak User with group
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -242,7 +242,7 @@ tests:
 
   - it: should have Keycloak API User without roles
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -278,7 +278,7 @@ tests:
 
   - it: should have Keycloak API User with client role
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -320,7 +320,7 @@ tests:
 
   - it: should have Keycloak API User with realm role
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -360,7 +360,7 @@ tests:
 
   - it: should have Keycloak API User with group
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -400,7 +400,7 @@ tests:
 
   - it: should have Keycloak User and Keycloak API User
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -501,7 +501,7 @@ tests:
 
   - it: should have lowercase username
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -533,9 +533,9 @@ tests:
       - isNull:
           path: spec.keycloak_user.client_roles
 
-  - it: should use kopOperator
+  - it: should use ozgcloudOperator
     set:
-      kop:
+      ozgcloud:
         bundesland: by
         bezeichner: helm
         environment: test
@@ -545,12 +545,12 @@ tests:
             kopOperator: true
     asserts:
       - isAPIVersion:
-          of: api.kop-stack.de/v1
+          of: api.ozgcloud-stack.de/v1
       - isKind:
-          of: KopKeycloakUser
+          of: OzgcloudKeycloakUser
       - equal:
           path: spec.keycloak_user.username
-          value: kop
+          value: ozgcloud
       - equal:
           path: metadata.annotations.[helm.sh/resource-policy]
           value: keep
\ No newline at end of file
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index 41084a72f06effa70d5976f733e7fc6b1c4d7032..1f1d32e794926142865db4ffab1ea1813e35fe75 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -51,7 +51,7 @@ tests:
           value:
             podSelector:
               matchLabels:
-                component: goofy
+                component: alfa
             policyTypes:
               - Ingress
               - Egress
diff --git a/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml b/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
index d2977f33b066628e56523675f4c962358fd8a416..9b23c7d5fdb137b021925e01d25df3753041b925 100644
--- a/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
+++ b/src/test/helm/ozg_operator_secrets_read_role_binding_test.yaml
@@ -1,6 +1,6 @@
 suite: test ozg_operator_secrets_read_role_binding
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/ozg_operator_secrets_read_role_binding.yaml
diff --git a/src/test/helm/ozg_operator_secrets_read_role_test.yaml b/src/test/helm/ozg_operator_secrets_read_role_test.yaml
index dd4a1fc3fe52e71eef5d2b60483d1bf57e7068aa..d96e2437115fca748c952d3009a84c740d9237ac 100644
--- a/src/test/helm/ozg_operator_secrets_read_role_test.yaml
+++ b/src/test/helm/ozg_operator_secrets_read_role_test.yaml
@@ -1,6 +1,6 @@
 suite: test ozg_operator_secrets_read_role
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/ozg_operator_secrets_read_role.yaml
diff --git a/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml b/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
index f240278fcf72529762b4d3ac4650f9f23aabb0fb..3402bf88f4bf59989d0fd1a0110bfb82e122ec4f 100644
--- a/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
+++ b/src/test/helm/ozg_operator_secrets_write_role_binding_test.yaml
@@ -1,6 +1,6 @@
 suite: test ozg_operator_secrets_role_binding
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/ozg_operator_secrets_write_role_binding.yaml
diff --git a/src/test/helm/ozg_operator_secrets_write_role_test.yaml b/src/test/helm/ozg_operator_secrets_write_role_test.yaml
index 58c0ea4fa48f51f6ad92e2ef076ea1fbf90b1e8e..0c08c0a8aef78ecd5a75ac46f388a459eee9bfac 100644
--- a/src/test/helm/ozg_operator_secrets_write_role_test.yaml
+++ b/src/test/helm/ozg_operator_secrets_write_role_test.yaml
@@ -1,6 +1,6 @@
 suite: test ozg_operator_secrets_write_role
 release:
-  name: goofy
+  name: alfa
   namespace: by-helm-test
 templates:
   - templates/ozg_operator_secrets_write_role.yaml
diff --git a/src/test/helm/service_monitor_test.yaml b/src/test/helm/service_monitor_test.yaml
index 689becee8c464f67dbd0d16218019d2e22ebdad9..fcfb12b4b4ed934b6938f113a6af62ca7098bfc4 100644
--- a/src/test/helm/service_monitor_test.yaml
+++ b/src/test/helm/service_monitor_test.yaml
@@ -24,18 +24,18 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: sh-helm-test
 templates:
   - templates/service_monitor.yaml
 tests:
-  - it: should have the label component with value goofy-service-monitor attached
+  - it: should have the label component with value alfa-service-monitor attached
     asserts:
       - isKind:
           of: ServiceMonitor
       - equal:
           path: metadata.labels.[component]
-          value: goofy-service-monitor
+          value: alfa-service-monitor
   - it: should have the metrics endpoint configured by default
     set:
       env.springProfiles: oc,stage
@@ -61,16 +61,16 @@ tests:
       - contains:
           path: spec.namespaceSelector.matchNames
           content: sh-helm-test
-  - it: selector should contain the component label with the value goofy-service
+  - it: selector should contain the component label with the value alfa-service
     asserts:
       - equal:
           path: spec.selector.matchLabels.[component]
-          value: goofy-service
+          value: alfa-service
   - it: selector should contain helm recommended labels name and namespace
     asserts:
       - equal:
           path: spec.selector.matchLabels.[app.kubernetes.io/name]
-          value: goofy
+          value: alfa
       - equal:
           path: spec.selector.matchLabels.[app.kubernetes.io/namespace]
           value: sh-helm-test
diff --git a/src/test/helm/service_test.yaml b/src/test/helm/service_test.yaml
index 2db429129e73bcfe0c461e3c944bfac6e4daaee3..5c32bce0f5c1cc7cb2d411238916c5a4fbaaaa9e 100644
--- a/src/test/helm/service_test.yaml
+++ b/src/test/helm/service_test.yaml
@@ -24,18 +24,18 @@
 
 suite: test deployment
 release:
-  name: goofy
+  name: alfa
   namespace: helm-test
 templates:
   - templates/service.yaml
 tests:
-  - it: should have the label component with value goofy-service attached
+  - it: should have the label component with value alfa-service attached
     asserts:
       - isKind:
           of: Service
       - equal:
           path: metadata.labels.[component]
-          value: goofy-service
+          value: alfa-service
   - it: should be of type ClusterIP
     asserts:
       - equal:
@@ -62,16 +62,16 @@ tests:
             protocol: TCP
         count: 1
         any: true
-  - it: selector should contain the component label with the value goofy
+  - it: selector should contain the component label with the value alfa
     asserts:
       - equal:
           path: spec.selector.[component]
-          value: goofy
+          value: alfa
   - it: selector should contain helm recommended labels name and namespace
     asserts:
       - equal:
           path: spec.selector.[app.kubernetes.io/name]
-          value: goofy
+          value: alfa
       - equal:
           path: spec.selector.[app.kubernetes.io/namespace]
           value: helm-test
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index 6c5987680755f9da71b83bdae5c4c4595b9ce458..53cb775ef7ca1e4654128e8facd45cf70c36b2e6 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -28,7 +28,7 @@ replicaCount: 5
 plutoName: pluto
 usermanagerName: my-test-usermanager-name
 
-kop:
+ozgcloud:
   bundesland: sh
   bezeichner: helm
   environment: test
@@ -40,7 +40,7 @@ sso:
 baseUrl: test.sh.ozg-cloud.de
 
 image:
-  path: docker.ozg-sh.de/goofy
+  path: docker.ozg-sh.de/alfa
   tag: snapshot-latest
 
 networkPolicy: