diff --git a/.github/workflows/texer.yml b/.github/workflows/texer.yml
index 3066824..aedcc14 100644
--- a/.github/workflows/texer.yml
+++ b/.github/workflows/texer.yml
@@ -27,7 +27,9 @@ jobs:
       with:
         tagRegex: "(${{ env.IMAGE_VERSION_PREFIX }}).*"
     - name: dryrun-build
-      if: ${{ ( github.event_name == 'pull_request' &&  contains(github.event.head_commit.message, '#te') ) || ( github.event_name == 'release' && startsWith( steps.process_event.outputs.tag, env.IMAGE_VERSION_PREFIX ) && github.event.release.prerelease ) }}
+      if: >
+          ( github.event_name == 'pull_request' && contains(github.event.pull_request.title, '#te')) ||
+          ( github.event_name == 'release' && startsWith(github.ref, 'refs/tags/te'))
       run: docker build ./${{ env.IMAGE_NAME }}
     - name: build-and-push
       if: ${{ github.event_name == 'release' && startsWith( steps.process_event.outputs.tag, env.IMAGE_VERSION_PREFIX ) && !github.event.release.prerelease }}
diff --git a/.github/workflows/toolshed.yml b/.github/workflows/toolshed.yml
index 1f2e41d..64a7dd0 100644
--- a/.github/workflows/toolshed.yml
+++ b/.github/workflows/toolshed.yml
@@ -13,7 +13,9 @@ env:
 
 jobs:
   release-ts-amd64:
-    if: ${{ ( github.event_name == 'pull_request' && contains(github.event.head_commit.message, '#ts') ) || ( github.event_name == 'release' && startsWith( github.ref, 'refs/tags/ts') ) }}
+    if: >
+      ( github.event_name == 'pull_request' && contains(github.event.pull_request.title, '#ts')) ||
+      ( github.event_name == 'release' && startsWith(github.ref, 'refs/tags/ts'))
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -73,7 +75,9 @@ jobs:
         retention-days: 1
 
   release-ts-arm64:
-    if: ${{ ( github.event_name == 'pull_request' && contains(github.event.head_commit.message, '#ts') ) || ( github.event_name == 'release' && startsWith( github.ref, 'refs/tags/ts') ) }}
+    if: >
+      ( github.event_name == 'pull_request' && contains(github.event.pull_request.title, '#ts')) ||
+      ( github.event_name == 'release' && startsWith(github.ref, 'refs/tags/ts'))
     runs-on: ubuntu-24.04-arm
     strategy:
       matrix:
@@ -136,7 +140,8 @@ jobs:
     if: ${{ github.event_name == 'release' && startsWith( github.ref, 'refs/tags/ts' ) && !github.event.release.prerelease }}
     runs-on: ubuntu-latest
     needs:
-      - release-ts
+      - release-ts-amd64
+      - release-ts-arm64
     steps:
       - name: Download digests
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/toxic.yml b/.github/workflows/toxic.yml
index 6b01c68..a8decd2 100644
--- a/.github/workflows/toxic.yml
+++ b/.github/workflows/toxic.yml
@@ -13,7 +13,9 @@ env:
 
 jobs:
   release-tx:
-    if: ${{ ( github.event_name == 'pull_request' && contains(github.event.head_commit.message, '#tx') ) || ( github.event_name == 'release' && startsWith( github.ref, 'refs/tags/tx') ) }}
+    if: >
+          ( github.event_name == 'pull_request' && contains(github.event.pull_request.title, '#tx')) ||
+          ( github.event_name == 'release' && startsWith(github.ref, 'refs/tags/tx'))
     runs-on: ubuntu-latest
     strategy:
       matrix: