diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index 1557d4b3ce77a0f74bd4a0363a200d8d25093902..390847897ec79d38966cb1c41caaf88cc6826c5b 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -171,51 +171,37 @@ pipeline {
 
                     checkoutGitopsE2eBranch()
 
-                    deleteOzgCloudStack([env.MAIN_BEZEICHNER])
+                    deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
 
                     generateMainNamespaceYaml()
+                    generateEaNamespaceYaml()
 
                     pushGitopsRepo()
 
-                    waitForOzgCloudStackRollout([env.MAIN_BEZEICHNER])
+                    waitForKopStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
                 }
             }
             post {
                 failure {
                     script {
-                        deleteOzgCloudStack([env.MAIN_BEZEICHNER])
+                        deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
                     }
                 }
             }
         }
 
-        stage('Rollout E2E EA') {
-			when {
-				expression { !SKIP_RUN }
-			}
-			steps {
-				script {
-					FAILED_STAGE = env.STAGE_NAME
-
-					checkoutGitopsE2eBranch()
-
-					deleteOzgCloudStack([env.EA_BEZEICHNER])
-
-					generateEaNamespaceYaml()
-
-					pushGitopsRepo()
+        stage('Init PortForwards') {
+            when {
+                expression { !SKIP_RUN }
+            }
+            steps {
+                script {
+                    FAILED_STAGE = env.STAGE_NAME
 
-					waitForOzgCloudStackRollout([env.EA_BEZEICHNER])
-				}
-			}
-			post {
-				failure {
-					script {
-						deleteOzgCloudStack([env.EA_BEZEICHNER])
-					}
-				}
-			}
-		}
+                    forwardElasticSearch()
+                }
+            }
+        }
 
         stage('Run E2E-Tests') {
             when {