diff --git a/README.md b/README.md
index 613ac18..4847c28 100644
--- a/README.md
+++ b/README.md
@@ -127,6 +127,8 @@ Any other questions? Please check out our [FAQ](./FAQ.md), and if your question
* [Package Managers](#package-managers)
* [Package Manager Alternatives](#package-manager-alternatives)
* [Password Management](#password-management)
+ * [Cloud-based Password Managers](#cloud-based-password-managers)
+ * [Local Password Managers](#local-password-managers)
* [Peripheral Managers](#peripheral-managers)
* [Programming Languages](#programming-languages)
* [Programming Language-Specific Tooling](#programming-language-specific-tooling)
@@ -1140,21 +1142,32 @@ This is a section for repos that are similar to this one either because they are
## Password Management
-| Name | Last Untainted Version or Commit ID | Tags and Evidence |
+### Cloud-based Password Managers
+
+ Name | Last Untainted Version or Commit ID | Tags and Evidence |
|---|:---:|---|
| [AliasVault](https://aliasvault.net) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/aliasvault/aliasvault/issues/1924)) |
| [Bitwarden](https://bitwarden.com/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/bitwarden/server/blob/main/.claude/CLAUDE.md)) |
-| [gopass](https://github.com/gopasspw/gopass) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/gopasspw/gopass/blob/master/AGENTS.md))
[](#ai-code-reviews) ([1](https://github.com/gopasspw/gopass/pull/3104), [2](https://github.com/gopasspw/gopass/pull/3113), [3](https://github.com/gopasspw/gopass/pull/3383)) |
-| [KeePassDX](https://www.keepassdx.com/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/Kunzisoft/KeePassDX/blob/master/CONTRIBUTING.md#code-generation), [2](https://github.com/Kunzisoft/KeePassDX/issues/2447#issuecomment-4029885903)) |
-| [KeePassXC](https://keepassxc.org/) | [`2.7.9`](https://github.com/keepassxreboot/keepassxc/releases/tag/2.7.9) | [](#permissive-ai-policy) ([1](https://keepassxc.org/blog/2025-11-09-about-keepassxcs-code-quality-control/), [2](https://github.com/keepassxreboot/keepassxc/pull/12588), [3](https://github.com/keepassxreboot/keepassxc/pull/12314)) |
| [Proton Pass](https://proton.me/pass) | [](#request-for-help) | [](#ai-functionality) ([1](https://proton.me/blog/pass-access-tokens))
[](#permissive-ai-policy) ([1](https://github.com/protonpass/proton-pass-common/commit/d8c1c7ef6a58a0bcaa779bb975f72de4a59b17cb), [2](https://github.com/protonpass/ios-pass/commit/e0d392a4a8951f61b3a9fd530136f307a7fd1857)) |
-| [vaultwarden](https://github.com/dani-garcia/vaultwarden) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/dani-garcia/vaultwarden/pull/6967#issuecomment-4178703245), [2](https://github.com/dani-garcia/vaultwarden/pull/6279#discussion_r2366146831), [3](https://github.com/dani-garcia/vaultwarden/pull/6202#issuecomment-3679822420)) |
+
+### Local Password Managers
+
+| Name | Last Untainted Version or Commit ID | Tags and Evidence |
+|---|:---:|---|
+| [AuthPass](https://github.com/authpass/authpass/) | [](#request-for-help) | [](#ai-code-reviews) ([1](https://github.com/authpass/authpass/pull/395#pullrequestreview-3105665498), [2](https://github.com/authpass/authpass/pull/395#pullrequestreview-3109392874)) |
+| [gopass](https://github.com/gopasspw/gopass) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/gopasspw/gopass/blob/master/AGENTS.md))
[](#ai-code-reviews) ([1](https://github.com/gopasspw/gopass/pull/3104), [2](https://github.com/gopasspw/gopass/pull/3113), [3](https://github.com/gopasspw/gopass/pull/3383)) |
+| [Keepass2Android](https://github.com/PhilippC/keepass2android/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/PhilippC/keepass2android/commit/d748149866d2ebf1de701ffe82cd69a637a8c4fc))
[](#ai-code-reviews) ([1](https://github.com/PhilippC/keepass2android/pull/3154#pullrequestreview-3677202571)) |
+| [KeePassDX](https://www.keepassdx.com/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/Kunzisoft/KeePassDX/blob/master/CONTRIBUTING.md#code-generation), [2](https://github.com/Kunzisoft/KeePassDX/issues/2447#issuecomment-4029885903)) |
+| [KeePassVault](https://github.com/aivanovski/keepassvault/) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/aivanovski/keepassvault/blob/master/AGENTS.md))
[](#ai-code-reviews) ([1](https://github.com/aivanovski/keepassvault/pull/297), [2](https://github.com/aivanovski/keepassvault/pull/296)) |
+| [KeePassXC](https://keepassxc.org/) | [`2.7.9`](https://github.com/keepassxreboot/keepassxc/releases/tag/2.7.9) | [](#permissive-ai-policy) ([1](https://keepassxc.org/blog/2025-11-09-about-keepassxcs-code-quality-control/), [2](https://github.com/keepassxreboot/keepassxc/pull/12588), [3](https://github.com/keepassxreboot/keepassxc/pull/12314)) |
+| [Vaultwarden](https://github.com/dani-garcia/vaultwarden) | [](#request-for-help) | [](#permissive-ai-policy) ([1](https://github.com/dani-garcia/vaultwarden/pull/6967#issuecomment-4178703245), [2](https://github.com/dani-garcia/vaultwarden/pull/6279#discussion_r2366146831), [3](https://github.com/dani-garcia/vaultwarden/pull/6202#issuecomment-3679822420)) |
> [!Note]
-> ### Password Manager Alternatives
-> * [rbw](https://github.com/doy/rbw) (client)
-> * [KeePass 2](https://keepass.info/download.html). It is a .NET application, but [Mono](https://keepass.info/help/v2/setup.html#mono) or [Wine](https://keepass.info/help/v2/setup.html#wine) can be used for non-Windows platforms.
+> #### Local Password Manager Alternatives
> * [ChiPass](https://codeberg.org/ChiPass/ChiPass): An active fork of KeePassXC 2.7.10 [with clear stance against LLMs](https://social.anoxinon.de/@whitequark@treehouse.systems/116403781772180051) and a [No AI Contribution Policy](https://codeberg.org/ChiPass/ChiPass/commit/8fb6e891e6fe7ce7c3f1234a1d83460ab0ee093b).
+> * [KeePass 2](https://keepass.info/download.html). It is a .NET application, but [Mono](https://keepass.info/help/v2/setup.html#mono) or [Wine](https://keepass.info/help/v2/setup.html#wine) can be used for non-Windows platforms.
+> * [OneKeePass mobile](https://github.com/OneKeePass/mobile) and [OneKeePass desktop](https://github.com/OneKeePass/desktop) both seem to be untainted.
+> * [rbw](https://github.com/doy/rbw) (Bitwarden/Vaultwarden client)
> * [Secrets](https://apps.gnome.org/Secrets/) uses the KeePass file format.
> * Password managers based on [pass](https://www.passwordstore.org/) or [Himitsu](https://himitsustore.org/) could be interesting.