diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml
index 9be0fb58a..45ca40b26 100644
--- a/.github/workflows/gobuild.yml
+++ b/.github/workflows/gobuild.yml
@@ -78,14 +78,14 @@ jobs:
 
       - uses: docker/setup-qemu-action@v2
 
+      - name: Login to Artifactory
+        run: docker login --username svc_terrascan --password ${{ secrets.ARTIFACTORY_API_TOKEN }}  https://docker-terrascan-local.artifactory.eng.tenable.com
+
       - name: Build latest docker image
         run: make docker-build-push-latest
         env:
           MULTIPLATFORM: true
 
-      - name: Login to Artifactory
-        run: docker login --username svc_terrascan --password ${{ secrets.ARTIFACTORY_API_TOKEN }}  https://docker-terrascan-local.artifactory.eng.tenable.com
-
       - name: Pull Image
         run:  docker pull docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:1.0.10.DEV231011191849-J-EPRT-TENB-CB-TENB-CB-CICD-5797-10
 
diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
index ceb98d31b..34d88b6f5 100755
--- a/scripts/docker-build.sh
+++ b/scripts/docker-build.sh
@@ -32,7 +32,10 @@ fi
 
 declare -a PLATFORM
 if [ "${MULTIPLATFORM-false}" = "true" ]; then
+  OUTPUT_TYPE="--push"
   PLATFORM=("--platform" "linux/amd64,linux/arm64")
+else
+  OUTPUT_TYPE="--load"
 fi
 
 docker buildx create "${PLATFORM[@]}" --name terrascan-builder --use