diff --git a/inventory.ini b/inventory.ini
deleted file mode 100644
index 40b3a77..0000000
--- a/inventory.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[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
new file mode 100644
index 0000000..2331117
--- /dev/null
+++ b/inventory.yml
@@ -0,0 +1,38 @@
+servers:
+  hosts:
+    hyperreal.coffee:
+      ansible_user: jas
+      ansible_host: hyperreal.lyrebird-marlin.ts.net
+    auxnc-8g:
+      ansible_user: jas
+      ansible_host: 152.53.39.153
+    nas-local:
+      ansible_user: jas
+      ansible_host: nas-local.lyrebird-marlin.ts.net
+    auxnode:
+      ansible_user: jas
+      ansible_host: auxnode.lyrebird-marlin.ts.net
+    auxnode2:
+      ansible_user: jas
+      ansible_host: 10.0.0.5
+
+prometheus-servers:
+  hosts:
+    desktop:
+      ansible_user: jas
+      ansible_host: localhost
+
+prometheus-clients:
+  hosts:
+    hyperreal.coffee:
+      ansible_user: jas
+      ansible_host: hyperreal.lyrebird-marlin.ts.net
+    nas-local:
+      ansible_user: jas
+      ansible_host: nas-local.lyrebird-marlin.ts.net
+    auxnode:
+      ansible_user: jas
+      ansible_host: auxnode.lyrebird-marlin.ts.net
+    auxnode2:
+      ansible_user: jas
+      ansible_host: 10.0.0.5
diff --git a/prometheus-clients.yml b/prometheus-clients.yml
index e0351c2..7b9ccd8 100644
--- a/prometheus-clients.yml
+++ b/prometheus-clients.yml
@@ -4,11 +4,3 @@
     - 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