diff --git a/build-setup.sh b/build-setup.sh
index 1722f4a..7587f0e 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -286,15 +286,15 @@
 
 chmod a+x ${WORKSPACE}/build.sh
 
+# Give the Docker image a name based on the distro,tag,arch,and target
+imgname=${imgname:-openbmc/${distro}:${imgtag}-${target}-${ARCH}}
+
+# Build the Docker image
+docker build -t ${imgname} - <<< "${Dockerfile}"
+
 # Determine if the build container will be launched with Docker or Kubernetes
 if [[ "${launch}" == "" ]]; then
 
-  # Give the Docker image a name based on the distro,tag,arch,and target
-  imgname=${imgname:-openbmc/${distro}:${imgtag}-${target}-${ARCH}}
-
-  # Build the Docker image
-  docker build -t ${imgname} - <<< "${Dockerfile}"
-
   # If obmcext or sscdir are ${HOME} or a subdirectory they will not be mounted
   mountobmcext="-v ""${obmcext}"":""${obmcext}"" "
   mountsscdir="-v ""${sscdir}"":""${sscdir}"" "
diff --git a/kubernetes/kubernetes-launch.sh b/kubernetes/kubernetes-launch.sh
index 58b548b..600fc35 100755
--- a/kubernetes/kubernetes-launch.sh
+++ b/kubernetes/kubernetes-launch.sh
@@ -25,8 +25,12 @@
 #  imgplsec     = the image pull secret used to access registry if needed
 #  timeout      = the amount of time in seconds that the build will wait for
 #                 the pod to start running on the cluster
-#  imgname      = the name the image will be given when built, must include
-#                 the repo in name for the push command to work.
+#  imgname      = the name the image that will be passed to the kubernetes api
+#                 to build the containers. The image with the tag imgname will
+#                 be built in the invoker script. This script will then tag it
+#                 to include the registry in the name, push it, and update the
+#                 imgname to be what was pushed to the registry. Users should
+#                 not include the registry in the original imgname.
 #  podname      = the name of the pod, will be needed to trace down the logs
 #
 ###############################################################################
@@ -59,14 +63,14 @@
     hclaim=${hclaim:-jenkins}
     sclaim=${sclaim:-shared-state-cache}
     oclaim=${oclaim:-openbmc-reference-repo}
-    imgname=${imgname:-${imgrepo}${distro}:${imgtag}-${ARCH}}
+    newimgname=${newimgname:-${imgrepo}${distro}:${imgtag}-${ARCH}}
     podname=${podname:-openbmc${BUILD_ID}-${target}-builder}
     ;;
   QEMU-build)
     podname=${podname:-qemubuild${BUILD_ID}}
     hclaim=${hclaim:-jenkins}
     qclaim=${qclaim:-qemu-repo}
-    imgname="${imgrepo}${imgname}"
+    newimgname="${imgrepo}${imgname}"
     ;;
   QEMU-launch)
     ;;
@@ -80,8 +84,9 @@
 esac
 
 
-# Build the Docker image, using the Dockerfile carried from build-setup.sh
-docker build -t ${imgname} - <<< "${Dockerfile}"
+# Tag the image created by the invoker with the new image name that includes the imgrepo
+docker tag ${imgname} ${newimgname}
+imgname=${newimgname}
 
 # Push the image that was built to the image repository
 docker push ${imgname}
@@ -92,7 +97,8 @@
 # Once pod is running track logs
 if [[ "${log}" == true ]]; then
   # Wait for Pod to be running
-  while [ -z "$(kubectl describe pod ${podname} -n ${namespace} | grep Status: | grep Running)" ]; do
+  while [ -z "$(kubectl describe pod ${podname} -n ${namespace} | grep Status: | grep Running)" ]
+  do
     if [ ${timeout} -lt 0 ];then
       kubectl delete -f - <<< "${yamlfile}"
       echo "Timeout Occured: Job failed to start running in time"
diff --git a/qemu-build.sh b/qemu-build.sh
index 5454992..c62cefb 100755
--- a/qemu-build.sh
+++ b/qemu-build.sh
@@ -138,10 +138,10 @@
 EOF
 )
 
+docker build -t ${imgname} - <<< "${Dockerfile}"
 # If Launch is left empty will create a docker container
 if [[ "${launch}" == "" ]]; then
 
-  docker build -t ${imgname} - <<< "${Dockerfile}"
   if [[ "$?" -ne 0 ]]; then
     echo "Failed to build docker container."
     exit 1