diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 168f2400009..d379fe15496 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -5,7 +5,7 @@ on:
 
   push:
     branches:
-      - 2.8.x # Check 2.8.x branch after merge
+      - 2.8.x # Check branch after merge
 
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b5bca314aaa..28bb0ff883e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,14 +4,12 @@ on:
   push:
     branches: # Snapshots
       - 2.8.x
-    tags: ["*"] # Releases
+    tags: ["**"] # Releases
+  release:
+    types: [published]
 
 jobs:
   publish-artifacts:
     name: Publish / Artifacts
     uses: playframework/.github/.github/workflows/publish.yml@v2
-    secrets:
-      username: ${{ secrets.SONATYPE_USERNAME }}
-      password: ${{ secrets.SONATYPE_PASSWORD }}
-      pgp_passphrase: ${{ secrets.PGP_PASSPHRASE }}
-      pgp_secret: ${{ secrets.PGP_SECRET }}
+    secrets: inherit