diff --git a/.buildkite/commands/run-ui-tests.sh b/.buildkite/commands/run-ui-tests.sh
index 6e46300596d..5f5f2ef92ee 100755
--- a/.buildkite/commands/run-ui-tests.sh
+++ b/.buildkite/commands/run-ui-tests.sh
@@ -1,5 +1,12 @@
 #!/bin/bash -eu
 
+if .buildkite/commands/should-skip-ui-tests.sh; then
+  message="Skipping UI Tests as only documentation, tooling and/or non-code files were changed"
+  echo "$message" | buildkite-agent annotate --style "info" --context "skip-ui-tests"
+  echo "$message"
+  exit 0
+fi
+
 TEST_NAME=$1
 DEVICE=$2
 
diff --git a/.buildkite/commands/run-unit-tests.sh b/.buildkite/commands/run-unit-tests.sh
index 0dccce8e07c..1eba1a4729b 100755
--- a/.buildkite/commands/run-unit-tests.sh
+++ b/.buildkite/commands/run-unit-tests.sh
@@ -1,5 +1,12 @@
 #!/bin/bash -eu
 
+if .buildkite/commands/should-skip-tests.sh; then
+  message="Skipping Unit Tests as only documentation and non-code files were changed"
+  echo "$message" | buildkite-agent annotate --style "info" --context "skip-unit-tests"
+  echo "$message"
+  exit 0
+fi
+
 # Run this at the start to fail early if value not available
 echo '--- :test-analytics: Configuring Test Analytics'
 export BUILDKITE_ANALYTICS_TOKEN=$BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS
diff --git a/.buildkite/commands/should-skip-tests.sh b/.buildkite/commands/should-skip-tests.sh
new file mode 100755
index 00000000000..1b4ac2391ba
--- /dev/null
+++ b/.buildkite/commands/should-skip-tests.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Check if changes are limited to documentation, tooling and non-code files
+pr_changed_files --all-match "*.md" "docs/**" "*.txt" "*.pot" "fastlane/**" ".github/**" ".buildkite/**"
diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars
index 2a7cb971dda..a1ad59fecbf 100644
--- a/.buildkite/shared-pipeline-vars
+++ b/.buildkite/shared-pipeline-vars
@@ -4,7 +4,7 @@
 # to set up some variables that will be interpolated in the `.yml` pipeline before uploading it.
 
 XCODE_VERSION=$(sed 's/^~> *//' .xcode-version)
-CI_TOOLKIT_PLUGIN_VERSION="3.9.1"
+CI_TOOLKIT_PLUGIN_VERSION="4.0.0"
 
 # Note: `-v4` suffix was added to use xcode-16.1-v4 image; remember to remove that suffix during the next Xcode update
 export IMAGE_ID="xcode-$XCODE_VERSION-v4"