diff --git a/Jenkinsfile b/Jenkinsfile
index 27226272e27..0307f59fbc1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -90,16 +90,19 @@ spec:
         stage('Build artifact') {
             steps {
                 container('docker-client') {
-                    sh "docker run -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven maven:3.6.3-jdk-13 bash -c 'mvn clean package -Pprod'"
+                    sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -Pprod'"
                 }
             }
         }
         stage('Build docker image') {
+            when {
+                expression { return env.GIT_BRANCH == 'origin/master'; }
+            }
             steps {
                 container('docker-client') {
                     dir(path: './kafka-ui-api') {
                         script {
-                            dockerImage = docker.build( registry + ":$VERSION", "--build-arg JAR_FILE=*.jar -f Dockerfile ." )
+                            dockerImage = docker.build( registry + ":$VERSION", "--build-arg JAR_FILE=kafka-ui-api-\'$VERSION\'.jar -f Dockerfile ." )
                         }
                     }
                 }
@@ -121,6 +124,9 @@ spec:
             }
         }
         stage('Remove unused docker image') {
+            when {
+                expression { return env.GIT_BRANCH == 'origin/master'; }
+            }
             steps{
                 container('docker-client') {
                     sh "docker rmi $registry:$VERSION"
diff --git a/docker-openjdk/Dockerfile b/docker-openjdk/Dockerfile
new file mode 100644
index 00000000000..751ed0992e7
--- /dev/null
+++ b/docker-openjdk/Dockerfile
@@ -0,0 +1,3 @@
+FROM openjdk:13
+RUN  yum install -y git && \
+     yum groupinstall -y "Development Tools"
\ No newline at end of file