diff --git a/.gitattributes b/.gitattributes
index d5799bd..997504b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-# GitHub syntax highlighting
-pixi.lock linguist-language=YAML
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff
diff --git a/.github/workflows/macos-linux-windows-pixi.yml b/.github/workflows/macos-linux-windows-pixi.yml
index 5a3d8fe..e3eebb7 100644
--- a/.github/workflows/macos-linux-windows-pixi.yml
+++ b/.github/workflows/macos-linux-windows-pixi.yml
@@ -40,13 +40,13 @@ jobs:
         build_type: [Release, Debug]
 
         include:
-          - os: windows-latest
+          - os: windows-2022
             build_type: Release
             environment: default
-          - os: windows-latest
+          - os: windows-2022
             build_type: Release
             environment: python-oldest
-          - os: windows-latest
+          - os: windows-2022
             build_type: Release
             environment: clang-cl
 
@@ -90,7 +90,7 @@ jobs:
   #   strategy:
   #     fail-fast: false
   #     matrix:
-  #       os: [ubuntu-latest, macos-latest, macos-15-intel, windows-latest]
+  #       os: [ubuntu-latest, macos-latest, macos-15-intel, windows-2022]
 
   #   steps:
   #     - uses: actions/checkout@v6