diff --git a/.gitea/workflows/build_and_test.yml b/.gitea/workflows/build_and_test.yml
index 6d8c5b37..ff8241e9 100644
--- a/.gitea/workflows/build_and_test.yml
+++ b/.gitea/workflows/build_and_test.yml
@@ -43,7 +43,11 @@ jobs:
   unit-tests:
     name: Unit tests
     runs-on: jfjoch_rocky8
-    if: github.ref_type != 'tag' && github.ref_type != 'workflow_dispatch'
+    # Not on a tag, on purpose. Releasing is a two-step dance because artifacts do not carry between
+    # runs: the manual dispatch below runs the whole CI (this job included) and then creates the tag,
+    # and the tag push re-runs the workflow only to rebuild and upload. The tag run has therefore
+    # already been tested by the dispatch run it came from.
+    if: github.ref_type != 'tag'
     container:
       image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2511
       options: --gpus all
@@ -160,8 +164,8 @@ jobs:
         run: |
           cd build
           # Build the whole viewer-only tree, not just the GUI: the "viewer" CPack component also
-          # contains the portable CLI tools (rugnux/rugnux_scale/azint/recompress/extract_hkl),
-          # which must exist on disk before cpack installs the component.
+          # contains the portable CLI tools (rugnux, jfjoch_extract_hkl, jfjoch_recompress), which
+          # must exist on disk before cpack installs the component.
           ninja -j16
           cpack
       - name: Upload viewer tgz to release
@@ -186,7 +190,6 @@ jobs:
           done
   build-rpm:
     name: build:rpm (${{ matrix.distro }})
-    if: github.ref_type != 'workflow_dispatch'
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false