diff --git a/inventory.ini b/inventory.ini
new file mode 100644
index 0000000..40b3a77
--- /dev/null
+++ b/inventory.ini
@@ -0,0 +1,15 @@
+[servers]
+hyperreal.lyrebird-marlin.ts.net
+152.53.39.153
+nas-local.lyrebird-marlin.ts.net
+auxnode.lyrebird-marlin.ts.net
+10.0.0.5
+
+[prometheus-servers]
+localhost
+
+[prometheus-clients]
+hyperreal.lyrebird-marlin.ts.net
+nas-local.lyrebird-marlin.ts.net
+auxnode.lyrebird-marlin.ts.net
+10.0.0.5
diff --git a/inventory.yml b/inventory.yml
deleted file mode 100644
index 67b598e..0000000
--- a/inventory.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-servers:
-  hosts:
-    hyperreal.coffee:
-      ansible_user: jas
-      ansible_host: hyperreal.lyrebird-marlin.ts.net
-      ansible_python_interpreter: /usr/bin/python3
-    auxnc-8g:
-      ansible_user: jas
-      ansible_host: 152.53.39.153
-      ansible_python_interpreter: /usr/bin/python3
-    nas-local:
-      ansible_user: jas
-      ansible_host: nas-local.lyrebird-marlin.ts.net
-      ansible_python_interpreter: /usr/bin/python3
-    auxnode:
-      ansible_user: jas
-      ansible_host: auxnode.lyrebird-marlin.ts.net
-      ansible_python_interpreter: /usr/bin/python3
-    auxnode2:
-      ansible_user: jas
-      ansible_host: 10.0.0.5
-      ansible_python_interpreter: /usr/bin/python3
diff --git a/prometheus-setup.yml b/prometheus-clients.yml
similarity index 75%
rename from prometheus-setup.yml
rename to prometheus-clients.yml
index ed174a8..e0351c2 100644
--- a/prometheus-setup.yml
+++ b/prometheus-clients.yml
@@ -1,10 +1,6 @@
 ---
 - hosts: prometheus-clients
   tasks:
-    - name: Import the Blackbox Exporter role
-      import_role:
-        name: prometheus.prometheus.blackbox_exporter
-
     - name: Import Node Exporter role
       import_role:
         name: prometheus.prometheus.node_exporter
diff --git a/prometheus-servers.yml b/prometheus-servers.yml
new file mode 100644
index 0000000..c747cb7
--- /dev/null
+++ b/prometheus-servers.yml
@@ -0,0 +1,14 @@
+---
+- hosts: prometheus-servers
+  tasks:
+    - name: Import Node Exporter role
+      import_role:
+        name: prometheus.prometheus.node_exporter
+
+    - name: Import Prometheus role
+      import_role:
+        name: prometheus.prometheus.prometheus
+
+    - name: Import Systemd Exporter role
+      import_role:
+        name: prometheus.prometheus.systemd_exporter