diff --git a/.ci.yaml b/.ci.yaml
index 2d5bac34552..921ef16b1ae 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -58,6 +58,15 @@ platform_properties:
         ]
       device_type: none
       os: Windows
+  windows_x64:
+    properties:
+      dependencies: >
+        [
+          {"dependency": "certs", "version": "version:9563bb"}
+        ]
+      device_type: none
+      os: Windows
+      cpu: x86
   mac_arm64:
     properties:
       dependencies: >-
@@ -905,6 +914,20 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
+  - name: Windows_x64 custom_package_tests master - packages
+    recipe: packages/packages
+    timeout: 60
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      target_file: windows_custom_package_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      dependencies: >
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+
   - name: Windows dart_unit_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
@@ -914,6 +937,16 @@ targets:
       version_file: flutter_master.version
       package_sharding: "--shardIndex 0 --shardCount 2"
 
+  - name: Windows_x64 dart_unit_tests_shard_1 master
+    recipe: packages/packages
+    timeout: 60
+    bringup: true
+    properties:
+      target_file: windows_dart_unit_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 0 --shardCount 2"
+
   - name: Windows dart_unit_tests_shard_2 master
     recipe: packages/packages
     timeout: 60
@@ -923,6 +956,16 @@ targets:
       version_file: flutter_master.version
       package_sharding: "--shardIndex 1 --shardCount 2"
 
+  - name: Windows_x64 dart_unit_tests_shard_2 master
+    recipe: packages/packages
+    timeout: 60
+    bringup: true
+    properties:
+      target_file: windows_dart_unit_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 1 --shardCount 2"
+
   - name: Windows win32-platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
@@ -937,6 +980,21 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
+  - name: Windows_x64 win32-platform_tests_shard_1 master
+    recipe: packages/packages
+    timeout: 60
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      target_file: windows_build_and_platform_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 0 --shardCount 2"
+      dependencies: >
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+
   - name: Windows win32-platform_tests_shard_2 master
     recipe: packages/packages
     timeout: 60
@@ -951,6 +1009,21 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
+  - name: Windows_x64 win32-platform_tests_shard_2 master
+    recipe: packages/packages
+    timeout: 60
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      target_file: windows_build_and_platform_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+      package_sharding: "--shardIndex 1 --shardCount 2"
+      dependencies: >
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+
   - name: Windows win32-platform_tests_shard_1 stable
     recipe: packages/packages
     timeout: 60
@@ -965,6 +1038,21 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
+  - name: Windows_x64 win32-platform_tests_shard_1 stable
+    recipe: packages/packages
+    timeout: 60
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      target_file: windows_build_and_platform_tests.yaml
+      channel: stable
+      version_file: flutter_stable.version
+      package_sharding: "--shardIndex 0 --shardCount 2"
+      dependencies: >
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+
   - name: Windows win32-platform_tests_shard_2 stable
     recipe: packages/packages
     timeout: 60
@@ -979,6 +1067,21 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
+  - name: Windows_x64 win32-platform_tests_shard_2 stable
+    recipe: packages/packages
+    timeout: 60
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      target_file: windows_build_and_platform_tests.yaml
+      channel: stable
+      version_file: flutter_stable.version
+      package_sharding: "--shardIndex 1 --shardCount 2"
+      dependencies: >
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+
   - name: Windows windows-build_all_packages master
     recipe: packages/packages
     timeout: 30
@@ -992,6 +1095,20 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
+  - name: Windows_x64 windows-build_all_packages master
+    recipe: packages/packages
+    timeout: 30
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      target_file: windows_build_all_packages.yaml
+      channel: master
+      version_file: flutter_master.version
+      dependencies: >
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+
   - name: Windows windows-build_all_packages stable
     recipe: packages/packages
     timeout: 30
@@ -1005,6 +1122,20 @@ targets:
           {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
+  - name: Windows_x64 windows-build_all_packages stable
+    recipe: packages/packages
+    timeout: 30
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      target_file: windows_build_all_packages.yaml
+      channel: stable
+      version_file: flutter_stable.version
+      dependencies: >
+        [
+          {"dependency": "vs_build", "version": "version:vs2019"}
+        ]
+
   - name: Windows repo_tools_tests
     recipe: packages/packages
     timeout: 30
@@ -1014,6 +1145,16 @@ targets:
       channel: master
       version_file: flutter_master.version
 
+  - name: Windows_x64 repo_tools_tests
+    recipe: packages/packages
+    timeout: 30
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      target_file: repo_tools_tests.yaml
+      channel: master
+      version_file: flutter_master.version
+
   - name: Linux ci_yaml packages roller
     recipe: infra/ci_yaml
     timeout: 30