diff --git a/data.nix b/data.nix
index 6293172..94014cd 100644
--- a/data.nix
+++ b/data.nix
@@ -87,7 +87,7 @@ rec {
         "gccarch-armv8-a"
       ];
     };
-    "fwminex.motiejus.jakst" = rec {
+    "fwminex.servers.jakst" = rec {
       extraHostNames = [
         jakstIP
         vno1IP
@@ -135,7 +135,7 @@ rec {
         mHosts = attrVals [
           "mxp10.motiejus.jakst"
           "mtworx.motiejus.jakst"
-          "fwminex.motiejus.jakst"
+          "fwminex.servers.jakst"
         ] hosts;
       in
       builtins.catAttrs "jakstIP" mHosts;
diff --git a/flake.nix b/flake.nix
index 3a85ff1..55959a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -284,7 +284,7 @@
         };
 
         fwminex = {
-          hostname = myData.hosts."fwminex.motiejus.jakst".jakstIP;
+          hostname = myData.hosts."fwminex.servers.jakst".jakstIP;
           profiles = {
             system = {
               sshUser = "motiejus";
diff --git a/hosts/fra1-b/configuration.nix b/hosts/fra1-b/configuration.nix
index 0ba5b85..513a883 100644
--- a/hosts/fra1-b/configuration.nix
+++ b/hosts/fra1-b/configuration.nix
@@ -73,7 +73,7 @@ in
         sshAllowSubnet = myData.subnets.tailscale.sshPattern;
         publicKeys = map (h: myData.hosts.${h}.publicKey) [
           "vno1-oh2.servers.jakst"
-          "fwminex.motiejus.jakst"
+          "fwminex.servers.jakst"
           "mtworx.motiejus.jakst"
         ];
       };
@@ -85,7 +85,7 @@ in
 
       deployerbot = {
         follower = {
-          publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ];
+          publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
 
           enable = true;
           sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];
diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 67cef39..2442ba5 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -167,7 +167,7 @@ in
         };
 
         follower = {
-          publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ];
+          publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
 
           enable = true;
           uidgid = myData.uidgid.updaterbot-deployee;
diff --git a/hosts/mtworx/configuration.nix b/hosts/mtworx/configuration.nix
index 27c1c88..835d561 100644
--- a/hosts/mtworx/configuration.nix
+++ b/hosts/mtworx/configuration.nix
@@ -122,7 +122,7 @@ in
 
       deployerbot = {
         follower = {
-          publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ];
+          publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
 
           enable = true;
           uidgid = myData.uidgid.updaterbot-deployee;
diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix
index 80ccf1e..e7bfb53 100644
--- a/hosts/vno1-oh2/configuration.nix
+++ b/hosts/vno1-oh2/configuration.nix
@@ -193,7 +193,7 @@
 
       deployerbot = {
         follower = {
-          publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ];
+          publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
 
           enable = true;
           sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];
@@ -463,8 +463,8 @@
             static_configs = [ { targets = [ "${myData.hosts."vno3-rp3b.servers.jakst".jakstIP}:${port}" ]; } ];
           }
           {
-            job_name = "fwminex.motiejus.jakst";
-            static_configs = [ { targets = [ "${myData.hosts."fwminex.motiejus.jakst".jakstIP}:${port}" ]; } ];
+            job_name = "fwminex.servers.jakst";
+            static_configs = [ { targets = [ "${myData.hosts."fwminex.servers.jakst".jakstIP}:${port}" ]; } ];
           }
           {
             job_name = "mtworx.motiejus.jakst";
diff --git a/hosts/vno3-rp3b/configuration.nix b/hosts/vno3-rp3b/configuration.nix
index 7e393bd..59f8f64 100644
--- a/hosts/vno3-rp3b/configuration.nix
+++ b/hosts/vno3-rp3b/configuration.nix
@@ -85,7 +85,7 @@
         dataDir = "/data/borg";
         sshKeys = with myData; [
           hosts."vno1-oh2.servers.jakst".publicKey
-          hosts."fwminex.motiejus.jakst".publicKey
+          hosts."fwminex.servers.jakst".publicKey
           people_pubkeys.motiejus
         ];
       };
@@ -97,7 +97,7 @@
 
       deployerbot = {
         follower = {
-          publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ];
+          publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
 
           enable = true;
           sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];
diff --git a/secrets.nix b/secrets.nix
index ba793bc..4729a22 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -6,7 +6,7 @@ let
     bk2 = "age14f39j0wx84n93lgqn6d9gcd3yhuwak6qwrxy8v83ydn7266uafts09ecva";
   };
 
-  fwminex = (import ./data.nix).hosts."fwminex.motiejus.jakst".publicKey;
+  fwminex = (import ./data.nix).hosts."fwminex.servers.jakst".publicKey;
   mtworx = (import ./data.nix).hosts."mtworx.motiejus.jakst".publicKey;
   fra1-b = (import ./data.nix).hosts."fra1-b.servers.jakst".publicKey;
   vno1-oh2 = (import ./data.nix).hosts."vno1-oh2.servers.jakst".publicKey;