diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80af8f39e3..b973fb6f62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,8 @@ variables:
     - job: build_linux_armhf
     - job: build_linux_armel
     - job: build_linux_arm64
-    - job: build_windows
+    - job: build_windows_win32
+    - job: build_windows_win64
     - job: macos_codesign
 
 .release_submit_action: &release_submit_action
diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 0969e90d90..de87d12b45 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -244,7 +244,7 @@ build_linux_arm64:
     PLATFORM_NAME: "linux-arm64"
     TEST_CFLAGS: ""
 
-build_windows:
+.build_windows_template: &build_windows_template
   stage: build_openocd
   image: $CI_DOCKER_REGISTRY/esp32-toolchain-win-cross
   tags:
@@ -254,10 +254,9 @@ build_windows:
       - ${DIST_ART_DIR}
     expire_in: 2 weeks
   variables:
-    CONF_HOST: "i686-w64-mingw32"
-    PLATFORM_NAME: "win32"
     ARCHIVE_TOOL: "zip -r"
     ARCHIVE_EXT: "zip"
+    CONF_HOST: "i686-w64-mingw32"
     INSTALL_TARGET: "install-strip"
     HOST_CC: ${CONF_HOST}-gcc
   needs:
@@ -278,6 +277,16 @@ build_windows:
     - *copy_stub_bins
     - *dist_archive
 
+build_windows_win32:
+  extends: .build_windows_template
+  variables:
+    PLATFORM_NAME: "win32"
+
+build_windows_win64:
+  extends: .build_windows_template
+  variables:
+    PLATFORM_NAME: "win64"
+
 build_macos:
   <<: *build_macos_template
   variables:
diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 13b8f47b7a..46044322fe 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -597,7 +597,7 @@ test_on_windows:
   tags:
     - test_jtag_win
   needs:
-    - job: build_windows
+    - job: build_windows_win32
   variables:
     # actually we don't need the project sources, but we need the `git clean` gitlab-runner's stage.
     # It's possible only for `fetch` or `clone`.