diff --git a/sam/onyx/hw_nodes/glb_node.py b/sam/onyx/hw_nodes/glb_node.py
index a2ed6baa..19d69b1d 100644
--- a/sam/onyx/hw_nodes/glb_node.py
+++ b/sam/onyx/hw_nodes/glb_node.py
@@ -1,4 +1,5 @@
 from sam.onyx.hw_nodes.hw_node import *
+import os
 
 
 class GLBNode(HWNode):
@@ -92,9 +93,11 @@ def connect(self, other, edge, kwargs=None):
             raise NotImplementedError(f'Cannot connect GLBNode to {other_type}')
         elif other_type == WriteScannerNode:
             wr_scan = other.get_name()
+            include_E64_HW = "INCLUDE_E64_HW" in os.environ and os.environ.get("INCLUDE_E64_HW") == "1"
+            io2f_port_name = "io2f_17_0" if include_E64_HW else "io2f_17"
             new_conns = {
                 'glb_to_wr_scan': [
-                    ([(self.data, "io2f_17"), (wr_scan, "block_wr_in")], 17),
+                    ([(self.data, io2f_port_name), (wr_scan, "block_wr_in")], 17),
                 ]
             }
             return new_conns
@@ -125,9 +128,11 @@ def connect(self, other, edge, kwargs=None):
             return conns_remapped
         elif other_type == PassThroughNode:
             pass_through = other.get_name()
+            include_E64_HW = "INCLUDE_E64_HW" in os.environ and os.environ.get("INCLUDE_E64_HW") == "1"
+            io2f_port_name = "io2f_17_0" if include_E64_HW else "io2f_17"
             new_conns = {
                 'glb_to_pass_through': [
-                    ([(self.data, "io2f_17"), (pass_through, "stream_in")], 17),
+                    ([(self.data, io2f_port_name), (pass_through, "stream_in")], 17),
                 ]
             }
             return new_conns
diff --git a/sam/onyx/hw_nodes/read_scanner_node.py b/sam/onyx/hw_nodes/read_scanner_node.py
index 2bdca283..54608042 100644
--- a/sam/onyx/hw_nodes/read_scanner_node.py
+++ b/sam/onyx/hw_nodes/read_scanner_node.py
@@ -1,5 +1,6 @@
 from numpy import block
 from sam.onyx.hw_nodes.hw_node import *
+import os
 
 
 class ReadScannerNode(HWNode):
@@ -54,9 +55,11 @@ def connect(self, other, edge, kwargs=None):
             other_data = other.get_data()
             other_ready = other.get_ready()
             other_valid = other.get_valid()
+            include_E64_HW = "INCLUDE_E64_HW" in os.environ and os.environ.get("INCLUDE_E64_HW") == "1"
+            f2io_port_name = "f2io_17_0" if include_E64_HW else "f2io_17"
             new_conns = {
                 'rd_scan_to_glb': [
-                    ([(rd_scan, "block_rd_out"), (other_data, "f2io_17")], 17),
+                    ([(rd_scan, "block_rd_out"), (other_data, f2io_port_name)], 17),
                 ]
             }
             return new_conns
diff --git a/sam/onyx/hw_nodes/stream_arbiter_node.py b/sam/onyx/hw_nodes/stream_arbiter_node.py
index 4317db24..293f5dc1 100644
--- a/sam/onyx/hw_nodes/stream_arbiter_node.py
+++ b/sam/onyx/hw_nodes/stream_arbiter_node.py
@@ -1,4 +1,5 @@
 from sam.onyx.hw_nodes.hw_node import *
+import os
 
 
 class StreamArbiterNode(HWNode):
@@ -36,6 +37,8 @@ def connect(self, other, edge, kwargs=None):
             other_data = other.get_data()
             other_ready = other.get_ready()
             other_valid = other.get_valid()
+            include_E64_HW = "INCLUDE_E64_HW" in os.environ and os.environ.get("INCLUDE_E64_HW") == "1"
+            f2io_port_name = "f2io_17_0" if include_E64_HW else "f2io_17"
             new_conns = {
                 'stream_arbiter_to_glb': [
                     ([(stream_arb, "stream_out"), (other_data, "f2io_17")], 17),