diff --git a/Jenkinsfile b/Jenkinsfile
index 0fb1c06..caedb73 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,56 +1,70 @@
 pipeline {
     agent none
     stages {
-        stage('Main') {
+        stage('Checkout') {
             when {
                 beforeAgent true
                 branch 'main'
             }
             agent { label 'agent-12' }
-            stages {
-                stage('Checkout') {
-                    steps {
-                        checkout scm
-                    }
-                }
-                stage('Build') {
-                    steps {
-                        script {
-                            docker.build('trianta.dev:latest')
-                        }
-                    }
-                }
-                stage('Deploy') {
-                    steps {
-                        sh 'docker stop trianta.dev && docker rm trianta.dev || exit 0'
-                        sh 'docker run -d -e USER=scv -e USER_UID=1001-e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name trianta.dev trianta.dev:latest'
-                    }
+            steps {
+                checkout scm
+            }
+        }
+        stage('Build') {
+            when {
+                beforeAgent true
+                branch 'main'
+            }
+            agent { label 'agent-12' }
+            steps {
+                script {
+                    docker.build('trianta.dev:latest')
                 }
             }
         }
-        stage('Testing') {
+        stage('Deploy') {
+            when {
+                beforeAgent true
+                branch 'main'
+            }
+            agent { label 'agent-12' }
+            steps {
+                sh 'docker stop trianta.dev && docker rm trianta.dev || exit 0'
+                sh 'docker run -d -e USER=scv -e USER_UID=1001-e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name trianta.dev trianta.dev:latest'
+            }
+        }
+        stage('Test Checkout') {
             when {
                 beforeAgent true
                 not { branch 'main' }
             }
             agent { label 'agent-13' }
-            stage('Test Checkout') {
-                steps {
-                    checkout scm
+            steps {
+                checkout scm
+            }
+        }
+        stage('Test Build') {
+            when {
+                beforeAgent true
+                not { branch 'main' }
+            }
+            agent { label 'agent-13' }
+            steps {
+                script {
+                    docker.build('test.trianta.dev:latest')
                 }
             }
-            stage('Test Build') {
-                steps {
-                    script {
-                        docker.build('test.trianta.dev:latest')
-                    }
-                }
+        }
+        stage('Test Deploy') {
+            when {
+                beforeAgent true
+                not { branch 'main' }
             }
-            stage('Test Deploy') {
-                steps {
-                    sh 'docker stop test.trianta.dev && docker rm test.trianta.dev || exit 0'
-                    sh 'docker run -d -e USER=scv -e USER_UID=1001-e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name test.trianta.dev test.trianta.dev:latest'
-                }
+            agent { label 'agent-13' }
+            steps {
+                sh 'docker stop test.trianta.dev && docker rm test.trianta.dev || exit 0'
+                sh 'docker run -d -e USER=scv -e USER_UID=1001-e USER_GID=1001 --restart=unless-stopped -p 3466:80 --name test.trianta.dev test.trianta.dev:latest'
             }
         }
     }