diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml
index a2572ac4..15206130 100644
--- a/.github/workflows/bootstrap.yaml
+++ b/.github/workflows/bootstrap.yaml
@@ -2,8 +2,7 @@ name: bootstrap
 
 on:
   push:
-    branches:
-      - '*'
+    branches: [ '*' ]
 
 jobs:
   github:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yaml
similarity index 100%
rename from .github/workflows/codeql-analysis.yml
rename to .github/workflows/codeql-analysis.yaml
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 310d7dc0..b0c9ca6d 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -1,9 +1,8 @@
 name: Publish docs via GitHub Pages
+
 on:
   push:
-    branches:
-      - docs*
-      - main
+    branches: [ 'docs*', main ]
 
 jobs:
   build:
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index f1f5b2b4..2b2b0aa8 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -1,10 +1,10 @@
 name: e2e
 
 on:
-  pull_request:
   push:
-    branches:
-      - main
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
   kind:
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yaml
similarity index 89%
rename from .github/workflows/fossa.yml
rename to .github/workflows/fossa.yaml
index 074663f5..52feed38 100644
--- a/.github/workflows/fossa.yml
+++ b/.github/workflows/fossa.yaml
@@ -2,9 +2,9 @@ name: FOSSA
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 jobs:
   scan:
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yaml
similarity index 93%
rename from .github/workflows/rebase.yml
rename to .github/workflows/rebase.yaml
index 74a9049a..623b0fbe 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yaml
@@ -2,9 +2,9 @@ name: rebase
 
 on:
   pull_request:
-    types: [opened]
+    types: [ opened ]
   issue_comment:
-    types: [created]
+    types: [ created ]
 
 jobs:
   rebase:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 5f360131..106bb666 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -2,8 +2,7 @@ name: release
 
 on:
   push:
-    tags:
-      - '*'
+    tags: [ '*' ]
 
 jobs:
   goreleaser:
diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yaml
similarity index 92%
rename from .github/workflows/snyk.yml
rename to .github/workflows/snyk.yaml
index 88918bf1..2cdfdbfa 100644
--- a/.github/workflows/snyk.yml
+++ b/.github/workflows/snyk.yaml
@@ -2,9 +2,9 @@ name: Snyk
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 jobs:
   security:
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yaml
similarity index 100%
rename from .github/workflows/update.yml
rename to .github/workflows/update.yaml
diff --git a/docs/internal/release.md b/docs/internal/release.md
index 96ecc537..0910a181 100644
--- a/docs/internal/release.md
+++ b/docs/internal/release.md
@@ -130,7 +130,7 @@ Upgrade procedure:
 
 `fluxcd/flux2`:
 
-1. Update the `github.com/fluxcd/*-controller/api` version in `flux2/go.mod` (automated with [GitHub Actions](../../.github/workflows/update.yml))
+1. Update the `github.com/fluxcd/*-controller/api` version in `flux2/go.mod` (automated with [GitHub Actions](../../.github/workflows/update.yaml))
 1. Update the `github.com/fluxcd/pkg/*` version in `flux2/go.mod`
 1. Update the `k8s.io/*` and `github.com/fluxcd/pkg/runtime` version in `flux2/go.mod`