diff --git a/Jenkinsfile b/Jenkinsfile
index f842d18a0..ee3bf549e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,35 +4,50 @@ pipeline {
         DOCKER_CREDENTIALS_ID = 'dockerhub-credentials'
     }
     stages {
-        // stage('Checkstyle') {
-        //     steps {
-        //         sh './mvnw checkstyle:checkstyle'
-        //         archiveArtifacts artifacts: 'target/checkstyle-result.xml', fingerprint: true
-        //     }
-        // }
-        // stage('Test') {
-        //     steps {
-        //         sh './mvnw test'
-        //     }
-        // }
-        // stage('Build') {
-        //     steps {
-        //         sh './mvnw clean package -DskipTests'
-        //     }
-        // }
+        stage('Checkstyle') {
+            when {
+                expression { env.BRANCH_NAME != 'main' }
+            }
+            steps {
+                sh './mvnw checkstyle:checkstyle'
+                archiveArtifacts artifacts: 'target/checkstyle-result.xml', fingerprint: true
+            }
+        }
+        stage('Test') {
+            when {
+                expression { env.BRANCH_NAME != 'main' }
+            }
+            steps {
+                sh './mvnw test'
+            }
+        }
+        stage('Build') {
+            when {
+                expression { env.BRANCH_NAME != 'main' }
+            }
+            steps {
+                sh './mvnw clean package -DskipTests'
+            }
+        }
         stage('Create Docker Image') {
             steps {
                 script {
                     withCredentials([usernamePassword(credentialsId: "${DOCKER_CREDENTIALS_ID}", usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) {
+                        def repoName = env.BRANCH_NAME == 'main' ? 'main-jenkins' : 'mr-jenkins'
+                        def tag = env.GIT_COMMIT?.substring(0, 7) ?: 'latest'
                         sh """
                             docker login -u \$DOCKER_USERNAME --password \$DOCKER_PASSWORD
-                            docker build -t marijastopa/mr-jenkins:blabla .
-                            docker push marijastopa/mr-jenkins:blabla
+                            docker build -t marijastopa/${repoName}:${tag} .
+                            docker push marijastopa/${repoName}:${tag}
                         """
                     }
                 }
             }
         }
-
+    }
+    post {
+        always {
+            echo "Pipeline execution completed."
+        }
     }
 }