diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3588adc1..7710149c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,9 @@
 <!-- Thank you for making a contribution! Here are some tips for you:
 - Use Conventional Commits for the PR title: `type(scope): description`
   - Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore
-  - Scopes for system components: platform, system, linstor, cilium, kube-ovn, dashboard, cluster-api, etc.
-  - Scopes for managed apps: apps, tenant, kubernetes, postgres, virtual-machine, etc.
-  - Scopes for development and maintenance: tests, ci, docs, maintenance
+  - Scopes for system components: dashboard, platform, cilium, kube-ovn, linstor, fluxcd, cluster-api
+  - Scopes for managed apps: postgres, mariadb, redis, kafka, clickhouse, virtual-machine, kubernetes
+  - Scopes for development and maintenance: api, hack, tests, ci, docs, maintenance
   - Breaking changes: append `!` after type/scope (`feat(api)!: ...`) or add a `BREAKING CHANGE:` footer
 - If it's a work in progress, consider creating this PR as a draft.
 - Don't hesistate to ask for opinion and review in the community chats, even if it's still a draft.
diff --git a/docs/agents/contributing.md b/docs/agents/contributing.md
index 17da488c..68a584ee 100644
--- a/docs/agents/contributing.md
+++ b/docs/agents/contributing.md
@@ -22,7 +22,7 @@ git commit --signoff -m "type(scope): brief description"
 **Scopes:**
 - System: `dashboard`, `platform`, `cilium`, `kube-ovn`, `linstor`, `fluxcd`, `cluster-api`
 - Apps: `postgres`, `mariadb`, `redis`, `kafka`, `clickhouse`, `virtual-machine`, `kubernetes`
-- Other: `api`, `hack`, `tests`, `ci`, `docs`
+- Other: `api`, `hack`, `tests`, `ci`, `docs`, `maintenance`
 
 Breaking changes: append `!` after type/scope (`feat(api)!: ...`) or add a `BREAKING CHANGE:` footer.
 
@@ -30,14 +30,14 @@ Breaking changes: append `!` after type/scope (`feat(api)!: ...`) or add a `BREA
 ```bash
 git commit --signoff -m "feat(dashboard): add config hash annotations to restart pods on config changes"
 git commit --signoff -m "fix(postgres): update operator to version 1.2.3"
-git commit --signoff -m "docs: add installation guide"
+git commit --signoff -m "docs(contributing): add installation guide"
 ```
 
 ### AI Agent Attribution
 
 When an AI agent authors or materially assists with a commit, add an `Assisted-By:` trailer naming the model:
 
-```
+```text
 Assisted-By: Claude <noreply@anthropic.com>
 Assisted-By: GPT-5 <noreply@openai.com>
 Assisted-By: Gemini <noreply@google.com>
@@ -53,7 +53,7 @@ If the branch has extra commits, clean it up:
 git fetch upstream
 git checkout -b my-feature upstream/main
 git cherry-pick <your-commit-hash>
-git push -f origin my-feature:my-branch-name
+git push -f origin my-feature
 ```
 
 ## Pull Request Body