Merge remote-tracking branch 'origin/master' into OZG-4561-alfa-renames

# Conflicts:
#	alfa-client/apps/alfa-e2e/Jenkinsfile

alfa-client/apps/alfa-e2e/Jenkinsfile

@@ -5,7 +5,7 @@ def SKIP_RUN = false
 pipeline {
     agent {
         node {
-            label 'jenkins-build-agent-nodejs-18'
+            label 'ozgcloud-jenkins-build-agent'
         }
     }
 
@@ -161,7 +161,7 @@ pipeline {
             }
         }
 
-        stage('Rollout E2E Main') {
+        stage('Rollout E2E Namespaces') {
             when {
                 expression { !SKIP_RUN }
             }
@@ -292,6 +292,7 @@ pipeline {
                 }
             }
         }
+
     }
     post {
         failure {
@@ -814,7 +815,6 @@ Map getElasticsearchEnv(String namespace) {
 Void forwardServices(String namespace, Integer dbPort) {
     try {
         forwardDatenbank(namespace, dbPort)
-        forwardElasticSearch()
     }
     catch (Exception e) {
         echo "forwardServices Exception: ${e}"