diff --git a/ci/main_jenkinsfile b/ci/main_jenkinsfile
index cde27f64d0..dc5e879817 100644
--- a/ci/main_jenkinsfile
+++ b/ci/main_jenkinsfile
@@ -193,19 +193,17 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stages {
-                                                stage ("Cleanup Dev") {
-                                                    agent {
-                                                        kubernetes {
-                                                            label 'jenkins-slave'
-                                                            defaultContainer 'jnlp'
-                                                        }
+                                            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"
                                                         }
                                                     }
                                                 }
@@ -278,19 +276,17 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stages {
-                                                stage ("Cleanup Dev") {
-                                                    agent {
-                                                        kubernetes {
-                                                            label 'jenkins-slave'
-                                                            defaultContainer 'jnlp'
-                                                        }
+                                            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 c6a5914baa..35ebc64778 100644
--- a/ci/main_jenkinsfile_no_ut
+++ b/ci/main_jenkinsfile_no_ut
@@ -193,19 +193,17 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stages {
-                                                stage ("Cleanup Dev") {
-                                                    agent {
-                                                        kubernetes {
-                                                            label 'jenkins-slave'
-                                                            defaultContainer 'jnlp'
-                                                        }
+                                            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"
                                                         }
                                                     }
                                                 }
@@ -278,19 +276,17 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stages {
-                                                stage ("Cleanup Dev") {
-                                                    agent {
-                                                        kubernetes {
-                                                            label 'jenkins-slave'
-                                                            defaultContainer 'jnlp'
-                                                        }
+                                            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 bedfce378e..7b39ed386c 100644
--- a/ci/nightly_main_jenkinsfile
+++ b/ci/nightly_main_jenkinsfile
@@ -194,19 +194,17 @@ spec:
 
                                     post {
                                         always {
-                                            stages {
-                                                stage ("Cleanup Dev") {
-                                                    agent {
-                                                        kubernetes {
-                                                            label 'jenkins-slave'
-                                                            defaultContainer 'jnlp'
-                                                        }
+                                            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"
                                                         }
                                                     }
                                                 }
@@ -279,19 +277,17 @@ spec:
                                     }
                                     post {
                                         always {
-                                            stages {
-                                                stage ("Cleanup Dev") {
-                                                    agent {
-                                                        kubernetes {
-                                                            label 'jenkins-slave'
-                                                            defaultContainer 'jnlp'
-                                                        }
+                                            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"
                                                         }
                                                     }
                                                 }