diff --git a/monitoring-agent.yml b/monitoring-agent.yml
index 6b5a23c..03d7270 100644
--- a/monitoring-agent.yml
+++ b/monitoring-agent.yml
@@ -1,9 +1,5 @@
 - hosts:
   - monitored
 
-  vars_files:
-  - vars/metrics.yml
-  - vars/metrics-vault.yml
-
   roles:
   - telegraf
diff --git a/monitoring-server.yml b/monitoring-server.yml
index 4e88b02..e13bf64 100644
--- a/monitoring-server.yml
+++ b/monitoring-server.yml
@@ -1,12 +1,8 @@
 - hosts:
   - overwatch.kde.org
 
-  vars_files:
-  - vars/metrics.yml
-  - vars/metrics-vault.yml
-
   roles:
   - influxdb
   - grafana
   - { role: mon-apache, use_ssl: True }
   - letsencrypt
diff --git a/production/group_vars/all.yml b/production/group_vars/all/main.yml
similarity index 100%
rename from production/group_vars/all.yml
rename to production/group_vars/all/main.yml
diff --git a/vars/metrics-vault.yml b/production/group_vars/all/metrics-vault.yml
similarity index 100%
rename from vars/metrics-vault.yml
rename to production/group_vars/all/metrics-vault.yml
diff --git a/vars/metrics.yml b/production/group_vars/all/metrics.yml
similarity index 100%
rename from vars/metrics.yml
rename to production/group_vars/all/metrics.yml