diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
index 547ba71b459f..004b9fb2567c 100644
--- a/.buildkite/auditbeat/auditbeat-pipeline.yml
+++ b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -24,7 +24,7 @@ steps:
 
     steps:
       - label: ":ubuntu: Unit Tests"
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: linux/Unit Tests"
@@ -37,7 +37,7 @@ steps:
           - "auditbeat/build/*.json"
 
       - label: ":rhel: Unit Tests"
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: rhel/Unit Tests"
@@ -51,7 +51,7 @@ steps:
 
       - label: ":windows:-2016 Unit Tests"
         key: "windows-2016"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: windows-2016/Unit Tests"
@@ -67,7 +67,7 @@ steps:
 
       - label: ":windows:-2022 Unit Tests"
         key: "windows-2022"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: windows-2022/Unit Tests"
@@ -102,7 +102,7 @@ steps:
       - label: ":linux: ARM64 Unit Tests"
         key: "arm-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "auditbeat for arm" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: Unit Tests ARM"
@@ -115,7 +115,7 @@ steps:
       - label: ":mac: MacOS Unit Tests"
         key: "macos-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "auditbeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: MacOS Unit Tests"
@@ -127,7 +127,7 @@ steps:
       - label: ":mac: MacOS ARM Unit Tests"
         key: "macos-extended-arm"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "auditbeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: MacOS ARM Unit Tests"
@@ -143,7 +143,7 @@ steps:
     steps:
       - label: ":windows:-2019 Unit Tests"
         key: "windows-extended-2019"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: Win-2019 Unit Tests"
@@ -159,7 +159,7 @@ steps:
 
       - label: ":windows:-11 Unit Tests"
         key: "windows-extended-11"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: Win-11 Unit Tests"
@@ -175,7 +175,7 @@ steps:
 
       - label: ":windows:-10 Unit Tests"
         key: "windows-extended-10"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Auditbeat: Win-10 Unit Tests"
diff --git a/.buildkite/auditbeat/scripts/crosscompile.sh b/.buildkite/auditbeat/scripts/crosscompile.sh
deleted file mode 100755
index da8452d53808..000000000000
--- a/.buildkite/auditbeat/scripts/crosscompile.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Executing Crosscompile"
-make -C auditbeat crosscompile
diff --git a/.buildkite/auditbeat/scripts/unit-tests.sh b/.buildkite/auditbeat/scripts/unit-tests.sh
deleted file mode 100755
index 4b8e86243c9d..000000000000
--- a/.buildkite/auditbeat/scripts/unit-tests.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Running Unit Tests"
-sudo chmod -R go-w auditbeat/
-
-umask 0022
-mage -d auditbeat build unitTest
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
index f311f6b6f4e3..80e5ba094d2b 100644
--- a/.buildkite/filebeat/filebeat-pipeline.yml
+++ b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -23,7 +23,7 @@ steps:
 
     steps:
       - label: ":ubuntu: Unit Tests"
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: linux/Unit Tests"
@@ -36,7 +36,7 @@ steps:
           - "filebeat/build/*.json"
 
       - label: ":ubuntu: Go Integration Tests"
-        command: "mage -d ${BEATS_PROJECT_NAME} goIntegTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage goIntegTest"
         notify:
           - github_commit_status:
               context: "Filebeat: Go Integration Tests"
@@ -49,7 +49,7 @@ steps:
           - "filebeat/build/*.json"
 
       - label: ":ubuntu: Python Integration Tests"
-        command: "mage -d ${BEATS_PROJECT_NAME} pythonIntegTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage pythonIntegTest"
         notify:
           - github_commit_status:
               context: "Filebeat: Python Integration Tests"
@@ -63,7 +63,7 @@ steps:
 
       - label: ":windows:-2016 Unit Tests"
         key: "windows-2016"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: windows-2016/Unit Tests"
@@ -79,7 +79,7 @@ steps:
 
       - label: ":windows:-2022 Unit Tests"
         key: "windows-2022"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: windows-2022/Unit Tests"
@@ -101,7 +101,7 @@ steps:
       - label: ":linux: ARM64 Unit Tests"
         key: "arm-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "filebeat for arm" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: Unit Tests ARM"
@@ -114,7 +114,7 @@ steps:
       - label: ":mac: MacOS Unit Tests"
         key: "macos-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "filebeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: MacOS Unit Tests"
@@ -126,7 +126,7 @@ steps:
       - label: ":mac: MacOS ARM Unit Tests"
         key: "macos-extended-arm"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "filebeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: MacOS ARM Unit Tests"
@@ -142,7 +142,7 @@ steps:
     steps:
       - label: ":windows: Win 2019 Unit Tests"
         key: "windows-extended-2019"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: Win-2019 Unit Tests"
@@ -158,7 +158,7 @@ steps:
 
       - label: ":windows:-11 Unit Tests"
         key: "windows-extended-11"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: Win-11 Unit Tests"
@@ -174,7 +174,7 @@ steps:
 
       - label: ":windows:-10 Unit Tests"
         key: "windows-extended-10"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Filebeat: Win-10 Unit Tests"
diff --git a/.buildkite/filebeat/scripts/integration-gotests.sh b/.buildkite/filebeat/scripts/integration-gotests.sh
deleted file mode 100755
index 6de39ff88171..000000000000
--- a/.buildkite/filebeat/scripts/integration-gotests.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Executing Integration Tests"
-sudo chmod -R go-w filebeat/
-
-cd filebeat
-umask 0022
-mage goIntegTest
diff --git a/.buildkite/filebeat/scripts/integration-pytests.sh b/.buildkite/filebeat/scripts/integration-pytests.sh
deleted file mode 100755
index 9aff8695c35a..000000000000
--- a/.buildkite/filebeat/scripts/integration-pytests.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Executing Integration Tests"
-sudo chmod -R go-w filebeat/
-
-cd filebeat
-umask 0022
-mage pythonIntegTest
diff --git a/.buildkite/filebeat/scripts/unit-tests.sh b/.buildkite/filebeat/scripts/unit-tests.sh
deleted file mode 100755
index 2efb6b1ff8e7..000000000000
--- a/.buildkite/filebeat/scripts/unit-tests.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Executing Unit Tests"
-sudo chmod -R go-w filebeat/
-
-umask 0022
-mage -d filebeat unitTest
diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
index 1d32df6e5363..9e459e553e5c 100644
--- a/.buildkite/heartbeat/heartbeat-pipeline.yml
+++ b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -24,7 +24,7 @@ steps:
 
     steps:
       - label: ":ubuntu: Unit Tests"
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: ubuntu/Unit Tests"
@@ -37,7 +37,7 @@ steps:
           - "heartbeat/build/*.json"
 
       - label: ":rhel:-9 Unit Tests"
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: rhel-9/Unit Tests"
@@ -51,7 +51,7 @@ steps:
 
       - label: ":windows:-2016 Unit Test"
         key: "windows-2016"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: windows-2016/Unit Tests"
@@ -66,7 +66,7 @@ steps:
 
       - label: ":windows:-2022 Unit Test"
         key: "windows-2022"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: windows-2022/Unit Tests"
@@ -80,7 +80,7 @@ steps:
           - "heartbeat/build/*.json"
 
       - label: ":ubuntu: Go Integration Tests"
-        command:  "mage -d ${BEATS_PROJECT_NAME} goIntegTest"
+        command:  "cd ${BEATS_PROJECT_NAME} && mage goIntegTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: Go Integration Tests"
@@ -93,7 +93,7 @@ steps:
           - "heartbeat/build/*.json"
 
       - label: ":ubuntu: Python Integration Tests"
-        command: "mage -d ${BEATS_PROJECT_NAME} pythonIntegTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage pythonIntegTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: Python Integration Tests"
@@ -113,7 +113,7 @@ steps:
       - label: ":linux: ARM64 Unit Tests"
         key: "arm-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "heartbeat for arm" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: Unit Tests ARM"
@@ -126,7 +126,7 @@ steps:
       - label: ":mac: MacOS Unit Tests"
         key: "macos-extended"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "heartbeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: MacOS Unit Tests"
@@ -138,7 +138,7 @@ steps:
       - label: ":mac: MacOS ARM Unit Tests"
         key: "macos-extended-arm"
         if: build.env("GITHUB_PR_TRIGGER_COMMENT") == "heartbeat for macos" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/
-        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
+        command: "cd ${BEATS_PROJECT_NAME} && mage unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: MacOS ARM Unit Tests"
@@ -154,7 +154,7 @@ steps:
     steps:
       - label: ":windows:-2019 Unit Tests"
         key: "windows-extended-2019"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: Win-2019 Unit Tests"
@@ -169,7 +169,7 @@ steps:
 
       - label: ":windows:-11 Unit Tests"
         key: "windows-extended-11"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: Win-11 Unit Tests"
@@ -184,7 +184,7 @@ steps:
 
       - label: ":windows:-10 Unit Tests"
         key: "windows-extended-10"
-        command: "mage -d ${BEATS_PROJECT_NAME} build unitTest"
+        command: "mage -d ${BEATS_PROJECT_NAME} unitTest"
         notify:
           - github_commit_status:
               context: "Heartbeat: Win-10 Unit Tests"
diff --git a/.buildkite/heartbeat/scripts/integration-gotests.sh b/.buildkite/heartbeat/scripts/integration-gotests.sh
deleted file mode 100755
index c50dbf453473..000000000000
--- a/.buildkite/heartbeat/scripts/integration-gotests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Executing Integration Tests"
-# Remove when custom image is set up
-sudo chmod -R go-w heartbeat/
-
-cd heartbeat
-# Remove when custom image is set up
-umask 0022
-mage goIntegTest
diff --git a/.buildkite/heartbeat/scripts/integration-pytests.sh b/.buildkite/heartbeat/scripts/integration-pytests.sh
deleted file mode 100755
index 5875b5460ed6..000000000000
--- a/.buildkite/heartbeat/scripts/integration-pytests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Executing Integration Tests"
-# Remove when custom image is set up
-sudo chmod -R go-w heartbeat/
-
-cd heartbeat
-# Remove when custom image is set up
-umask 0022
-mage pythonIntegTest
diff --git a/.buildkite/heartbeat/scripts/unit-tests.sh b/.buildkite/heartbeat/scripts/unit-tests.sh
deleted file mode 100755
index 1d8de9457882..000000000000
--- a/.buildkite/heartbeat/scripts/unit-tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Running Unit Tests"
-# Remove when custom image is set up
-sudo chmod -R go-w heartbeat/
-
-cd heartbeat
-# Remove when custom image is set up
-umask 0022
-mage build unitTest
diff --git a/filebeat/docker-compose.yml b/filebeat/docker-compose.yml
index 80d7eb6a7ff3..36be6159aae5 100644
--- a/filebeat/docker-compose.yml
+++ b/filebeat/docker-compose.yml
@@ -46,6 +46,6 @@ services:
       - 1883:1883
 
   redis:
-    build: ${ES_BEATS}/filebeat/input/redis/_meta
+    build: ${PWD}/input/redis/_meta
     ports:
       - 6379:6379