diff --git a/group_vars/all.yaml b/group_vars/all.yaml
index c7e8965..fee422b 100644
--- a/group_vars/all.yaml
+++ b/group_vars/all.yaml
@@ -27,7 +27,6 @@ root_access:
   - ak
   - foobar
   - polyfloyd
-  - wilco
 
 mqtt_internal_host: mqtt.bitlair.nl
 mqtt_public_host: bitlair.nl
diff --git a/group_vars/fotos.yaml b/group_vars/fotos.yaml
deleted file mode 100644
index 5a9ca68..0000000
--- a/group_vars/fotos.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-root_access:
-  - ak
-  - foobar
-  - linor
-  - polyfloyd
-  - wilco
diff --git a/group_vars/git-ci.yaml b/group_vars/git-ci.yaml
deleted file mode 100644
index 18ed638..0000000
--- a/group_vars/git-ci.yaml
+++ /dev/null
@@ -1 +0,0 @@
-forgejo_url: https://git.bitlair.nl
diff --git a/roles/git-ci/tasks/main.yaml b/roles/git-ci/tasks/main.yaml
index 87bc533..3565d0a 100644
--- a/roles/git-ci/tasks/main.yaml
+++ b/roles/git-ci/tasks/main.yaml
@@ -21,7 +21,7 @@
         mode: 0755
 
     - name: Register runner
-      command: "forgejo-runner register --no-interactive --instance={{ forgejo_url }} --token={{ lookup('passwordstore', 'git/ci subkey=runner_token') }}"
+      command: "forgejo-runner register --no-interactive --instance={{ forgejo_url }} --token={{ forgejo_runner_token }}"
       args:
         chdir: "{{ runner_wd }}"
         creates: "{{ runner_wd }}/.runner"
diff --git a/roles/photos/templates/bambulab-fetch.sh b/roles/photos/templates/bambulab-fetch.sh
index 1508ed3..080a3fa 100644
--- a/roles/photos/templates/bambulab-fetch.sh
+++ b/roles/photos/templates/bambulab-fetch.sh
@@ -4,8 +4,8 @@
 
 set -eu
 
-host={{ lookup('passwordstore', 'fotos/bambulab subkey=host') }}
-pass={{ lookup('passwordstore', 'fotos/bambulab subkey=key') }}
+host={{ bambulab_host }}
+pass={{ bambulab_key }}
 dir={{ photos_path }}
 
 files=$(curl -ksl "ftps://bblp:$pass@$host:990/timelapse/" | grep ^video_)
diff --git a/roles/services/templates/discord-bot.service b/roles/services/templates/discord-bot.service
index 2c73d05..f93dbc7 100644
--- a/roles/services/templates/discord-bot.service
+++ b/roles/services/templates/discord-bot.service
@@ -11,8 +11,8 @@ RestartSec=10s
 ExecStart=/var/lib/discord-bot/.venv/bin/python /var/lib/discord-bot/main.py
 DynamicUser=true
 Environment="MQTT_HOST={{ mqtt_internal_host }}"
-Environment="DISCORD_WEBHOOK_URL={{ lookup('passwordstore', 'services/discord', subkey='webhook_url') }}"
-Environment="DISCORD_TOKEN={{ lookup('passwordstore', 'services/discord', subkey='token') }}"
+Environment="DISCORD_WEBHOOK_URL={{ discord_webhook_url }}"
+Environment="DISCORD_TOKEN={{ discord_token }}"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/services/templates/mastodon-spacestate-config.py b/roles/services/templates/mastodon-spacestate-config.py
index cf9fae4..1af7626 100644
--- a/roles/services/templates/mastodon-spacestate-config.py
+++ b/roles/services/templates/mastodon-spacestate-config.py
@@ -10,5 +10,5 @@ open_profile_field = 'Open! @ {}'
 closed_profile_field = 'Closed @ {}'
 
 profile_fields = [('Website', 'https://bitlair.nl/')]
-access_token = '{{ lookup('passwordstore', 'services/mastodon subkey=spacestate_access_token') }}'
+access_token = '{{ mastodon_spacestate_access_token }}'
 homeserver = 'https://hsnl.social'
diff --git a/roles/services/templates/wifi-mqtt.service b/roles/services/templates/wifi-mqtt.service
index 060f688..1eeaa77 100644
--- a/roles/services/templates/wifi-mqtt.service
+++ b/roles/services/templates/wifi-mqtt.service
@@ -8,8 +8,8 @@ Restart=on-failure
 RestartSec=2s
 ExecStart=/var/lib/wifi-mqtt/wifi-mqtt.py
 DynamicUser=true
-Environment="ARUBA_INSTANT_IP={{ lookup('passwordstore', 'services/wifi_mqtt', subkey='snmp_ip') }}"
-Environment="ARUBA_INSTANT_PASSWORD={{ lookup('passwordstore', 'services/wifi_mqtt', subkey='snmp_password') }}"
+Environment="ARUBA_INSTANT_IP={{ wifi_mqtt_snmp_ip }}"
+Environment="ARUBA_INSTANT_PASSWORD={{ wifi_mqtt_snmp_password }}"
 
 [Install]
 WantedBy=multi-user.target