diff --git a/besu/build.sh b/besu/build.sh
index 41875a0..1e6bff1 100755
--- a/besu/build.sh
+++ b/besu/build.sh
@@ -5,6 +5,8 @@ cd ${SCRIPT_DIR}/../source
 ./gradlew distDocker
 
 # generate the docker image tag based off besu gradle build
+# view the calculateVersion gradle function incase of changes upstream
+# https://github.com/hyperledger/besu/blob/main/build.gradle
 getImageTag() {
     local length=${1:-8} # Default length
     local gitFolder="$PWD/.git/"
@@ -36,7 +38,36 @@ getImageTag() {
     echo "${lastModified}-develop-${commitHash}"
 }
 
-docker tag "hyperledger/besu:$(getImageTag 7)" "${target_repository}:${target_tag}"
+# list all docker images
+echo "Listing all docker images from gradle build:"
+docker images --format "{{.Repository}}:{{.Tag}}"
+
+# list of tags to check for after building from gradle
+gradle_tags=(
+    "${source_repository}:$(getImageTag)"
+    "${source_repository}:$(getImageTag 7)" # legacy tag
+)
+
+echo "Listing all calculated image tags:"
+for gradle_tag in "${gradle_tags[@]}"; do
+    echo "${gradle_tag}"
+done
+
+tag=""
+for gradle_tag in "${gradle_tags[@]}"; do
+    if docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "${gradle_tag}"; then
+        tag="${gradle_tag}"
+        echo "Matched ${gradle_tag} as the correct image tag."
+        break
+    fi
+done
+
+if [ -z "$tag" ]; then
+    echo "Error: Can't find expected image tag after building from Gradle. Might be updates to source repository's build.gradle."
+    exit 1
+fi
+
+docker tag "${tag}" "${target_repository}:${target_tag}"
 docker push "${target_repository}:${target_tag}"
-docker tag "hyperledger/besu:$(getImageTag 7)" "${target_repository}:${target_tag}-${source_git_commit_hash}"
+docker tag "${tag}" "${target_repository}:${target_tag}-${source_git_commit_hash}"
 docker push "${target_repository}:${target_tag}-${source_git_commit_hash}"