diff --git a/.buildkite/commands/run-ui-tests.sh b/.buildkite/commands/run-ui-tests.sh
index 6e46300596d..197664a3314 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/should-skip-ui-tests.sh b/.buildkite/commands/should-skip-ui-tests.sh
new file mode 100755
index 00000000000..3daf5364982
--- /dev/null
+++ b/.buildkite/commands/should-skip-ui-tests.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Check if changes are limited to documentation, tooling and non-code files
+result=$(pr_changed_files --all-match "*.md" "docs/**" "*.txt" "*.pot" "fastlane/**" ".github/**" ".buildkite/**")
+[[ "$result" == "true" ]]
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index ce734252301..a997770da7f 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -116,9 +116,7 @@ steps:
   #################
   - label: ":microscope: UI Tests (iPhone)"
     command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 16'
-    depends_on: build
-    # Only run on `trunk` and `release/*` -- See p91TBi-cBM-p2#comment-13736
-    if: build.branch == 'trunk' || build.branch =~ /^release\//
+    if: build.branch == 'trunk' || build.branch =~ /^release\// || build.branch =~ /^iangmaia\//
     plugins: [$CI_TOOLKIT]
     artifact_paths:
       - fastlane/test_output/*
@@ -128,9 +126,7 @@ steps:
 
   - label: ":microscope: UI Tests (iPad)"
     command: .buildkite/commands/run-ui-tests.sh UITests "iPad (10th generation)"
-    depends_on: build
-    # Only run on `trunk` and `release/*` -- See p91TBi-cBM-p2#comment-13736
-    if: build.branch == 'trunk' || build.branch =~ /^release\//
+    if: build.branch == 'trunk' || build.branch =~ /^release\// || build.branch =~ /^iangmaia\//
     plugins: [$CI_TOOLKIT]
     artifact_paths:
       - fastlane/test_output/*
diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars
index 2a7cb971dda..df703fd1efb 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="3.11.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"