diff --git a/test/testdata/deployednettemplates/recipes/custom/configs/node.json b/test/testdata/deployednettemplates/recipes/custom/configs/node.json
index f9b05a87f2..4cfd52b5c8 100644
--- a/test/testdata/deployednettemplates/recipes/custom/configs/node.json
+++ b/test/testdata/deployednettemplates/recipes/custom/configs/node.json
@@ -1,5 +1,4 @@
 {
-    "NetAddress": "{{NetworkPort}}",
     "APIEndpoint": "{{APIEndpoint}}",
     "APIToken": "{{APIToken}}",
     "EnableBlockStats": false,
@@ -10,7 +9,6 @@
     "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \"<network>.algodev.network\", \"DeadlockDetection\": -1, \"PeerPingPeriodSeconds\": 30, \"BaseLoggerDebugLevel\": 4, \"EnableProfiler\": true, \"CadaverSizeTarget\": 0 }",
     "AltConfigs": [
         {
-            "NetAddress": "{{NetworkPort}}",
             "APIEndpoint": "{{APIEndpoint}}",
             "APIToken": "{{APIToken}}",
             "EnableBlockStats": true,
diff --git a/test/testdata/deployednettemplates/recipes/custom/configs/nonPartNode.json b/test/testdata/deployednettemplates/recipes/custom/configs/nonPartNode.json
index 0e22877432..5b0a52d9d9 100644
--- a/test/testdata/deployednettemplates/recipes/custom/configs/nonPartNode.json
+++ b/test/testdata/deployednettemplates/recipes/custom/configs/nonPartNode.json
@@ -1,5 +1,4 @@
 {
-    "NetAddress": "{{NetworkPort}}",
     "APIEndpoint": "{{APIEndpoint}}",
     "APIToken": "{{APIToken}}",
     "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \"<network>.algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0  }"
diff --git a/test/testdata/deployednettemplates/recipes/scenario2/net.json b/test/testdata/deployednettemplates/recipes/scenario2/net.json
index e816dfd048..4c1c0d6c2b 100644
--- a/test/testdata/deployednettemplates/recipes/scenario2/net.json
+++ b/test/testdata/deployednettemplates/recipes/scenario2/net.json
@@ -416,6 +416,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -527,6 +528,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -638,6 +640,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -749,6 +752,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -860,6 +864,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -971,6 +976,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1082,6 +1088,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1193,6 +1200,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1304,6 +1312,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1415,6 +1424,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1526,6 +1536,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1637,6 +1648,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1748,6 +1760,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1859,6 +1872,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -1970,6 +1984,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2081,6 +2096,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2192,6 +2208,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2303,6 +2320,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2414,6 +2432,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2525,6 +2544,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2636,6 +2656,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2747,6 +2768,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2858,6 +2880,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -2969,6 +2992,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3080,6 +3104,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3191,6 +3216,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3302,6 +3328,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3413,6 +3440,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3524,6 +3552,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3635,6 +3664,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3746,6 +3776,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3857,6 +3888,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -3968,6 +4000,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -4079,6 +4112,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -4190,6 +4224,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -4301,6 +4336,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -4412,6 +4448,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -4523,6 +4560,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -4634,6 +4672,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
@@ -4745,6 +4784,7 @@
 							"ParticipationOnly": false
 						}
 					],
+					"APIEndpoint": "{{APIEndpoint}}",
 					"APIToken": "{{APIToken}}",
 					"EnableTelemetry": true,
 					"TelemetryURI": "{{TelemetryURI}}",
diff --git a/test/testdata/deployednettemplates/recipes/scenario2/node.json b/test/testdata/deployednettemplates/recipes/scenario2/node.json
index a5b72567e0..7b505bb212 100644
--- a/test/testdata/deployednettemplates/recipes/scenario2/node.json
+++ b/test/testdata/deployednettemplates/recipes/scenario2/node.json
@@ -1,5 +1,4 @@
 {
-    "NetAddress": "{{NetworkPort}}",
     "APIEndpoint": "{{APIEndpoint}}",
     "APIToken": "{{APIToken}}",
     "EnableBlockStats": true,
diff --git a/test/testdata/deployednettemplates/recipes/scenario2/nonPartNode.json b/test/testdata/deployednettemplates/recipes/scenario2/nonPartNode.json
index 0e22877432..5b0a52d9d9 100644
--- a/test/testdata/deployednettemplates/recipes/scenario2/nonPartNode.json
+++ b/test/testdata/deployednettemplates/recipes/scenario2/nonPartNode.json
@@ -1,5 +1,4 @@
 {
-    "NetAddress": "{{NetworkPort}}",
     "APIEndpoint": "{{APIEndpoint}}",
     "APIToken": "{{APIToken}}",
     "ConfigJSONOverride": "{ \"TxPoolExponentialIncreaseFactor\": 1, \"DNSBootstrapID\": \"<network>.algodev.network\", \"DeadlockDetection\": -1, \"BaseLoggerDebugLevel\": 4, \"CadaverSizeTarget\": 0  }"