diff --git a/Jenkinsfile b/Jenkinsfile
index 8b0e5fe3dca27574b4c867ad970b3641a35d3bd3..2f615d7471d0ab5caa73dc2d9318bf8287fa1b77 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -480,8 +480,10 @@ Void generateNamespaceYaml(String bezeichner, Boolean isEa) {
 
     sh "cat e2e/gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml"
 
-    sh "git add e2e/gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml"
-    sh "git commit -m 'add e2e by-${bezeichner}-dev'"
+    dir("e2e/gitops") {
+        sh "git add dev/namespace/namespaces/by-${bezeichner}-dev.yaml"
+        sh "git commit -m 'add e2e by-${bezeichner}-dev'"
+    }
 }
 
 String valuesPath(Boolean isEa) {
@@ -540,7 +542,7 @@ Void addKeycloakUser(String bezeichner, String stage) {
     }
 }
 
-Void deleteKopStack(Map kopBezeichner) {
+Void deleteKopStack(kopBezeichner) {
     for(bezeichner in kopBezeichner) {
         dir("e2e/gitops/dev/namespace/namespaces") {
             if (sh (script: "ls | grep 'by-${bezeichner}-dev.yaml'", returnStatus: true) == 1) {
@@ -568,11 +570,11 @@ Void waitForDeletion(String bezeichner) {
     }
 }
 
-Void rolloutKopStack(Map kopBezeichner) {
+Void rolloutKopStack(kopBezeichner) {
     pushGitopsRepo("e2e")
 
     for(bezeichner in kopBezeichner) {
-        waitForHealthyApplication(bezeichner)
+        waitForRollout(bezeichner)
     }
 }
 
@@ -583,7 +585,7 @@ Void waitForRollout(String bezeichner) {
     waitForHealthyApplication(bezeichner, 'goofy')
 }
 
-Void waitForHealthyApplication(String bezeichner, Strin application) {
+Void waitForHealthyApplication(String bezeichner, String application) {
     try {
         def countRetry = 0
         def maxRetry = 12
@@ -593,7 +595,7 @@ Void waitForHealthyApplication(String bezeichner, Strin application) {
             sh "sleep 5"
         }
 
-        if (sh (script: "kubectl get application/by-${bezeichner}-dev-${application} -n argocd -o=jsonpath='{.status.health.status}' | grep Healthy", returnStatus: true) == 0) {
+        if (sh (script: "kubectl get application/by-${bezeichner}-dev-${application} -n argocd -o=jsonpath='{.status.health.status}' | grep Healthy", returnStatus: true) == 1) {
             sh "kubectl wait --for=jsonpath='{.status.health.status}'=Healthy applications/by-${bezeichner}-dev-${application} -n argocd --timeout=300s"
         }
     } catch (Exception e) {
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml b/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml
index e393d36b5925f7a50a180a6c4bd42d8d515302d9..10b96bce605c75228cbd0c4866b14b449b705443 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml
@@ -1,6 +1,7 @@
 kop:
   bezeichner: mastere2eea
-
+  environment: dev
+  
 goofy:
   image:
     tag: ''
@@ -9,10 +10,12 @@ goofy:
   env:
     overrideSpringProfiles: "oc,ea,e2e,dev"
   sso:
+    serverUrl: https://sso.dev.by.kop-cloud.de
     apiPassword: "Test1234!"
     role_einheitlicher_ansprechpartner: true
   ingress:
     use_staging_cert: true
+  baseUrl: dev.by.kop-cloud.de
 
 pluto:
   env:
@@ -20,12 +23,18 @@ pluto:
   elasticsearch:
     enabled: true
     password: vf9W1D8Z3673
+    ca_cert: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhVENDQWxHZ0F3SUJBZ0lRYUdRQXNYbXFwVzQ1NnFGL2MzM0FOREFOQmdrcWhraUc5dzBCQVFzRkFEQS8KTVJzd0dRWURWUVFMRXhKdmVtY3RjMlZoY21Ob0xXTnNkWE4wWlhJeElEQWVCZ05WQkFNVEYyOTZaeTF6WldGeQpZMmd0WTJ4MWMzUmxjaTFvZEhSd01CNFhEVEl5TVRJd05ERTROVFV5TkZvWERUSXpNVEl3TkRFNU1EVXlORm93ClB6RWJNQmtHQTFVRUN4TVNiM3BuTFhObFlYSmphQzFqYkhWemRHVnlNU0F3SGdZRFZRUURFeGR2ZW1jdGMyVmgKY21Ob0xXTnNkWE4wWlhJdGFIUjBjRENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQgpBT1VZZEVhU2wzM0FmaHFyTzF3enNmbE11TUFIbnBDV1hHOGZyeTl3dGFUMitEaFBLMU5kQW1YeFcwQXdZeld0Clg3UXllNEI1R2d6YzhtbUFqM1RZbWF6dUNzRWlRcUlUTGsvN1BDWnpLdHJkWTBld1JDdHBDbWxVeWVaQW16cHgKNGxhMUJoUGQ5bXJ3KzVnRVMyTzBpM0pURElHZGpCdHFPay9WenMxWTRubm12bFNOMWhoWURXMS9ZRVJsNVo5Ywp2WXFxZDJ6VHlrMnFPU0pndjlqSG1Pd0JxZ05vaFdQL2s1ZGZSVXhBYWxJbjBJbXJmWm5LMXVpdnA5TFg0RTVmCjd2V2JuZU10TzZMSzVFK1h0T0dVanJOUGNlV0g2SUpzMzMwZFFtRHkvemFCbU1RSDZ0RXFzZ0dBYm1lenJkTmkKQWtQZnZOblFmUG9DSWVCRUUzVlJUQ2NDQXdFQUFhTmhNRjh3RGdZRFZSMFBBUUgvQkFRREFnS0VNQjBHQTFVZApKUVFXTUJRR0NDc0dBUVVGQndNQkJnZ3JCZ0VGQlFjREFqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01CMEdBMVVkCkRnUVdCQlJIdkZVSCtaTzVjRGJUekdIeTZkNjJUVUdmTkRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWtlSGEKeDcwbTBCWHVya2JMRG5lOFloOHhMdjk5TmphVmVmNU9ob1J1WisvS3NyVlVpUE5wYlJaMTMwQ252dFNMK083VQpNYnQ4dExHWXAzay9xL2xhdW01eHF2V1RlYUVCbldGbkY0UGZZcFlnblJpNm02bjZFcVQzQnFBZlN0RENDRnhDCmMxMzduREJZTk42ekx6TGtYeG5YaVF2bmh5WVR3TERUYU01Yk1RQzJDRGs3cE1FdkNkQVJGSHNRZUxadlRFMVoKNFUrYXY3akh1TkFuaTVtcGpMdzhlVlZLMDNjcXFIY05WWWZYRERDYjQwOGlJK2wzcFZDelVwWlE1ci9oQUtOQgpsSStUTHZuU0tsSXNFTlpmSFlFVG9idmQvMmsweGgrNk1DMmFQK3NPOC9zbG93NHkzNmZCUmtlcTQ0eFNMZWVmCm5oWFMyQzlzU1pOZjh6WU0yZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
   database:
     password: XnHhfznNWg65NNd
     usermanagerPassword: 5M3N2sVEq5c8
+  storage:
+    class: csi-cinder-sc-delete
   
 user_manager:
   kop:
     keycloak:
       api:
-        password: "Test1234!"
\ No newline at end of file
+        password: "Test1234!"
+  sso:
+    serverUrl: https://sso.dev.by.kop-cloud.de
+  baseUrl: dev.by.kop-cloud.de
\ No newline at end of file
diff --git a/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml b/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml
index 352720869db818be53e8d18f0c4b19e77385f1ad..697b0b65e04b4a4aedced55764af3bd5f9febd9c 100644
--- a/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml
+++ b/goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml
@@ -1,5 +1,6 @@
 kop:
   bezeichner: mastere2emain
+  environment: dev
 
 goofy:
   image:
@@ -9,9 +10,11 @@ goofy:
   env:
     overrideSpringProfiles: "oc,e2e,dev"
   sso:
+    serverUrl: https://sso.dev.by.kop-cloud.de
     apiPassword: "Test1234!"
   ingress:
     use_staging_cert: true
+  baseUrl: dev.by.kop-cloud.de
     
 pluto:
   env:
@@ -19,12 +22,18 @@ pluto:
   elasticsearch:
     enabled: true
     password: vf9W1D8Z3673
+    ca_cert: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhVENDQWxHZ0F3SUJBZ0lRYUdRQXNYbXFwVzQ1NnFGL2MzM0FOREFOQmdrcWhraUc5dzBCQVFzRkFEQS8KTVJzd0dRWURWUVFMRXhKdmVtY3RjMlZoY21Ob0xXTnNkWE4wWlhJeElEQWVCZ05WQkFNVEYyOTZaeTF6WldGeQpZMmd0WTJ4MWMzUmxjaTFvZEhSd01CNFhEVEl5TVRJd05ERTROVFV5TkZvWERUSXpNVEl3TkRFNU1EVXlORm93ClB6RWJNQmtHQTFVRUN4TVNiM3BuTFhObFlYSmphQzFqYkhWemRHVnlNU0F3SGdZRFZRUURFeGR2ZW1jdGMyVmgKY21Ob0xXTnNkWE4wWlhJdGFIUjBjRENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQgpBT1VZZEVhU2wzM0FmaHFyTzF3enNmbE11TUFIbnBDV1hHOGZyeTl3dGFUMitEaFBLMU5kQW1YeFcwQXdZeld0Clg3UXllNEI1R2d6YzhtbUFqM1RZbWF6dUNzRWlRcUlUTGsvN1BDWnpLdHJkWTBld1JDdHBDbWxVeWVaQW16cHgKNGxhMUJoUGQ5bXJ3KzVnRVMyTzBpM0pURElHZGpCdHFPay9WenMxWTRubm12bFNOMWhoWURXMS9ZRVJsNVo5Ywp2WXFxZDJ6VHlrMnFPU0pndjlqSG1Pd0JxZ05vaFdQL2s1ZGZSVXhBYWxJbjBJbXJmWm5LMXVpdnA5TFg0RTVmCjd2V2JuZU10TzZMSzVFK1h0T0dVanJOUGNlV0g2SUpzMzMwZFFtRHkvemFCbU1RSDZ0RXFzZ0dBYm1lenJkTmkKQWtQZnZOblFmUG9DSWVCRUUzVlJUQ2NDQXdFQUFhTmhNRjh3RGdZRFZSMFBBUUgvQkFRREFnS0VNQjBHQTFVZApKUVFXTUJRR0NDc0dBUVVGQndNQkJnZ3JCZ0VGQlFjREFqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01CMEdBMVVkCkRnUVdCQlJIdkZVSCtaTzVjRGJUekdIeTZkNjJUVUdmTkRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWtlSGEKeDcwbTBCWHVya2JMRG5lOFloOHhMdjk5TmphVmVmNU9ob1J1WisvS3NyVlVpUE5wYlJaMTMwQ252dFNMK083VQpNYnQ4dExHWXAzay9xL2xhdW01eHF2V1RlYUVCbldGbkY0UGZZcFlnblJpNm02bjZFcVQzQnFBZlN0RENDRnhDCmMxMzduREJZTk42ekx6TGtYeG5YaVF2bmh5WVR3TERUYU01Yk1RQzJDRGs3cE1FdkNkQVJGSHNRZUxadlRFMVoKNFUrYXY3akh1TkFuaTVtcGpMdzhlVlZLMDNjcXFIY05WWWZYRERDYjQwOGlJK2wzcFZDelVwWlE1ci9oQUtOQgpsSStUTHZuU0tsSXNFTlpmSFlFVG9idmQvMmsweGgrNk1DMmFQK3NPOC9zbG93NHkzNmZCUmtlcTQ0eFNMZWVmCm5oWFMyQzlzU1pOZjh6WU0yZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
   database:
     password: XnHhfznNWg65NNd
     usermanagerPassword: 5M3N2sVEq5c8
-  
+  storage:
+    class: csi-cinder-sc-delete
+
 user_manager:
   kop:
     keycloak:
       api:
-        password: "Test1234!"
\ No newline at end of file
+        password: "Test1234!"
+  sso:
+    serverUrl: https://sso.dev.by.kop-cloud.de
+  baseUrl: dev.by.kop-cloud.de
\ No newline at end of file