diff --git a/monitoring-server.yml b/monitoring-server.yml
index e13bf64..fb5e069 100644
--- a/monitoring-server.yml
+++ b/monitoring-server.yml
@@ -1,8 +1,8 @@
 - hosts:
-  - overwatch.kde.org
+  - monitoring-server
 
   roles:
   - influxdb
   - grafana
   - { role: mon-apache, use_ssl: True }
   - letsencrypt
diff --git a/production/host_vars/overwatch-test.kde.org/main.yml b/production/host_vars/overwatch-test.kde.org/main.yml
new file mode 100644
index 0000000..7a301d5
--- /dev/null
+++ b/production/host_vars/overwatch-test.kde.org/main.yml
@@ -0,0 +1,2 @@
+---
+grafana_hostname: "{{inventory_hostname}}"
diff --git a/production/host_vars/overwatch-test.kde.org/metrics-vault.yml b/production/host_vars/overwatch-test.kde.org/metrics-vault.yml
new file mode 100644
index 0000000..188c8b5
--- /dev/null
+++ b/production/host_vars/overwatch-test.kde.org/metrics-vault.yml
@@ -0,0 +1,17 @@
+$ANSIBLE_VAULT;1.1;AES256
+66356337303934656632363030626130326534393264333939656366303430646636336536346362
+3835336338613835343165363333343531383636663563390a396662646165343739643464326331
+39616565656439663236393066656330366132393463633366363630343665386165386433356630
+3161636433626234310a363136646261323438613261326462393665623864633263313832343633
+33333964336165363462653831303032303564343162656631393932376266376139646639303966
+64383966653462383966316530623962376439613131653730666335646234623230303834386339
+36653633636363376161326439366132356239326165333363346437373834343665303834323962
+31646239393432623830373835663066316232653938316137336665636438643465646237346361
+36396536623831636361636262633031343865616264373637666465383066643037363739643637
+39653562643461626130646137643036613333666436373264653232396632613534336433623434
+39626435303364643332313262653435366436356664326363343438373734323362333265316166
+34666430316533616432323536636563653937656164343632396266326631373533666165646233
+36333636306430323438366637616565646566653430613461623230373634663866663831393630
+64316135396234396337313031396461303163373364613231373131666133373565626438363839
+35383165393366623065376432376636323431336338363862616139393662353530313737653936
+39356235396135613234
diff --git a/production/host_vars/overwatch-test.kde.org/metrics.yml b/production/host_vars/overwatch-test.kde.org/metrics.yml
new file mode 100644
index 0000000..2406576
--- /dev/null
+++ b/production/host_vars/overwatch-test.kde.org/metrics.yml
@@ -0,0 +1,6 @@
+---
+influxdb_admin_password: "{{vault_influxdb_admin_password}}"
+# we can't easily change this one because both servers run telegraf,
+# reporting to both servers.
+#influxdb_user_password: "{{vault_influxdb_user_password}}"
+grafana_admin_password: "{{vault_grafana_admin_password}}"
diff --git a/production/hosts b/production/hosts
index 4289e1f..7e9dcd5 100644
--- a/production/hosts
+++ b/production/hosts
@@ -1,71 +1,78 @@
 #zivo.kde.org
 
 #shrek.kde.org
 
 bluemchen.kde.org
 
 cano.kde.org
 olios.kde.org
 
 fiesta.kde.org
 
 recluse.kde.org
 code.kde.org
 
 gohma.kde.org
 spring.kde.org
 silk.kde.org
 bugs.kde.org
 
 ange.kde.org
 lxr.kde.org
 joy.kde.org
 
 stumptown.kde.org
 
 dalca.kde.org
 dalca2.kde.org ansible_host=10.150.83.2 ansible_ssh_common_args='-o ProxyCommand="ssh -W %h:%p -q root@dalca.kde.org"'
 
 overwatch.kde.org
+overwatch-test.kde.org
+
 library.kde.org
 rosetta.kde.org
 
 pirate.kde.org
 racnoss.kde.org
 nellie.kde.org
 mimi.kde.org
 
 orbi.kde.org
 
 letterbox.kde.org
 
 mason.kde.org
 elder.kde.org
 
 darwini.kde.org
 
 aranea.kde.org
 artonis.kde.org
 
 [anongit]
 mason.kde.org anongit_style=legacy
 elder.kde.org anongit_style=propagator
 
 
 [monitored]
 # Servers that are being monitored with Telegraf
 overwatch.kde.org
+overwatch-test.kde.org
 bluemchen.kde.org
 rosetta.kde.org
 pirate.kde.org
 racnoss.kde.org
 mimi.kde.org
 nellie.kde.org
 gohma.kde.org
 elder.kde.org
 orbi.kde.org
 recluse.kde.org
 code.kde.org
 silk.kde.org
 darwini.kde.org
 mason.kde.org
+
+[monitoring-server]
+overwatch.kde.org
+overwatch-test.kde.org