diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 8f72dd95a0c22939ed5b9f727500f13f5d8029ac..a4cfd1f5ca929b3ca542b6c64b6b0d5300a1b489 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -7,36 +7,40 @@ import ../../lib/make-grid.nix {
   nodes = cfg:
   let
     sshUsers = import ../../../../PrivateStorageSecrets/localdev-users.nix;
-    vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ]; # TBD: derive automatically
+
+    # TBD: derive these automatically:
     hostsMap = {
       "172.23.23.1"  = [ "monitoring1" "monitoring1.monitoringvpn" ];
       "172.23.23.11" = [ "payments1" "payments1.monitoringvpn" ];
       "172.23.23.12" = [ "storage1" "storage1.monitoringvpn" ];
       "172.23.23.13" = [ "storage2" "storage2.monitoringvpn" ];
     };
+    vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ];
+    nodeExporterTargets = [ "monitoring1" "payments1" "storage1" "storage2" ];
+
   in {
     "payments1" = import ../../lib/make-issuer.nix (rec {
       publicIPv4 = "192.168.67.21";
       monitoringvpnIPv4 = "172.23.23.11";
-      inherit sshUsers;
       hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
       stateVersion = "19.03";
+      inherit sshUsers;
     } // cfg);
 
     "storage1" = import ../../lib/make-testing.nix (rec {
       publicIPv4 = "192.168.67.22";
       monitoringvpnIPv4 = "172.23.23.12";
-      inherit sshUsers;
       hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
       stateVersion = "19.09";
+      inherit sshUsers;
     } // cfg);
 
     "storage2" = import ../../lib/make-testing.nix (rec {
       publicIPv4 = "192.168.67.23";
       monitoringvpnIPv4 = "172.23.23.13";
-      inherit sshUsers;
       hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
       stateVersion = "19.09";
+      inherit sshUsers;
     } // cfg);
 
     "monitoring1" = import ../../lib/make-monitoring.nix (rec {
@@ -44,11 +48,11 @@ import ../../lib/make-grid.nix {
       monitoringvpnIPv4 = "172.23.23.1";
       inherit vpnClientIPs;
       inherit hostsMap;
-      inherit sshUsers;
-      nodeExporterTargets = [ "monitoring1" "payments1" "storage1" "storage2" ]; # TBD: derive automatically
+      inherit nodeExporterTargets;
       nginxExporterTargets = [ ];
       hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
       stateVersion = "19.09";
+      inherit sshUsers;
     } // cfg);
   };
 }