diff --git a/.gitlab-ci-spack.yml b/.gitlab-ci-spack.yml
new file mode 100644
index 0000000000000000000000000000000000000000..145c88ecb4cc21c8475b87cfd9c59f91d4a8ae1f
--- /dev/null
+++ b/.gitlab-ci-spack.yml
@@ -0,0 +1,35 @@
+---
+include:
+  - local: .gitlab/artifacts.yml
+  - local: .gitlab/rules.yml
+
+  # OS builds.
+  - local: .gitlab/os-linux.yml
+
+stages:
+  - build
+  - test
+
+.linux_builder_tags:
+  tags:
+    - medium
+    - uo
+    - public
+    - x86_64
+
+build:fedora36-mpich:
+  extends:
+    - .fedora36_mpich
+    - .cmake_build_linux
+    - .linux_builder_tags
+    - .cmake_build_artifacts
+    - .run_automatically
+
+test:fedora36-mpich:
+  extends:
+    - .fedora36_mpich
+    - .cmake_test_linux
+    - .linux_builder_tags
+    - .run_automatically
+  needs:
+    - build:fedora36-mpich
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18bbbb073edf49d7405ba75dd0b421a857f3c611..efa1708652a0be4d0600c88687d52c9c8c5f0f61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,29 @@ stages:
 # - Checkers
 #   - clang-tidy?
 
+.linux_builder_tags:
+  tags:
+    - diy
+    - build
+    - docker
+    - linux-x86_64
+
+.linux_tester_priv_tags:
+  tags:
+    - diy
+    - docker
+    - linux-x86_64
+    - privileged
+
+.windows_tags:
+  tags:
+    - diy
+    - nonconcurrent
+    - windows-x86_64
+    - shell
+    - vs2022
+    - msvc-19.33
+
 build:fedora36-mpich:
   extends:
     - .fedora36_mpich
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index d05c37492f9f12e2208a1600851c6d926a84db4d..eb59e6efa21244d7d5f11accc347619d24cff65f 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -59,20 +59,6 @@
     CMAKE_CONFIGURATION: fedora36_ubsan
     CTEST_MEMORYCHECK_TYPE: UndefinedBehaviorSanitizer
 
-.linux_builder_tags:
-  tags:
-    - diy
-    - build
-    - docker
-    - linux-x86_64
-
-.linux_tester_priv_tags:
-  tags:
-    - diy
-    - docker
-    - linux-x86_64
-    - privileged
-
 ## Linux-specific scripts
 .before_script_linux: &before_script_linux
   - .gitlab/ci/cmake.sh
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index cfe5bee6bd4e6ef23227a347ab5dff8f858f49e8..b13485583e4fdbe048246cbd624014bdbdbed46f 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -1,15 +1,6 @@
 ---
 # yamllint disable rule:colons
 # yamllint disable rule:line-length
-.windows_tags:
-  tags:
-    - diy
-    - nonconcurrent
-    - windows-x86_64
-    - shell
-    - vs2022
-    - msvc-19.33
-
 .windows_build:
   variables:
     CCACHE_INSTALL_DIR: "$CI_PROJECT_DIR\\.gitlab"