diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile
index af39449c370c6f429bebd41b81fc0c411067e7bc..3f5f9a0727a285a966c0e5b838024eca427f5cfb 100644
--- a/goofy-client/apps/goofy-e2e/Jenkinsfile
+++ b/goofy-client/apps/goofy-e2e/Jenkinsfile
@@ -161,7 +161,7 @@ pipeline {
             }
         }
 
-        stage('Rollout E2E Namespaces') {
+        stage('Rollout E2E Main') {
             when {
                 expression { !SKIP_RUN }
             }
@@ -173,7 +173,6 @@ pipeline {
 
                     deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
 
-                    generateEaNamespaceYaml()
                     generateMainNamespaceYaml()
 
                     pushGitopsRepo()
@@ -190,6 +189,34 @@ pipeline {
             }
         }
 
+        stage('Rollout E2E EA') {
+            when {
+                expression { !SKIP_RUN }
+            }
+            steps {
+                script {
+                    FAILED_STAGE = env.STAGE_NAME
+
+                    checkoutGitopsE2eBranch()
+
+                    deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+
+                    generateEaNamespaceYaml()
+
+                    pushGitopsRepo()
+
+                    waitForKopStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+                }
+            }
+            post {
+                failure {
+                    script {
+                        deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+                    }
+                }
+            }
+        }
+
         stage('Run E2E-Tests') {
             when {
                 expression { !SKIP_RUN }