diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index 4848ea4..42ff647 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -51,6 +51,7 @@
         'a3_time_to_trigger': schema.INT,
         'num_cells': schema.UINT,
         'cell_list[].cell_id': schema.UINT,
+        'cell_list[].rf_port': schema.UINT,
         'cell_list[].pci': schema.UINT,
         'cell_list[].ncell_list[]': schema.UINT,
         'cell_list[].scell_list[]': schema.UINT,
diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index 46bdf10..29b5fb8 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -59,7 +59,7 @@
 %for cell in enb.cell_list:
   {
     dl_earfcn: ${cell.dl_earfcn},
-    rf_port: 0, /* FIXME: this may need to be configurable based on device specifics (B2xx vs X310) */
+    rf_port: ${cell.rf_port},
     cell_id: ${cell.cell_id},
     n_id_cell: ${cell.pci},
     tac: 0x0001,
diff --git a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
index 597f6ef..2e25f6b 100644
--- a/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_rr.conf.tmpl
@@ -65,7 +65,7 @@
 %for cell in enb.cell_list:
   ${',' if loop.index != 0 else ''}
   {
-    // rf_port = 0; Not yet implemented!
+    rf_port = ${cell.rf_port};
     cell_id = ${cell.cell_id};
     tac = 0x0001;
     pci = ${loop.index + 1};