diff --git a/.buildkite/bk.integration-fips.pipeline.yml b/.buildkite/bk.integration-fips.pipeline.yml
index 00f1e791488..1431094e246 100644
--- a/.buildkite/bk.integration-fips.pipeline.yml
+++ b/.buildkite/bk.integration-fips.pipeline.yml
@@ -18,31 +18,8 @@ common:
         env_var: "EC_API_KEY"
 
 steps:
-  - label: Build and push custom elastic-agent image
-    depends_on:
-      - 'packaging-containers-x86-64-fips' # Reuse artifacts produced in .buildkite/integration.pipeline.yml
-    key: integration-fips-cloud-image
-    env:
-      FIPS: "true"
-      CUSTOM_IMAGE_TAG: "git-${BUILDKITE_COMMIT:0:12}"
-      CI_ELASTIC_AGENT_DOCKER_IMAGE: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips"
-      TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
-    command: |
-      buildkite-agent artifact download build/distributions/elastic-agent-cloud-fips-*-linux-amd64.docker.tar.gz . --step 'packaging-containers-x86-64-fips'
-      mage cloud:load
-      mage cloud:push
-    agents:
-      provider: "gcp"
-      machineType: "n1-standard-8"
-      image: "${IMAGE_UBUNTU_2404_X86_64}"
-    plugins:
-      - elastic/vault-docker-login#v0.5.2:
-          secret_path: 'kv/ci-shared/platform-ingest/elastic_docker_registry'
-
   - label: Start ESS stack for FIPS integration tests
     key: integration-fips-ess
-    depends_on:
-      - integration-fips-cloud-image
     env:
       ASDF_TERRAFORM_VERSION: 1.9.2
       FIPS: "true"
diff --git a/.buildkite/integration.pipeline.yml b/.buildkite/integration.pipeline.yml
index 706778f4735..5e781b039a8 100644
--- a/.buildkite/integration.pipeline.yml
+++ b/.buildkite/integration.pipeline.yml
@@ -9,6 +9,11 @@ env:
   IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1753491662"
   IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1753491662"
 
+common:
+  - vault_docker_login: &vault_docker_login
+      elastic/vault-docker-login#v0.5.2:
+        secret_path: 'kv/ci-shared/platform-ingest/elastic_docker_registry'
+
 steps:
   - group: "Integration tests: packaging"
     key: "int-packaging"
@@ -108,6 +113,7 @@ steps:
           PLATFORMS: "linux/amd64"
         command: |
           .buildkite/scripts/steps/integration-package.sh
+          .buildkite/scripts/steps/integration-cloud-image-push.sh
         artifact_paths:
           - build/distributions/**
         agents:
@@ -115,6 +121,8 @@ steps:
           machineType: "n2-standard-8"
           diskSizeGb: 200
           image: "${IMAGE_UBUNTU_2204_X86_64}"
+        plugins:
+          - *vault_docker_login
 
       - label: "Packaging: Containers linux/arm64"
         key: packaging-containers-arm64
@@ -139,6 +147,7 @@ steps:
           FIPS: "true"
         command: |
           .buildkite/scripts/steps/integration-package.sh
+          .buildkite/scripts/steps/integration-cloud-image-push.sh
         artifact_paths:
           - build/distributions/**
         agents:
@@ -146,6 +155,8 @@ steps:
           machineType: "n2-standard-8"
           diskSizeGb: 200
           image: "${IMAGE_UBUNTU_2204_X86_64}"
+        plugins:
+          - *vault_docker_login
 
       - label: "Packaging: Containers linux/arm64 FIPS"
         key: packaging-containers-arm64-fips