diff --git a/vars/buildAndDeploy.groovy b/vars/buildAndDeploy.groovy
index c8a7938..6572fd6 100644
--- a/vars/buildAndDeploy.groovy
+++ b/vars/buildAndDeploy.groovy
@@ -2,6 +2,7 @@ import com.example.DockerBuilder
 
 def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker) {
     def dockerBuilder = new DockerBuilder()
+    def containerName = useCustomDocker ? 'custom-docker' : 'docker'
 
     stage('Make jar') {
         script {
@@ -19,11 +20,9 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh
         }
     }
     stage('Docker build & push') {
-        script {
-            if (useCustomDocker) {
-                dockerBuilder.customDockerBuildAndPush(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS)
-            } else {
-                dockerBuilder.dockerBuildAndPush(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS)
+        container(containerName) {
+            script {
+                dockerBuildAndPush(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS, useCustomDocker)
             }
         }
     }