diff --git a/group_vars/git.yml b/group_vars/git.yml
index a713faf0..e60d4252 100644
--- a/group_vars/git.yml
+++ b/group_vars/git.yml
@@ -92,14 +92,14 @@ gitea_db_type: "postgres"
 gitea_db_host: "localhost"
 gitea_db_name: "gitea"
 gitea_db_user: "gitea"
-gitea_db_password: "{{ lookup('viczem.keepass.keepass', 'forgejo_db_password', 'password') }}"
+gitea_db_password: "{{ lookup('viczem.keepass.keepass', 'forgejo/forgejodb_password', 'password') }}"
 # indexer
 gitea_repo_indexer_enabled: true
 # security
 gitea_disable_webhooks: false
 gitea_password_check_pwn: false
-gitea_internal_token: "{{ lookup('viczem.keepass.keepass', 'forgejo_internal_token', 'password') }}"
-gitea_secret_key: "{{ lookup('viczem.keepass.keepass', 'forgejo_secret_key', 'password') }}"
+gitea_internal_token: "{{ lookup('viczem.keepass.keepass', 'forgejo/forgejointernal_token', 'password') }}"
+gitea_secret_key: "{{ lookup('viczem.keepass.keepass', 'forgejo/forgejosecret_key', 'password') }}"
 # service
 gitea_disable_registration: true
 gitea_register_email_confirm: true
@@ -139,7 +139,7 @@ gitea_extra_config: |
   [repo-archive]
   ENABLED = false
 # oauth2
-gitea_oauth2_jwt_secret: "{{ lookup('viczem.keepass.keepass', 'forgejo_oauth2_jwt_secret', 'password') }}"
+gitea_oauth2_jwt_secret: "{{ lookup('viczem.keepass.keepass', 'forgejo/forgejooauth2_jwt_secret', 'password') }}"
 # Fail2Ban configuration
 gitea_fail2ban_enabled: true
 gitea_fail2ban_jail_maxretry: "3"
@@ -153,4 +153,4 @@ gitea_ldap_base_path: "dc=mgrote,dc=net"
 gitea_ldap_bind_user: "forgejo_bind_user"
 gitea_ldap_bind_pass: "{{ lookup('viczem.keepass.keepass', 'lldap_forgejo_bind_user', 'password') }}"
 gitea_admin_user: "fadmin"
-gitea_admin_user_pass: "{{ lookup('viczem.keepass.keepass', 'forgejo_admin_user_pass', 'password') }}"
+gitea_admin_user_pass: "{{ lookup('viczem.keepass.keepass', 'forgejo/forgejoadmin_user_pass', 'password') }}"
diff --git a/keepass_db.kdbx b/keepass_db.kdbx
index 03ff5e8f..eb4b7641 100644
Binary files a/keepass_db.kdbx and b/keepass_db.kdbx differ