diff --git a/inventories/z9/host_vars/zigbee2mqtt.yaml b/inventories/z9/host_vars/zigbee2mqtt.yaml
index 9a80d03..942d668 100644
--- a/inventories/z9/host_vars/zigbee2mqtt.yaml
+++ b/inventories/z9/host_vars/zigbee2mqtt.yaml
@@ -1,5 +1,5 @@
 zigbee2mqtt__version: "1.32.1"
-zigbee2mqtt__network_key: "{{ lookup('community.general.passwordstore', 'noc/vm-secrets/zigbee2mqtt/network_key', create=false, missing='error') }}"
+zigbee2mqtt__network_key: "{{ lookup('community.general.passwordstore', 'noc/vm-secrets/z9/zigbee2mqtt/network_key', create=false, missing='error') }}"
 zigbee2mqtt__initial_config: "{{ lookup('ansible.builtin.template', 'z9/configs/zigbee2mqtt/zigbee2mqtt/configuration.yaml.j2') }}"
 
 certbot__version_spec: ""
diff --git a/playbooks/templates/z9/configs/engelsystem/compose.yaml.j2 b/playbooks/templates/z9/configs/engelsystem/compose.yaml.j2
index d4f5ec9..00ea3a0 100644
--- a/playbooks/templates/z9/configs/engelsystem/compose.yaml.j2
+++ b/playbooks/templates/z9/configs/engelsystem/compose.yaml.j2
@@ -22,7 +22,7 @@ services:
       MAIL_PORT: 465
       MAIL_ENCRYPTION: tls
       MAIL_USERNAME: aes
-      MAIL_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/engelsystem/MAIL_PASSWORD", create=false, missing="error") }}
+      MAIL_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/engelsystem/MAIL_PASSWORD", create=false, missing="error") }}
     ports:
       - "5080:80"
     networks:
diff --git a/playbooks/templates/z9/configs/keycloak/compose.yaml.j2 b/playbooks/templates/z9/configs/keycloak/compose.yaml.j2
index c6b51a7..4ae51bd 100644
--- a/playbooks/templates/z9/configs/keycloak/compose.yaml.j2
+++ b/playbooks/templates/z9/configs/keycloak/compose.yaml.j2
@@ -46,11 +46,11 @@ services:
       - keycloak
     environment:
       KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/keycloak/KEYCLOAK_ADMIN_PASSWORD", create=false, missing="error") }}
+      KEYCLOAK_ADMIN_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/keycloak/KEYCLOAK_ADMIN_PASSWORD", create=false, missing="error") }}
       KC_DB: postgres
       KC_DB_URL_HOST: db
       KC_DB_USERNAME: keycloak
-      KC_DB_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/keycloak/KC_DB_PASSWORD", create=false, missing="error") }}
+      KC_DB_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/keycloak/KC_DB_PASSWORD", create=false, missing="error") }}
       KC_HOSTNAME: id.ccchh.net
       KC_HOSTNAME_STRICT_BACKCHANNEL: true
       KC_HOSTNAME_ADMIN: keycloak-admin.ccchh.net
@@ -67,7 +67,7 @@ services:
       - "./database:/var/lib/postgresql/data"
     environment:
       POSTGRES_USER: keycloak
-      POSTGRES_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/keycloak/POSTGRES_PASSWORD", create=false, missing="error") }}
+      POSTGRES_PASSWORD: {{ lookup("community.general.passwordstore", "noc/vm-secrets/z9/keycloak/POSTGRES_PASSWORD", create=false, missing="error") }}
       POSTGRES_DB: keycloak
 
 networks: