diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index fdccce0..b84a7ad 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,9 +25,9 @@ jobs:
       - name: Put it under git, as the README's create steps do
         working-directory: ${{ runner.temp }}/my-analysis
         run: git init -q -b main && git add -A
-      - uses: prefix-dev/setup-pixi@v0.8.0
+      - uses: prefix-dev/setup-pixi@v0.11.1
         with:
-          pixi-version: v0.60.0
+          pixi-version: latest
           manifest-path: ${{ runner.temp }}/my-analysis/pixi.toml
           cache: false
       - name: Run tests
diff --git a/{{cookiecutter.project_name}}/.claude/settings.json b/{{cookiecutter.project_name}}/.claude/settings.json
index 71a5088..23d190b 100644
--- a/{{cookiecutter.project_name}}/.claude/settings.json
+++ b/{{cookiecutter.project_name}}/.claude/settings.json
@@ -11,6 +11,7 @@
         "analysis-workflow@quadbio": true
     },
     "permissions": {
+        "additionalDirectories": ["../{{ cookiecutter.project_name }}-lock"],
         "deny": [
             "Bash(git add -A:*)",
             "Bash(git add --all:*)",
diff --git a/{{cookiecutter.project_name}}/.gitattributes b/{{cookiecutter.project_name}}/.gitattributes
new file mode 100644
index 0000000..ba44862
--- /dev/null
+++ b/{{cookiecutter.project_name}}/.gitattributes
@@ -0,0 +1 @@
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true
diff --git a/{{cookiecutter.project_name}}/.github/workflows/lint.yaml b/{{cookiecutter.project_name}}/.github/workflows/lint.yaml
index db9a7d5..8bc33a7 100644
--- a/{{cookiecutter.project_name}}/.github/workflows/lint.yaml
+++ b/{{cookiecutter.project_name}}/.github/workflows/lint.yaml
@@ -19,9 +19,9 @@ jobs:
         with:
           filter: blob:none
           fetch-depth: 0
-      - uses: prefix-dev/setup-pixi@v0.8.0
+      - uses: prefix-dev/setup-pixi@v0.11.1
         with:
-          pixi-version: v0.60.0
+          pixi-version: latest
           cache: true
           frozen: true
       - name: Run pre-commit checks
diff --git a/{{cookiecutter.project_name}}/.github/workflows/test.yaml b/{{cookiecutter.project_name}}/.github/workflows/test.yaml
index 7485677..59283ef 100644
--- a/{{cookiecutter.project_name}}/.github/workflows/test.yaml
+++ b/{{cookiecutter.project_name}}/.github/workflows/test.yaml
@@ -22,9 +22,9 @@ jobs:
         with:
           filter: blob:none
           fetch-depth: 0
-      - uses: prefix-dev/setup-pixi@v0.8.0
+      - uses: prefix-dev/setup-pixi@v0.11.1
         with:
-          pixi-version: v0.60.0
+          pixi-version: latest
           cache: true
           frozen: true
       - name: Run tests