diff --git a/.github/workflows/create-draft-release-with-artifacts.yml b/.github/workflows/manual-trigger-draft-release.yml
similarity index 73%
rename from .github/workflows/create-draft-release-with-artifacts.yml
rename to .github/workflows/manual-trigger-draft-release.yml
index 0b46fa6..530018f 100644
--- a/.github/workflows/create-draft-release-with-artifacts.yml
+++ b/.github/workflows/manual-trigger-draft-release.yml
@@ -1,4 +1,8 @@
-name: create-draft-release-with-artifacts
+# we have two workflows for releases, this is the manual one to be triggered
+# in the Actions tab in the repository
+#
+# the automatic one runs in another workflow and checks for tag pushes
+name: manual-trigger-draft-release
 
 on:
   workflow_dispatch:
@@ -8,8 +12,7 @@ on:
         required: true
 
 jobs:
-  github-release:
-    name: github-release
+  create-draft-release-from-manual-trigger:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/pr-workflow.yml
similarity index 96%
rename from .github/workflows/build-and-test.yml
rename to .github/workflows/pr-workflow.yml
index 54eab73..54c8fe3 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/pr-workflow.yml
@@ -1,4 +1,4 @@
-name: PR checks
+name: PR workflow
 
 on:
   push:
@@ -11,8 +11,7 @@ on:
       - "*.md"
 
 jobs:
-  clippy-lints-check:
-    name: clippy-lints-check
+  clippy-checks:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -24,7 +23,6 @@ jobs:
           cargo +stable clippy -- -D warnings
 
   rustfmt-check:
-    name: rustfmt-check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -35,11 +33,10 @@ jobs:
           rustup toolchain install nightly --profile minimal -c rustfmt
           cargo +nightly fmt -- --check
 
-  github-release:
-    name: github-release
+  automated-draft-release:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    needs: build-and-test
+    needs: build-artifacts-and-run-tests
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -58,8 +55,7 @@ jobs:
           draft: true
           files: release/ouch-*
 
-  build-and-test:
-    name: build-and-test
+  build-artifacts-and-run-tests:
     runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     env:
       CARGO: cargo