diff --git a/Jenkinsfile b/Jenkinsfile
index 5bee62842..053751a10 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,7 @@
-// Merge request pipeline
+
 pipeline {
     agent any
+
     environment {
         NEXUS_CREDS = credentials('nexus-cred')
         NEXUS_DOCKER_REPO_MR = '34.241.46.54:8085'
@@ -11,6 +12,7 @@ pipeline {
     }
 
     stages {
+        // Merge request pipeline
         stage('Checkstyle') {
             steps{
                 echo 'Running gradle checkstyle'
@@ -57,55 +59,39 @@ pipeline {
                 sh 'docker push $NEXUS_DOCKER_REPO_MR/spring-petclinic:${GIT_COMMIT}'
             }
         }
-    }
 
-    post {
-        always {
-            cleanWs()
-        }
-    }
-}
-
-// Main branch pipeline
-pipeline {
-    agent any
-
-    environment {
-        NEXUS_CREDS = credentials('nexus-cred')
-        NEXUS_DOCKER_REPO_MAIN = '34.241.46.54:8084'
-    }
-    stages {
+        // Main branch pipeline
         stage('Docker Build (Main)') {
-        when {
-            branch 'main'
+            when {
+                branch 'main'
+            }
+            steps { 
+                echo 'Building docker Image'
+                sh 'docker build -t $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT} .'
+            }
         }
-        steps { 
-            echo 'Building docker Image'
-            sh 'docker build -t $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT} .'
-        }
-    }
-    stage('Docker Login') {
-        when {
-            branch 'main'
-        }
-        steps {
-            echo 'Nexus Docker Repository Login'
-            script{
-                withCredentials([usernamePassword(credentialsId: 'nexus-cred', usernameVariable: 'USER', passwordVariable: 'PASS' )]){
-                    sh 'echo $PASS | docker login -u $USER --password-stdin $NEXUS_DOCKER_REPO_MAIN'
+        stage('Docker Login') {
+            when {
+                branch 'main'
+            }
+            steps {
+                echo 'Nexus Docker Repository Login'
+                script{
+                    withCredentials([usernamePassword(credentialsId: 'nexus-cred', usernameVariable: 'USER', passwordVariable: 'PASS' )]){
+                        sh 'echo $PASS | docker login -u $USER --password-stdin $NEXUS_DOCKER_REPO_MAIN'
+                    }
                 }
             }
         }
-    }
-    stage('Docker Push (Main)') {
-        when {
-            branch 'main'
+        stage('Docker Push (Main)') {
+            when {
+                branch 'main'
+            }
+            steps {
+                echo 'Pushing Image to docker repo'
+                sh 'docker push $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT}'
+            }
         }
-        steps {
-            echo 'Pushing Image to docker repo'
-            sh 'docker push $NEXUS_DOCKER_REPO_MAIN/spring-petclinic:${GIT_COMMIT}'
-        }
-    }
     }
     post {
         always {