diff --git a/.gitlab/bazel/defs.yaml b/.gitlab/bazel/defs.yaml
index 3d0352fddd5fb2..db135df7a32341 100644
--- a/.gitlab/bazel/defs.yaml
+++ b/.gitlab/bazel/defs.yaml
@@ -33,10 +33,10 @@
   extends: .linux_arm64
 
 .bazel:runner:macos-amd64:
-  tags: [ "macos:ventura-amd64", "specific:true" ]
+  tags: [ "macos:sonoma-amd64", "specific:true" ]
 
 .bazel:runner:macos-arm64:
-  tags: [ "macos:ventura-arm64", "specific:true" ]
+  tags: [ "macos:sonoma-arm64", "specific:true" ]
 
 .bazel:runner:windows-amd64:
   extends: .windows_docker_default
diff --git a/.gitlab/lint/macos.yml b/.gitlab/lint/macos.yml
index 1ac210b3c284b4..8fec6696164258 100644
--- a/.gitlab/lint/macos.yml
+++ b/.gitlab/lint/macos.yml
@@ -17,8 +17,8 @@ include:
 
 lint_macos_gitlab_amd64:
   extends: .lint_macos_gitlab
-  tags: ["macos:ventura-amd64", "specific:true"]
+  tags: ["macos:sonoma-amd64", "specific:true"]
 
 lint_macos_gitlab_arm64:
   extends: .lint_macos_gitlab
-  tags: ["macos:ventura-arm64", "specific:true"]
+  tags: ["macos:sonoma-arm64", "specific:true"]
diff --git a/.gitlab/package_build/dmg.yml b/.gitlab/package_build/dmg.yml
index 94a724d95d8d61..152fa92df0739d 100644
--- a/.gitlab/package_build/dmg.yml
+++ b/.gitlab/package_build/dmg.yml
@@ -71,8 +71,8 @@
 
 agent_dmg-x64-a7:
   extends: .agent_dmg
-  tags: ["macos:ventura-amd64", "specific:true"]
+  tags: ["macos:sonoma-amd64", "specific:true"]
 
 agent_dmg-arm64-a7:
   extends: .agent_dmg
-  tags: ["macos:ventura-arm64", "specific:true"]
+  tags: ["macos:sonoma-arm64", "specific:true"]
diff --git a/.gitlab/source_test/kmt_tasks.yml b/.gitlab/source_test/kmt_tasks.yml
index d9101cbafa1172..1d099860aca1b3 100644
--- a/.gitlab/source_test/kmt_tasks.yml
+++ b/.gitlab/source_test/kmt_tasks.yml
@@ -7,6 +7,10 @@
   rules:
     - !reference [.on_invoke_tasks_changes]
     - !reference [.except_mergequeue]
+    - changes:
+        paths:
+          - .gitlab/source_test/kmt_tasks.yml
+        compare_to: $COMPARE_TO_BRANCH
   script:
     - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf "git@github.com:"
     # Avoid rate limits when running kmt.init (pulumi queries the Github API to get the releases of plugins)
@@ -32,7 +36,7 @@ test_kmt_local_setup_macos:
   extends: .test_kmt_local_setup
   before_script:
     - !reference [.macos_gitlab, before_script]
-  tags: ["macos:ventura-amd64", "specific:true"]
+  tags: ["macos:sonoma-amd64", "specific:true"]
   variables:
      # Some requirements cannot be tested in the CI yet:
     # - Docker,Compiler,UserInDockerGroup: no docker-in-docker support in these jobs yet
diff --git a/.gitlab/source_test/macos.yml b/.gitlab/source_test/macos.yml
index dc3790171de073..f6e94e96f42a3c 100644
--- a/.gitlab/source_test/macos.yml
+++ b/.gitlab/source_test/macos.yml
@@ -40,8 +40,8 @@ include:
 
 tests_macos_gitlab_amd64:
   extends: .tests_macos_gitlab
-  tags: ["macos:ventura-amd64", "specific:true"]
+  tags: ["macos:sonoma-amd64", "specific:true"]
 
 tests_macos_gitlab_arm64:
   extends: .tests_macos_gitlab
-  tags: ["macos:ventura-arm64", "specific:true"]
+  tags: ["macos:sonoma-arm64", "specific:true"]