diff --git a/.copier-answers.yml b/.copier-answers.yml
index cc30aa74..dd37fd58 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 5.4.0
+_commit: 5.5.0
 _src_path: https://github.com/DiamondLightSource/python-copier-template.git
 author_email: jacob.williamson@diamond.ac.uk
 author_name: Jacob Williamson
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2499aeb3..82e35a6d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
 
 This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
 
-For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.4.0/how-to.html).
+For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.5.0/how-to.html).
diff --git a/.github/workflows/_dist.yml b/.github/workflows/_dist.yml
index 3b6d83f6..71b50aa0 100644
--- a/.github/workflows/_dist.yml
+++ b/.github/workflows/_dist.yml
@@ -13,7 +13,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.0.0
+        uses: astral-sh/setup-uv@v10.3.2
 
       - name: Build sdist and wheel
         run: >
diff --git a/.github/workflows/_docs.yml b/.github/workflows/_docs.yml
index 6ee62d81..acc52652 100644
--- a/.github/workflows/_docs.yml
+++ b/.github/workflows/_docs.yml
@@ -21,7 +21,7 @@ jobs:
         run: sudo apt-get install graphviz
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.0.0
+        uses: astral-sh/setup-uv@v10.3.2
 
       - name: Build docs
         run: uv run --locked tox -e docs
diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml
index 14b4b269..59b92929 100644
--- a/.github/workflows/_release.yml
+++ b/.github/workflows/_release.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Create GitHub Release
         # We pin to the SHA, not the tag, for security reasons.
         # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
+        uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
index 8ebceb85..b563e8b0 100644
--- a/.github/workflows/_test.yml
+++ b/.github/workflows/_test.yml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.0.0
+        uses: astral-sh/setup-uv@v10.3.2
 
       - name: Run tests
         run: uv run --locked tox -e tests
diff --git a/.github/workflows/_tox.yml b/.github/workflows/_tox.yml
index dd216e76..02115075 100644
--- a/.github/workflows/_tox.yml
+++ b/.github/workflows/_tox.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.0.0
+        uses: astral-sh/setup-uv@v10.3.2
 
       - name: Run tox
         env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 13dec385..332172d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
     tags:
       - "*"
   pull_request:
+  merge_group:
 
 jobs:
   lint:
diff --git a/pyproject.toml b/pyproject.toml
index 1749b713..43b06d19 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -59,9 +59,14 @@ email = "jacob.williamson@diamond.ac.uk"
 name = "Jacob Williamson"
 
 [tool.uv]
+<<<<<<< before updating
 # https://github.com/astral-sh/uv/security/advisories/GHSA-hq85-5cpj-mr62
 required-version = ">=0.13.5"
 constraint-dependencies = ["certifi>=v2026.10.19", "starlette>=1.1.0"]
+=======
+# Minimum uv to fix eMudhra CA cert incident (see discuss.python.org/t/109576)
+required-version = ">=0.13.5"
+>>>>>>> after updating
 
 [tool.setuptools_scm]
 version_file = "src/daq_queuing_service/_version.py"