diff --git a/.github/workflows/_reusable-docker-build-single.yaml b/.github/workflows/_reusable-docker-build-single.yaml
index a254225f95..448076f2f9 100644
--- a/.github/workflows/_reusable-docker-build-single.yaml
+++ b/.github/workflows/_reusable-docker-build-single.yaml
@@ -1,5 +1,6 @@
+---
 # Re-usable workflow for a single-architecture build
-name: Single-arch Container build
+name: Reusable - Single-arch Container build
 
 on:
   workflow_call:
diff --git a/.github/workflows/_reusable-docker-build.yaml b/.github/workflows/_reusable-docker-build.yaml
index c781b9400c..e163d4d813 100644
--- a/.github/workflows/_reusable-docker-build.yaml
+++ b/.github/workflows/_reusable-docker-build.yaml
@@ -1,5 +1,6 @@
+---
 # Re-usable workflow for a multi-architecture build
-name: Multi-arch container build
+name: Reusable - Multi-arch container build
 
 on:
   workflow_call:
diff --git a/.github/workflows/api-py-publish.yml b/.github/workflows/api-py-publish.yml
index 61a94331a4..99328be6a4 100644
--- a/.github/workflows/api-py-publish.yml
+++ b/.github/workflows/api-py-publish.yml
@@ -1,10 +1,13 @@
-name: authentik-api-py-publish
+---
+name: API - Publish Python client
+
 on:
   push:
     branches: [main]
     paths:
       - "schema.yml"
   workflow_dispatch:
+
 jobs:
   build:
     if: ${{ github.repository != 'goauthentik/authentik-internal' }}
diff --git a/.github/workflows/api-ts-publish.yml b/.github/workflows/api-ts-publish.yml
index b38054c467..09a367c201 100644
--- a/.github/workflows/api-ts-publish.yml
+++ b/.github/workflows/api-ts-publish.yml
@@ -1,10 +1,13 @@
-name: authentik-api-ts-publish
+---
+name: API - Publish Typescript client
+
 on:
   push:
     branches: [main]
     paths:
       - "schema.yml"
   workflow_dispatch:
+
 jobs:
   build:
     if: ${{ github.repository != 'goauthentik/authentik-internal' }}
diff --git a/.github/workflows/ci-api-docs.yml b/.github/workflows/ci-api-docs.yml
index b9404cbf3b..3d0a2b45c2 100644
--- a/.github/workflows/ci-api-docs.yml
+++ b/.github/workflows/ci-api-docs.yml
@@ -1,4 +1,5 @@
-name: authentik-ci-api-docs
+---
+name: CI - API Docs
 
 on:
   push:
diff --git a/.github/workflows/ci-aws-cfn.yml b/.github/workflows/ci-aws-cfn.yml
index 7b5fe19219..d2e1ef1e23 100644
--- a/.github/workflows/ci-aws-cfn.yml
+++ b/.github/workflows/ci-aws-cfn.yml
@@ -1,4 +1,5 @@
-name: authentik-ci-aws-cfn
+---
+name: CI - AWS cfn
 
 on:
   push:
diff --git a/.github/workflows/publish-source-docs.yml b/.github/workflows/ci-docs-source.yml
similarity index 95%
rename from .github/workflows/publish-source-docs.yml
rename to .github/workflows/ci-docs-source.yml
index 097857dbc4..94651fd008 100644
--- a/.github/workflows/publish-source-docs.yml
+++ b/.github/workflows/ci-docs-source.yml
@@ -1,4 +1,5 @@
-name: authentik-publish-source-docs
+---
+name: CI - Source code docs
 
 on:
   push:
diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml
index 2758d271f9..dd8846cecc 100644
--- a/.github/workflows/ci-docs.yml
+++ b/.github/workflows/ci-docs.yml
@@ -1,4 +1,5 @@
-name: authentik-ci-docs
+---
+name: CI - Docs
 
 on:
   push:
diff --git a/.github/workflows/ci-main-daily.yml b/.github/workflows/ci-main-daily.yml
index bb74ae96fc..05df41ae3f 100644
--- a/.github/workflows/ci-main-daily.yml
+++ b/.github/workflows/ci-main-daily.yml
@@ -1,5 +1,5 @@
 ---
-name: authentik-ci-main-daily
+name: CI - Main daily
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 2c5304d2b5..67fe7c985d 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -1,5 +1,5 @@
 ---
-name: authentik-ci-main
+name: CI - Main
 
 on:
   push:
diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml
index 95e246a509..33a7f6755d 100644
--- a/.github/workflows/ci-outpost.yml
+++ b/.github/workflows/ci-outpost.yml
@@ -1,5 +1,5 @@
 ---
-name: authentik-ci-outpost
+name: CI - Outpost
 
 on:
   push:
diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml
index 7df25a961b..7237b2b5b2 100644
--- a/.github/workflows/ci-web.yml
+++ b/.github/workflows/ci-web.yml
@@ -1,4 +1,5 @@
-name: authentik-ci-web
+---
+name: CI - Web
 
 on:
   push:
diff --git a/.github/workflows/image-compress.yml b/.github/workflows/gen-image-compress.yml
similarity index 98%
rename from .github/workflows/image-compress.yml
rename to .github/workflows/gen-image-compress.yml
index ca7a40bd03..b23e0ef589 100644
--- a/.github/workflows/image-compress.yml
+++ b/.github/workflows/gen-image-compress.yml
@@ -1,5 +1,5 @@
 ---
-name: authentik-compress-images
+name: Gen - Compress images
 
 on:
   push:
diff --git a/.github/workflows/gen-update-webauthn-mds.yml b/.github/workflows/gen-update-webauthn-mds.yml
index bb36d098bb..adf1a1aca5 100644
--- a/.github/workflows/gen-update-webauthn-mds.yml
+++ b/.github/workflows/gen-update-webauthn-mds.yml
@@ -1,4 +1,6 @@
-name: authentik-gen-update-webauthn-mds
+---
+name: Gen - Webauthn MDS
+
 on:
   workflow_dispatch:
   schedule:
diff --git a/.github/workflows/gha-cache-cleanup.yml b/.github/workflows/gh-gha-cache-cleanup.yml
similarity index 95%
rename from .github/workflows/gha-cache-cleanup.yml
rename to .github/workflows/gh-gha-cache-cleanup.yml
index 473625d1cc..0af9f44ee7 100644
--- a/.github/workflows/gha-cache-cleanup.yml
+++ b/.github/workflows/gh-gha-cache-cleanup.yml
@@ -1,6 +1,7 @@
 ---
 # See https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
-name: Cleanup cache after PR is closed
+name: GH - Cleanup actions cache after PR is closed
+
 on:
   pull_request:
     types:
diff --git a/.github/workflows/ghcr-retention.yml b/.github/workflows/gh-ghcr-retention.yml
similarity index 96%
rename from .github/workflows/ghcr-retention.yml
rename to .github/workflows/gh-ghcr-retention.yml
index 2ee1d65b96..3ecc81d488 100644
--- a/.github/workflows/ghcr-retention.yml
+++ b/.github/workflows/gh-ghcr-retention.yml
@@ -1,4 +1,5 @@
-name: ghcr-retention
+---
+name: GH - GHCR retention
 
 on:
   # schedule:
diff --git a/.github/workflows/packages-npm-publish.yml b/.github/workflows/packages-npm-publish.yml
index fb99fb1337..4f984fe457 100644
--- a/.github/workflows/packages-npm-publish.yml
+++ b/.github/workflows/packages-npm-publish.yml
@@ -1,4 +1,6 @@
-name: authentik-packages-npm-publish
+---
+name: Packages - Publish NPM packages
+
 on:
   push:
     branches: [main]
@@ -9,6 +11,7 @@ on:
       - packages/tsconfig/**
       - packages/esbuild-plugin-live-reload/**
   workflow_dispatch:
+
 jobs:
   publish:
     if: ${{ github.repository != 'goauthentik/authentik-internal' }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/qa-codeql.yml
similarity index 97%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/qa-codeql.yml
index bffd2b72fa..bd13575ac2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/qa-codeql.yml
@@ -1,4 +1,5 @@
-name: "CodeQL"
+---
+name: QA - CodeQL
 
 on:
   push:
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/qa-semgrep.yml
similarity index 89%
rename from .github/workflows/semgrep.yml
rename to .github/workflows/qa-semgrep.yml
index a1a7509f27..70c7d35937 100644
--- a/.github/workflows/semgrep.yml
+++ b/.github/workflows/qa-semgrep.yml
@@ -1,4 +1,6 @@
-name: authentik-semgrep
+---
+name: QA - Semgrep
+
 on:
   workflow_dispatch: {}
   pull_request: {}
@@ -7,10 +9,11 @@ on:
       - main
       - master
     paths:
-      - .github/workflows/semgrep.yml
+      - .github/workflows/qa-semgrep.yml
   schedule:
     # random HH:MM to avoid a load spike on GitHub Actions at 00:00
     - cron: '12 15 * * *'
+
 jobs:
   semgrep:
     name: semgrep/ci
diff --git a/.github/workflows/release-next-branch.yml b/.github/workflows/release-next-branch.yml
index 3b8385ef19..d126c215ae 100644
--- a/.github/workflows/release-next-branch.yml
+++ b/.github/workflows/release-next-branch.yml
@@ -1,4 +1,5 @@
-name: authentik-on-release-next-branch
+---
+name: Release - Update next branch
 
 on:
   schedule:
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 11b00c7c03..aee1517349 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -1,5 +1,5 @@
 ---
-name: authentik-on-release
+name: Release - On publish
 
 on:
   release:
diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
index 198570d8e7..dbcb11200c 100644
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -1,5 +1,5 @@
 ---
-name: authentik-on-tag
+name: Release - On tag
 
 on:
   push:
diff --git a/.github/workflows/repo-mirror-cleanup.yml b/.github/workflows/repo-mirror-cleanup.yml
index 92b046e3bf..a2d7c02b4a 100644
--- a/.github/workflows/repo-mirror-cleanup.yml
+++ b/.github/workflows/repo-mirror-cleanup.yml
@@ -1,4 +1,5 @@
-name: "authentik-repo-mirror-cleanup"
+---
+name: Repo - Cleanup internal mirror
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/repo-mirror.yml b/.github/workflows/repo-mirror.yml
index 44d7ba33a5..243969fe80 100644
--- a/.github/workflows/repo-mirror.yml
+++ b/.github/workflows/repo-mirror.yml
@@ -1,4 +1,5 @@
-name: "authentik-repo-mirror"
+---
+name: Repo - Mirror to internal
 
 on: [push, delete]
 
diff --git a/.github/workflows/repo-stale.yml b/.github/workflows/repo-stale.yml
index 9e2c5f444e..d4e47f1a7b 100644
--- a/.github/workflows/repo-stale.yml
+++ b/.github/workflows/repo-stale.yml
@@ -1,4 +1,5 @@
-name: "authentik-repo-stale"
+---
+name: Repo - Mark and close stale issues
 
 on:
   schedule:
diff --git a/.github/workflows/translation-advice.yml b/.github/workflows/translation-advice.yml
index c79c450474..ef5d8e62f9 100644
--- a/.github/workflows/translation-advice.yml
+++ b/.github/workflows/translation-advice.yml
@@ -1,4 +1,5 @@
-name: authentik-translation-advice
+---
+name: Translation - Post advice
 
 on:
   pull_request:
diff --git a/.github/workflows/translation-extract-compile.yml b/.github/workflows/translation-extract-compile.yml
index 91f7afff7a..85da7e7fd2 100644
--- a/.github/workflows/translation-extract-compile.yml
+++ b/.github/workflows/translation-extract-compile.yml
@@ -1,5 +1,6 @@
 ---
-name: authentik-translate-extract-compile
+name: Translation - Extract and compile
+
 on:
   schedule:
     - cron: "0 0 * * *" # every day at midnight
diff --git a/.github/workflows/translation-rename.yml b/.github/workflows/translation-rename.yml
index a839f2a4fd..374681e553 100644
--- a/.github/workflows/translation-rename.yml
+++ b/.github/workflows/translation-rename.yml
@@ -1,6 +1,7 @@
+---
 # Rename transifex pull requests to have a correct naming
 # Also enables auto squash-merge
-name: authentik-translation-transifex-rename
+name: Translation - Auto-rename Transifex PRs
 
 on:
   pull_request: