diff --git a/hosts/sentinel/default.nix b/hosts/sentinel/default.nix
index 34324ec..7209ec3 100644
--- a/hosts/sentinel/default.nix
+++ b/hosts/sentinel/default.nix
@@ -28,7 +28,7 @@
     scrapeSensors = false;
     influxdb2 = {
       domain = config.networking.providedDomains.influxdb;
-      organization = "servers";
+      organization = "machines";
       bucket = "telegraf";
       node = "ward-influxdb";
     };
diff --git a/hosts/ward/default.nix b/hosts/ward/default.nix
index ac0abd6..343d9a9 100644
--- a/hosts/ward/default.nix
+++ b/hosts/ward/default.nix
@@ -35,7 +35,7 @@
     enable = true;
     influxdb2 = {
       domain = nodes.sentinel.config.networking.providedDomains.influxdb;
-      organization = "servers";
+      organization = "machines";
       bucket = "telegraf";
       node = "ward-influxdb";
     };
diff --git a/hosts/ward/guests/common.nix b/hosts/ward/guests/common.nix
index 33a4047..b27e21f 100644
--- a/hosts/ward/guests/common.nix
+++ b/hosts/ward/guests/common.nix
@@ -14,7 +14,7 @@ in {
     scrapeSensors = false;
     influxdb2 = {
       domain = sentinelCfg.networking.providedDomains.influxdb;
-      organization = "servers";
+      organization = "machines";
       bucket = "telegraf";
       node = "ward-influxdb";
     };
diff --git a/hosts/ward/guests/grafana.nix b/hosts/ward/guests/grafana.nix
index bdf5dc4..d9cf3cf 100644
--- a/hosts/ward/guests/grafana.nix
+++ b/hosts/ward/guests/grafana.nix
@@ -42,7 +42,7 @@ in {
       group = "influxdb2";
     };
 
-    services.influxdb2.provision.organization.servers.auths."grafana servers:telegraf (${config.node.name})" = {
+    services.influxdb2.provision.organizations.machines.auths."grafana machines:telegraf (${config.node.name})" = {
       readBuckets = ["telegraf"];
       writeBuckets = ["telegraf"];
       tokenFile = nodes.ward-influxdb.config.age.secrets."grafana-influxdb-token-${config.node.name}".path;
@@ -132,14 +132,14 @@ in {
       enable = true;
       datasources.settings.datasources = [
         {
-          name = "InfluxDB (servers)";
+          name = "InfluxDB (machines)";
           type = "influxdb";
           access = "proxy";
           url = "https://${sentinelCfg.networking.providedDomains.influxdb}";
           orgId = 1;
           secureJsonData.token = "$__file{${config.age.secrets.grafana-influxdb-token.path}}";
           jsonData.version = "Flux";
-          jsonData.organization = "servers";
+          jsonData.organization = "machines";
           jsonData.defaultBucket = "telegraf";
         }
         # TODO duplicate above influxdb source (with scoped read tokens??) for each organization
diff --git a/hosts/ward/guests/influxdb.nix b/hosts/ward/guests/influxdb.nix
index deaf54c..1355d5b 100644
--- a/hosts/ward/guests/influxdb.nix
+++ b/hosts/ward/guests/influxdb.nix
@@ -91,7 +91,7 @@ in {
         passwordFile = config.age.secrets.influxdb-admin-password.path;
         tokenFile = config.age.secrets.influxdb-admin-token.path;
       };
-      organizations.servers.buckets.telegraf = {};
+      organizations.machines.buckets.telegraf = {};
     };
   };
 
diff --git a/hosts/zackbiene/default.nix b/hosts/zackbiene/default.nix
index b17d633..196716f 100644
--- a/hosts/zackbiene/default.nix
+++ b/hosts/zackbiene/default.nix
@@ -48,7 +48,7 @@ in {
     enable = true;
     influxdb2 = {
       domain = sentinelCfg.networking.providedDomains.influxdb;
-      organization = "servers";
+      organization = "machines";
       bucket = "telegraf";
       node = "ward-influxdb";
     };
diff --git a/modules/telegraf.nix b/modules/telegraf.nix
index eccc9ad..d60e4d1 100644
--- a/modules/telegraf.nix
+++ b/modules/telegraf.nix
@@ -66,7 +66,7 @@ in {
         group = "influxdb2";
       };
 
-      services.influxdb2.provision.organization.servers.auths."telegraf (${config.node.name})" = {
+      services.influxdb2.provision.organizations.machines.auths."telegraf (${config.node.name})" = {
         readBuckets = ["telegraf"];
         writeBuckets = ["telegraf"];
         tokenFile = nodes.${cfg.influxdb2.node}.config.age.secrets."telegraf-influxdb-token-${config.node.name}".path;