diff --git a/Jenkinsfile b/Jenkinsfile
index 066e1deb2df65d6ff8d20c652236024ec240ef0f..6d39995005db0fb5c68f73fd57a2959aa265e153 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
         BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/blue/organizations/jenkins/goofy/detail/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/pipeline"
         RELEASE_REGEX = /\d+.\d+.\d+/
         SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
-        E2E_FAILED = ''
+        E2E_FAILED = ""
     }
 
     options {
@@ -103,7 +103,7 @@ pipeline {
                     container("maven-17"){ 
                         configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                             sh 'mvn --version'
-                            sh 'mvn -s $MAVEN_SETTINGS -pl -goofy-client clean install spring-boot:build-image -Dspring-boot.build-image.imageName=docker.ozg-sh.de/goofy:$IMAGE_TAG -Dspring-boot.build-image.publish -Dmaven.wagon.http.retryHandler.count=3'
+                            sh "mvn -s $MAVEN_SETTINGS -pl -goofy-client clean install spring-boot:build-image -Dspring-boot.build-image.imageName=docker.ozg-sh.de/goofy:${IMAGE_TAG} -Dspring-boot.build-image.publish -Dmaven.wagon.http.retryHandler.count=3"
                         }
 
                        	try {
@@ -163,8 +163,10 @@ pipeline {
                             )
                     
 							if(runTests(stageName, 'einheitlicher-ansprechpartner') != '0') {
-				            	E2E_FAILED += "${stageName}, "
+				            	env.E2E_FAILED += "${stageName}, "
             				}
+                            
+                            print(env.E2E_FAILED)
 
 							shutdownEnvironment(namespace)
                         }
@@ -181,11 +183,11 @@ pipeline {
                             ])
 
                             script {
-                                println('post E2E-EA')
-                                println(env.STAGE_NAME)
-						        if (E2E_FAILED.contains(env.STAGE_NAME)) {
-							        currentBuild.result = 'FAILURE'
-						        }
+                                if (env.E2E_FAILED) {
+						            if (env.E2E_FAILED.contains(env.STAGE_NAME)) {
+							            currentBuild.result = 'FAILURE'
+						            }
+                                }
 					        }
                         }
                     }
@@ -208,9 +210,11 @@ pipeline {
                             )
 
 							if(runTests(stageName, 'main-tests') != '0') {
-				            	E2E_FAILED += "${stageName}, "
+				            	env.E2E_FAILED += "${stageName}, "
             				}
 
+                            print(env.E2E_FAILED)
+                            
 							shutdownEnvironment(namespace)
                         }
                     }
@@ -226,11 +230,11 @@ pipeline {
                             ])
 
                             script {
-                                println('post E2E-main')
-                                println(env.STAGE_NAME)
-						        if (E2E_FAILED.contains(env.STAGE_NAME)) {
-							        currentBuild.result = 'FAILURE'
-						        }
+                                if (env.E2E_FAILED) {
+    						        if (env.E2E_FAILED.contains(env.STAGE_NAME)) {
+	    						        currentBuild.result = 'FAILURE'
+		    				        }
+                                }
 					        }
                         }
                     }
@@ -239,8 +243,8 @@ pipeline {
 			post {
         		always {
 					script {
-						if (E2E_FAILED) {
-							FAILED_STAGE = "E2E (${E2E_FAILED.substring(0, E2E_FAILED.length() - 2)})"
+						if (env.E2E_FAILED) {
+							FAILED_STAGE = "E2E (${env.E2E_FAILED.substring(0, env.E2E_FAILED.length() - 2)})"
 						}
 					}
             	}
diff --git a/goofy-client/apps/goofy-e2e/src/integration/einheitlicher-ansprechpartner/vorgang-detail/vorgang-abschliessen.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/einheitlicher-ansprechpartner/vorgang-detail/vorgang-abschliessen.e2e-spec.ts
index 341e6387f6fe6db48d44f8f75258fe1a12dc277d..1e86115a20a0b8784e8473fd8040074558316416 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/einheitlicher-ansprechpartner/vorgang-detail/vorgang-abschliessen.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/einheitlicher-ansprechpartner/vorgang-detail/vorgang-abschliessen.e2e-spec.ts
@@ -41,7 +41,7 @@ describe('Vorgang abschliessen', () => {
 		describe('by button', () => {
 
 			it('should have status Beschieden', () => {
-				haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangAbschliessen.status]);
+				haveText(vorgangPage.getVorgangDetailHeader().getStatus(), "Fail Test");
 			})
 
 			it('should show snackBar message', () => {
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-abschliessen.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-abschliessen.e2e-spec.ts
index 99cc32bc44fa0cbef0137a70ed07edffc5aaf00d..6f51d73f11ca438916ff28176835eae6a418a693 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-abschliessen.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-abschliessen.e2e-spec.ts
@@ -41,7 +41,7 @@ describe('Vorgang abschliessen(EA)', () => {
 		describe('by button', () => {
 
 			it('should have status Beschieden', () => {
-				haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangAbschliessen.status]);
+				haveText(vorgangPage.getVorgangDetailHeader().getStatus(), "Fail Test");
 			})
 
 			it('should show snackBar message', () => {