diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index 1aa605615dc26c9394f4f7143f5f50975107cffe..ec21972cfd92bbf191312df3631d403c47bf9068 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -13,7 +13,8 @@ let
     privateKeyPath = toString ./. + "/${rawConfig.privateKeyPath}";
   };
 
-  payments = {
+  payments = {name, ...}: {
+    networking.hostName = name;
     imports = [
       gridlib.issuer
       gridlib.hardware-aws
@@ -23,7 +24,8 @@ let
     ];
   };
 
-  monitoring = {
+  monitoring = {name, ...}: {
+    networking.hostName = name;
     imports = [
       gridlib.monitoring
       gridlib.hardware-aws
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index 996b1fba0bd2c12c22b00f549aa26c8b8472653d..bc4252fcae49f05e533562bb7c891984d904f095 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -13,7 +13,8 @@ let
     privateKeyPath = toString ./. + "/${rawConfig.privateKeyPath}";
   };
 
-  payments = {
+  payments = {name, ...}: {
+    networking.hostName = name;
     imports = [
       gridlib.issuer
       gridlib.hardware-aws
@@ -23,7 +24,8 @@ let
     ];
   };
 
-  storage001 = {
+  storage001 = {name, ...}: {
+    networking.hostName = name;
     imports = [
       gridlib.storage
       ./testing001-hardware.nix
@@ -34,7 +36,8 @@ let
     ];
   };
 
-  monitoring = {
+  monitoring = {name, ...}: {
+    networking.hostName = name;
     imports = [
       gridlib.monitoring
       gridlib.hardware-aws