diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index af49e472ce8..864f705b60f 100755
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -72,3 +72,11 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent-binary-dra" ]]; then
     release_manager_login
   fi
 fi
+<<<<<<< HEAD
+=======
+
+# BUILDKITE_PIPELINE_SLUG should match elastic-agent for PRs, and elastic-agent-extended-tests once it has merged to main
+if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent"* && "$BUILDKITE_STEP_KEY" == "integration-fips-cloud-image" ]]; then
+    docker_login
+fi
+>>>>>>> 97246c150 (Fix pre-command to support extended testing (#8418))