diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d05e3ed..dee77cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,15 +6,16 @@ on:
     types: [opened, synchronize, reopened, closed]
 
 jobs:
-  # Run tests on PRs (not on merge)
+  # Run tests on PRs. test-api and test-web also run on merge: deploy needs them,
+  # and a skipped job makes everything that needs it skip too.
   test-api:
-    if: github.event.action != 'closed'
+    if: github.event.action != 'closed' || github.event.pull_request.merged == true
     uses: ./.github/workflows/test-cloud-services.yml
     with:
       python_version: '3.11'
 
   test-web:
-    if: github.event.action != 'closed'
+    if: github.event.action != 'closed' || github.event.pull_request.merged == true
     uses: ./.github/workflows/test-web-client.yml
     with:
       node_version: '20'
diff --git a/cloud-services b/cloud-services
index b20da25..46e47f2 160000
--- a/cloud-services
+++ b/cloud-services
@@ -1 +1 @@
-Subproject commit b20da250d92d120f17e3cd27a110db97d41caece
+Subproject commit 46e47f2b9fc7f7179bef359bf4480d8914a84823