diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index b8eeb9c3229767696f4ae0dc3d9172913fdfa31b..adac66fc7f3d14da352341999bf31562ee4433ce 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -36,7 +36,7 @@ let
     imports = [
       lib.monitoring
       (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
-      (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+      (lib.customize-monitoring hostsMap monitoringvpnKeyDir "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
     ];
   };
 
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index f5be285383585ae55fb4ce5cda0ff447cdf2ae19..4796bb4604bb13b2943fa504061613ac914195f7 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -21,11 +21,11 @@ let
     ];
   };
 
-  monitoring = let publicIPv4 = "monitoring.private.storage"; in {
+  monitoring = {
     imports = [
       lib.monitoring
       lib.hardware-aws
-      (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+      (lib.customize-monitoring hostsMap monitoringvpnKeyDir "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
     ];
   };
 
@@ -95,6 +95,5 @@ in {
   };
 
   "payments.${domain}" = payments;
-  inherit monitoring;
-
+  "monitoring.${domain}" = monitoring;
 } // storageNodes
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index e5cb7fc657c5c4cc24b1ce5e1793938b053344c8..b1ead6f9ce2090f3cb5808722e298d79a2443389 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -26,11 +26,11 @@ let
     ];
   };
 
-  monitoring = let publicIPv4 = "18.156.171.217"; in {
+  monitoring = {
     imports = [
       lib.monitoring
       lib.hardware-aws
-      (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
+      (lib.customize-monitoring hostsMap monitoringvpnKeyDir "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
     ];
   };
 
@@ -48,6 +48,6 @@ in {
     description = "PrivateStorage.io Testing Grid";
   };
   "payments.${domain}" = payments;
-  "storage001.${domain}" = storage;
-  inherit monitoring;
+  "monitoring.${domain}" = monitoring;
+  "storage001.${domain}" = storage001;
 }
diff --git a/morph/lib/customize-monitoring.nix b/morph/lib/customize-monitoring.nix
index 5bc55810ca1778dc3ec193f79297d7443a2010aa..126554ccebee8dc2f26db9741d3362defd94f490 100644
--- a/morph/lib/customize-monitoring.nix
+++ b/morph/lib/customize-monitoring.nix
@@ -1,5 +1,4 @@
-hostsMap: monitoringvpnKeyDir: publicIPv4: monitoringvpnIPv4: vpnClientIPs: nodeExporterTargets: nginxExporterTargets: stateVersion: {
-  deployment.targetHost = publicIPv4;
+hostsMap: monitoringvpnKeyDir: monitoringvpnIPv4: vpnClientIPs: nodeExporterTargets: nginxExporterTargets: stateVersion: {
   deployment.secrets = {
     "monitoringvpn-private-key".source = "${monitoringvpnKeyDir}/server.key";
     "monitoringvpn-preshared-key".source = "${monitoringvpnKeyDir}/preshared.key";