diff --git a/.cicd/build.sh b/.cicd/build.sh
index 3e37840dc7..7f210c132c 100755
--- a/.cicd/build.sh
+++ b/.cicd/build.sh
@@ -29,6 +29,9 @@ else # Linux
     if [[ $BUILDKITE == true ]]; then
         # Generate Base Images
         $CICD_DIR/generate-base-images.sh
+        if [[ "$IMAGE_TAG" == 'ubuntu-18.04' ]]; then
+          FULL_TAG='eosio/ci-contracts-builder:base-ubuntu-18.04-develop'
+        fi
     fi
 
     COMMANDS="$PRE_COMMANDS && $BUILD_COMMANDS"
diff --git a/.cicd/integration-tests.sh b/.cicd/integration-tests.sh
index ad00d9a6ff..6ae9b85c00 100755
--- a/.cicd/integration-tests.sh
+++ b/.cicd/integration-tests.sh
@@ -19,8 +19,13 @@ if [[ -f $BUILDKITE_ENV_FILE ]]; then
         evars="$evars --env ${var%%=*}"
     done < "$BUILDKITE_ENV_FILE"
 fi
+
+if [[ "$BUILDKITE" == 'true' && "$IMAGE_TAG" == 'ubuntu-18.04' ]]; then
+  FULL_TAG='eosio/ci-contracts-builder:base-ubuntu-18.04-develop'
+fi
+
 set +e
-eval docker run $ARGS $evars $IMAGE_TAG bash -c \"$COMMANDS\"
+eval docker run $ARGS $evars $FULL_TAG bash -c \"$COMMANDS\"
 EXIT_STATUS=$?
 
 # buildkite
diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index 236ef2d06d..298f3198fd 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -40,7 +40,7 @@ steps:
       - "./.cicd/build.sh"
       - "tar -pczf build.tar.gz build && buildkite-agent artifact upload build.tar.gz"
     env:
-      IMAGE_TAG: "eosio/ci-contracts-builder:base-ubuntu-18.04-develop"
+      IMAGE_TAG: "ubuntu-18.04"
     agents:
       queue: "automation-eks-eos-builder-fleet"
     timeout: ${TIMEOUT:-60}
@@ -321,7 +321,7 @@ steps:
       - "buildkite-agent artifact download build.tar.gz . --step ':ubuntu: Ubuntu 18.04 - Build' --agent-access-token $$BUILDKITE_AGENT_ACCESS_TOKEN && tar -xzf build.tar.gz"
       - "./.cicd/integration-tests.sh"
     env:
-      IMAGE_TAG: "eosio/ci-contracts-builder:base-ubuntu-18.04-develop"
+      IMAGE_TAG: "ubuntu-18.04"
     agents:
       queue: "automation-eks-eos-tester-fleet"
     timeout: ${TIMEOUT:-10}