diff --git a/Jenkinsfile b/Jenkinsfile
index 7607b62b6f45d6d8fa5ffea71d3aeb839ddd74fa..57d6246ec2482e4dfeef44ba5892e45421d86e6c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent {
-        node {
-            label 'jenkins-worker'
+       node {
+           label 'jenkins-build-agent'
         }
     }
 
@@ -60,21 +60,19 @@ pipeline {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
                 }
-                container("maven-17"){
-                    configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
-                        sh 'mvn --version'
-                        sh 'mvn -s $MAVEN_SETTINGS clean install spring-boot:build-image -Dmaven.wagon.http.retryHandler.count=3'
+                configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh 'mvn --version'
+                    sh 'mvn -s $MAVEN_SETTINGS clean install spring-boot:build-image -Dmaven.wagon.http.retryHandler.count=3'
                         
-                        script {
-	                    	try {
-		                        if (env.BRANCH_NAME == 'master') {
-		                            withSonarQubeEnv('sonarqube-ozg-sh'){
-										sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'	                                
-		                            }
+                    script {
+                      	try {
+	                        if (env.BRANCH_NAME == 'master') {
+		                        withSonarQubeEnv('sonarqube-ozg-sh'){
+		        					sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'	                                
 		                        }
-		                    } catch (Exception e) {
-	                               unstable("SonarQube failed")
-	                        }
+		                    }
+		                } catch (Exception e) {
+	                        unstable("SonarQube failed")
 	                    }
                     }
                 }
@@ -97,10 +95,8 @@ pipeline {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
                 }
-                container('maven-17') {
-                    configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
-                        sh 'mvn -s $MAVEN_SETTINGS -DskipTests deploy'
-                    }
+                configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh 'mvn -s $MAVEN_SETTINGS -DskipTests deploy'
                 }
             }
         }
@@ -128,20 +124,18 @@ pipeline {
         
         stage('Test, build and deploy Helm Chart') {
             steps {
-                container('k8s') {
-                    script {
-                        FAILED_STAGE=env.STAGE_NAME
-                        HELM_CHART_VERSION = generateHelmChartVersion()
+                script {
+                    FAILED_STAGE=env.STAGE_NAME
+                    HELM_CHART_VERSION = generateHelmChartVersion()
 
-                        dir('src/main/helm') {
-                            sh "helm lint -f test-values.yaml"
+                    dir('src/main/helm') {
+                        sh "helm lint -f test-values.yaml"
 
                             sh "helm unittest -f '../../test/helm/*.yaml' -v '../../test/unit-values.yaml' ."
 
-                            sh "helm package --version=${HELM_CHART_VERSION} ."
+                        sh "helm package --version=${HELM_CHART_VERSION} ."
 
-                            deployHelmChart(HELM_CHART_VERSION)
-                        }
+                        deployHelmChart(HELM_CHART_VERSION)
                     }
                 }
             }
@@ -293,13 +287,11 @@ Void checkoutProvisioningRepo() {
 }
 
 Void tagAndPushDockerImage(String imageName, String newTag){
-    container("docker") {
-        withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
-            sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
+    withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
+        sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
 
-            sh "docker tag docker.ozg-sh.de/${imageName}:build-latest docker.ozg-sh.de/${imageName}:${newTag}"
-            sh "docker push docker.ozg-sh.de/${imageName}:${newTag}"
-        }
+        sh "docker tag docker.ozg-sh.de/${imageName}:build-latest docker.ozg-sh.de/${imageName}:${newTag}"
+        sh "docker push docker.ozg-sh.de/${imageName}:${newTag}"
     }
 }