diff --git a/ci/docker/common.yaml b/ci/docker/common.yaml
index bda64fa9f4..d7f7f6621d 100644
--- a/ci/docker/common.yaml
+++ b/ci/docker/common.yaml
@@ -16,16 +16,16 @@ packages:
       - '~cuda'
       - '~openmp'
       - '~rocm'
-  git:
-    # Force git as non-buildable to allow deprecated versions in environments
-    # https://github.com/spack/spack/pull/30040
-    buildable: false
-  hwloc:
-    variants:
-      - '~libxml2'
   mpich:
     version:
       - 3.4.2
     variants:
       - '~fortran'
       - '~libxml2'
+  hwloc:
+    variants:
+      - '~libxml2'
+  git:
+    # Force git as non-buildable to allow deprecated versions in environments
+    # https://github.com/spack/spack/pull/30040
+    buildable: false