diff --git a/Jenkinsfile b/Jenkinsfile
index c24cd0d32..1083cc775 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,58 +4,41 @@ pipeline {
     environment {
         GIT_COMMIT = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
         DOCKER_CREDS = credentials('docker_key')
-        DOCKER_REPO = '' // Default empty
     }
 
     stages {
-        stage('Set Docker Repository') {
-            steps {
-                script {
-                    if (env.BRANCH_NAME == 'main') {
-                        DOCKER_REPO = 'vkarpenko02/main'
-                    } else {
-                        DOCKER_REPO = 'vkarpenko02/mr'
-                    }
-                }
-                echo "Docker repository set to: ${DOCKER_REPO}" // Debugging step
-            }
-        }
-
-        stage('Checkstyle') {
+        stage ('Checkstyle') {
             when { not { branch 'main' } }
             steps {
                 sh 'mvn checkstyle:checkstyle'
-                archiveArtifacts artifacts: 'target/site/checkstyle.html', allowEmptyArchive: true
+                archiveArtifacts artifacts: 'target/checkstyle-report.xml', allowEmptyArchive: true
             }
         }
-
-        stage('Test') {
+        stage ('Test') {
+            when { not { branch 'main' } }
             steps {
                 sh 'mvn test'
             }
         }
-
-        stage('Build') {
+        stage ('Build') {
+            when { not { branch 'main' } }
             steps {
                 sh 'mvn clean package -DskipTests'
                 archiveArtifacts artifacts: 'target/*.jar', allowEmptyArchive: false
             }
         }
-
-        stage('Create Docker Image') {
+        stage ('Creating Docker Image') {
             steps {
                 script {
-                    if (!DOCKER_REPO) {
-                        error "DOCKER_REPO is not set. Ensure the repository is configured for the current branch."
+                    def dockerRepo = branch == 'main' ? 'main' : 'mr'
+                    sh "docker build -t vkarpenko02/${dockerRepo}:${GIT_COMMIT} ."
+                    withCredentials([usernamePassword(credentialsId: 'docker_key', usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PASS')]) {
+                        sh """
+                            echo ${DOCKER_HUB_PASS} | docker login -u ${DOCKER_HUB_USER} --password-stdin
+                            docker push vkarpenko02/${dockerRepo}:${GIT_COMMIT}
+                        """
                     }
                 }
-                sh 'docker build -t ${DOCKER_REPO}:${GIT_COMMIT} .'
-                withCredentials([usernamePassword(credentialsId: 'docker_key', usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PASS')]) {
-                    sh """
-                        echo ${DOCKER_HUB_PASS} | docker login -u ${DOCKER_HUB_USER} --password-stdin
-                        docker push ${DOCKER_REPO}:${GIT_COMMIT}
-                    """
-                }
             }
         }
     }