diff --git a/.ci.yaml b/.ci.yaml
index 116fa5e5b7f87..7a0526bb08d58 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -262,6 +262,8 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_fuchsia
+      drone_dimensions: >
+        ["os=Linux"]
 
   - name: Linux linux_arm_host_engine
     recipe: engine_v2/engine_v2
@@ -269,10 +271,14 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_arm_host_engine
+      drone_dimensions: >
+        ["os=Linux"]
 
   - name: Linux linux_host_engine
     recipe: engine_v2/engine_v2
     timeout: 60
+    dimensions:
+      os: "Linux"
     properties:
       release_build: "true"
       config_name: linux_host_engine
@@ -283,6 +289,8 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_host_desktop_engine
+      drone_dimensions: >
+        ["os=Linux"]
 
   - name: Linux linux_android_aot_engine
     recipe: engine_v2/engine_v2
@@ -290,6 +298,8 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_android_aot_engine
+      drone_dimensions: >
+        ["os=Linux"]
 
   - name: Linux linux_android_debug_engine
     recipe: engine_v2/engine_v2
@@ -297,12 +307,13 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_android_debug_engine
+      drone_dimensions: >
+        ["os=Linux"]
 
   - name: Linux linux_license
     recipe: engine_v2/builder
     timeout: 60
     properties:
-      release_build: "true"
       config_name: linux_license
       clobber: "true"
 
@@ -312,12 +323,13 @@ targets:
     properties:
       release_build: "true"
       config_name: linux_web_engine
+      drone_dimensions: >
+        ["os=Linux"]
 
   - name: Linux linux_unopt
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
-      release_build: "true"
       config_name: linux_unopt
 
   - name: Linux Web Framework tests
@@ -375,7 +387,10 @@ targets:
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
+      release_build: "true"
       config_name: mac_android_aot_engine
+      drone_dimensions: >
+        ["os=Linux"]
 
   - name: Mac mac_clang_tidy
     recipe: engine_v2/engine_v2
@@ -409,6 +424,8 @@ targets:
         ]
       $flutter/osx_sdk : >-
         { "sdk_version": "14e222b" }
+      drone_dimensions: >
+        ["os=Mac-12"]
 
   - name: Linux mac_unopt
     recipe: engine_v2/engine_v2
@@ -494,13 +511,14 @@ targets:
         [
           {"dependency": "jazzy", "version": "0.14.1"}
         ]
+      drone_dimensions: >
+        ["os=Mac-12"]
 
   - name: Mac impeller-cmake-example
     bringup: true
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
-      release_build: "true"
       cpu: arm64
       config_name: mac_impeller_cmake_example
 
@@ -529,6 +547,8 @@ targets:
     properties:
       release_build: "true"
       config_name: windows_android_aot_engine
+      drone_dimensions: >
+        ["os=Windows"]
 
   - name: Windows windows_host_engine
     recipe: engine_v2/engine_v2
@@ -536,6 +556,8 @@ targets:
     properties:
       release_build: "true"
       config_name: windows_host_engine
+      drone_dimensions: >
+        ["os=Windows"]
 
   - name: Windows windows_arm_host_engine
     recipe: engine_v2/engine_v2
@@ -546,6 +568,8 @@ targets:
     properties:
       release_build: "true"
       config_name: windows_arm_host_engine
+      drone_dimensions: >
+        ["os=Windows"]
 
   - name: Windows windows_unopt
     recipe: engine_v2/builder