diff --git a/Jenkinsfile b/Jenkinsfile
index f2b69a1..f6594c5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,27 +28,31 @@ pipeline {
             steps {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
-                      def image = "comanage-registry-base:$version-1"
-                      def directory = 'comanage-registry-base'
-                      def build_arg = '--no-cache ' +
+                      def image_to_build
+                      def image_dir
+                      def build_arg
+
+                      image_to_build = "comanage-registry-base:$version-1"
+                      image_dir = 'comanage-registry-base'
+                      build_arg = '--no-cache ' +
                                       "--build-arg COMANAGE_REGISTRY_VERSION=$version " +
-                                      "-f ./$directory/Dockerfile ./$directory"
-                      def base_image = docker.build("$image", "$build_arg")
+                                      "-f ./$image_dir/Dockerfile ./$image_dir"
+                      def base_image = docker.build("$image_to_build", "$build_arg")
 
-                      def image = 'comanage-registry-internet2-tier-base:1'
-                      def directory = 'comanage-registry-internet2-tier-base'
-                      def build_arg = '--no-cache ' +
-                                      "-f ./$directory/Dockerfile ./$directory"
-                      def tap_base_image = docker.build("$image", "$build_arg")
+                      image_to_build = 'comanage-registry-internet2-tier-base:1'
+                      image_dir = 'comanage-registry-internet2-tier-base'
+                      build_arg = '--no-cache ' +
+                                      "-f ./$image_dir/Dockerfile ./$image_dir"
+                      def tap_base_image = docker.build("$image_to_build", "$build_arg")
 
-                      def image = 'comanage-registry'
-                      def directory = 'comanage-registry-internet2-tier'
-                      def build_arg = '--no-cache ' +
+                      image_to_build = 'comanage-registry'
+                      image_dir = 'comanage-registry-internet2-tier'
+                      build_arg = '--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 ./$directory/Dockerfile ./$directory"
-                      def tap_image = docker.build("$image", "$build_arg")
+                                      "-f ./$image_dir/Dockerfile ./$image_dir"
+                      def tap_image = docker.build("$image_to_build", "$build_arg")
                       tap_image.push("$tag")
                    }
                }