diff --git a/Jenkinsfile b/Jenkinsfile
index 9893245..911a0fa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,9 +28,15 @@ pipeline {
             steps {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
-                      def comanage_registry_base_image = docker.build("comanage-registry-base:$version-1", "--no-cache --build-arg COMANAGE_REGISTRY_VERSION=$version -f ./comanage-registry-base/Dockerfile ./comanage-registry-base")
-                      def comanage_registry_internet2_tap_base_image = docker.build("comanage-registry-internet2-tier-base:1", "--no-cache -f ./comanage-registry-internet2-tier-base/Dockerfile ./comanage-registry-internet2-tier-base")
-                      def comanage_registry_internet2_tap_image = docker.build("comanage-registry", "--no-cache --build-arg COMANAGE_REGISTRY_VERSION=$version --build-arg COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 --build-arg COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1 -f ./comanage-registry-internet2-tier/Dockerfile ./comanage-registry-internet2-tier")
+                      def image = "comanage-registry-base:$version-1"
+                      def directory = 'comanage-registry-base'
+                      def build_arg = '--no-cache ' +
+                                      "--build-arg COMANAGE_REGISTRY_VERSION=$version " +
+                                      "-f ./$directory/Dockerfile ./$directory"
+                      def base_image = docker.build($image, $build_arg)
+                      //def comanage_registry_base_image = docker.build("comanage-registry-base:$version-1", "--no-cache --build-arg COMANAGE_REGISTRY_VERSION=$version -f ./comanage-registry-base/Dockerfile ./comanage-registry-base")
+                      //def comanage_registry_internet2_tap_base_image = docker.build("comanage-registry-internet2-tier-base:1", "--no-cache -f ./comanage-registry-internet2-tier-base/Dockerfile ./comanage-registry-internet2-tier-base")
+                      //def comanage_registry_internet2_tap_image = docker.build("comanage-registry", "--no-cache --build-arg COMANAGE_REGISTRY_VERSION=$version --build-arg COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 --build-arg COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1 -f ./comanage-registry-internet2-tier/Dockerfile ./comanage-registry-internet2-tier")
                       //baseImg.push("$tag")
                    }
                }