diff --git a/resources/scenarios/commander.py b/resources/scenarios/commander.py
index 50ff3e7f7..909f13adf 100644
--- a/resources/scenarios/commander.py
+++ b/resources/scenarios/commander.py
@@ -233,6 +233,9 @@ def setup(self):
         ch.setFormatter(ColorFormatter())
         self.log.addHandler(ch)
 
+        # This is the namespace the scenario was deployed in
+        self.namespace = NAMESPACE
+
         # Keep a separate index of tanks by pod name
         self.tanks: dict[str, TestNode] = {}
         self.lns: dict[str, LNNode] = {}
@@ -265,10 +268,10 @@ def setup(self):
             node.init_peers = int(tank["init_peers"])
 
             self.nodes.append(node)
-            self.tanks[tank["tank"]] = node
+            self.tanks[tank["tank"] + "." + tank["namespace"]] = node
 
         for ln in WARNET["lightning"]:
-            self.lns[ln.name] = ln
+            self.lns[ln.name + "." + ln.namespace] = ln
 
         self.num_nodes = len(self.nodes)
 
diff --git a/resources/scenarios/ln_init.py b/resources/scenarios/ln_init.py
index 42c6cbcc4..a4014e40b 100644
--- a/resources/scenarios/ln_init.py
+++ b/resources/scenarios/ln_init.py
@@ -47,10 +47,10 @@ def run_test(self):
         if self.options.miner:
             self.log.info(f"Parsed 'miner' argument: {self.options.miner}")
             mining_tank = self.tanks[self.options.miner]
-        elif "miner" in self.tanks:
+        elif f"miner.{self.namespace}" in self.tanks:
             # or choose the tank with the right name
             self.log.info("Found tank named 'miner'")
-            mining_tank = self.tanks["miner"]
+            mining_tank = self.tanks[f"miner.{self.namespace}"]
         else:
             mining_tank = self.nodes[0]
             self.log.info(f"Using tank {mining_tank.tank} as miner")
@@ -211,6 +211,10 @@ def get_ln_uri(self, ln):
         for ch in self.channels:
             src = self.lns[ch["source"]]
             tgt = self.lns[ch["target"]]
+            if "." not in src:
+                src += f".{self.namespace}"
+            if "." not in tgt:
+                tgt += f".{self.namespace}"
             # Avoid duplicates and reciprocals
             if (src, tgt) not in connections and (tgt, src) not in connections:
                 connections.append((src, tgt))
diff --git a/resources/scenarios/test_scenarios/connect_dag.py b/resources/scenarios/test_scenarios/connect_dag.py
index 5747291cb..0017213e7 100644
--- a/resources/scenarios/test_scenarios/connect_dag.py
+++ b/resources/scenarios/test_scenarios/connect_dag.py
@@ -56,16 +56,16 @@ def run_test(self):
         self.connect_nodes(6, 7)
         self.sync_all()
 
-        zero_peers = self.tanks["tank-0000"].getpeerinfo()
-        one_peers = self.tanks["tank-0001"].getpeerinfo()
-        two_peers = self.tanks["tank-0002"].getpeerinfo()
-        three_peers = self.tanks["tank-0003"].getpeerinfo()
-        four_peers = self.tanks["tank-0004"].getpeerinfo()
-        five_peers = self.tanks["tank-0005"].getpeerinfo()
-        six_peers = self.tanks["tank-0006"].getpeerinfo()
-        seven_peers = self.tanks["tank-0007"].getpeerinfo()
-        eight_peers = self.tanks["tank-0008"].getpeerinfo()
-        nine_peers = self.tanks["tank-0009"].getpeerinfo()
+        zero_peers = self.tanks[f"tank-0000.{self.namespace}"].getpeerinfo()
+        one_peers = self.tanks[f"tank-0001.{self.namespace}"].getpeerinfo()
+        two_peers = self.tanks[f"tank-0002.{self.namespace}"].getpeerinfo()
+        three_peers = self.tanks[f"tank-0003.{self.namespace}"].getpeerinfo()
+        four_peers = self.tanks[f"tank-0004.{self.namespace}"].getpeerinfo()
+        five_peers = self.tanks[f"tank-0005.{self.namespace}"].getpeerinfo()
+        six_peers = self.tanks[f"tank-0006.{self.namespace}"].getpeerinfo()
+        seven_peers = self.tanks[f"tank-0007.{self.namespace}"].getpeerinfo()
+        eight_peers = self.tanks[f"tank-0008.{self.namespace}"].getpeerinfo()
+        nine_peers = self.tanks[f"tank-0009.{self.namespace}"].getpeerinfo()
 
         for node in self.nodes:
             self.log.info(f"Node {node.index}: tank={node.tank} ip={node.rpchost}")
diff --git a/resources/scenarios/test_scenarios/p2p_interface.py b/resources/scenarios/test_scenarios/p2p_interface.py
index 64636267c..b6ab7d803 100644
--- a/resources/scenarios/test_scenarios/p2p_interface.py
+++ b/resources/scenarios/test_scenarios/p2p_interface.py
@@ -34,7 +34,9 @@ def run_test(self):
         self.log.info("Adding the p2p connection")
 
         p2p_block_store = self.nodes[0].add_p2p_connection(
-            P2PStoreBlock(), dstaddr=self.tanks["tank-0000"].rpchost, dstport=18444
+            P2PStoreBlock(),
+            dstaddr=self.tanks[f"tank-0000.{self.namespace}"].rpchost,
+            dstport=18444,
         )
 
         self.log.info("test that an invalid GETDATA doesn't prevent processing of future messages")
diff --git a/resources/scenarios/test_scenarios/signet_grinder.py b/resources/scenarios/test_scenarios/signet_grinder.py
index 1bee09409..cf1821110 100644
--- a/resources/scenarios/test_scenarios/signet_grinder.py
+++ b/resources/scenarios/test_scenarios/signet_grinder.py
@@ -8,7 +8,9 @@ def set_test_params(self):
         self.num_nodes = 0
 
     def run_test(self):
-        self.generatetoaddress(self.tanks["miner"], 1, "tb1qjfplwf7a2dpjj04cx96rysqeastvycc0j50cch")
+        self.generatetoaddress(
+            self.tanks[f"miner.{self.namespace}"], 1, "tb1qjfplwf7a2dpjj04cx96rysqeastvycc0j50cch"
+        )
 
 
 def main():