diff --git a/ci/main_jenkinsfile b/ci/main_jenkinsfile
index dc5e879817091d2b011534e0b76b9083c4b77b46..cde27f64d07f322573165ad7fba3b5ffe226a808 100644
--- a/ci/main_jenkinsfile
+++ b/ci/main_jenkinsfile
@@ -193,17 +193,19 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                     }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                            }
                                                         }
                                                     }
                                                 }
@@ -276,17 +278,19 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                     }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                            }
                                                         }
                                                     }
                                                 }
diff --git a/ci/main_jenkinsfile_no_ut b/ci/main_jenkinsfile_no_ut
index 35ebc647785f0d9ef84ab2c67a26d583a98d5848..c6a5914baac308437d2e8a4feac67806b115c452 100644
--- a/ci/main_jenkinsfile_no_ut
+++ b/ci/main_jenkinsfile_no_ut
@@ -193,17 +193,19 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                     }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                            }
                                                         }
                                                     }
                                                 }
@@ -276,17 +278,19 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                     }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                            }
                                                         }
                                                     }
                                                 }
diff --git a/ci/nightly_main_jenkinsfile b/ci/nightly_main_jenkinsfile
index 7b39ed386c0bc54cf00cecb15a5665349aa3af34..bedfce378e7e2536ce5d566e318ddd328cf9cb77 100644
--- a/ci/nightly_main_jenkinsfile
+++ b/ci/nightly_main_jenkinsfile
@@ -194,17 +194,19 @@ spec:
 
                                     post {
                                         always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                     }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cleanup_dev.groovy"
+                                                            }
                                                         }
                                                     }
                                                 }
@@ -277,17 +279,19 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stage ("Cleanup Dev") {
-                                                agent {
-                                                    kubernetes {
-                                                        label 'jenkins-slave'
-                                                        defaultContainer 'jnlp'
+                                            stages {
+                                                stage ("Cleanup Dev") {
+                                                    agent {
+                                                        kubernetes {
+                                                            label 'jenkins-slave'
+                                                            defaultContainer 'jnlp'
+                                                        }
                                                     }
-                                                }
-                                                stages {
-                                                    gitlabCommitStatus(name: 'Cleanup Dev') {
-                                                        script {
-                                                            load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                    stages {
+                                                        gitlabCommitStatus(name: 'Cleanup Dev') {
+                                                            script {
+                                                                load "${env.WORKSPACE}/ci/jenkinsfile/cluster_cleanup_dev.groovy"
+                                                            }
                                                         }
                                                     }
                                                 }