diff --git a/sysmocom/scenarios/mod-enb-cells-2ca.conf b/sysmocom/scenarios/mod-enb-cells-2ca.conf
index c9468c60..916d0ebb 100644
--- a/sysmocom/scenarios/mod-enb-cells-2ca.conf
+++ b/sysmocom/scenarios/mod-enb-cells-2ca.conf
@@ -2,6 +2,7 @@
 modifiers:
   enb:
   - id: 0x19B
+    num_cells: 2
     cell_list:
     - cell_id: 0x00
       pci: 0x01
diff --git a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf b/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf
index 899ec4b2..2d629f9a 100644
--- a/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf
+++ b/sysmocom/scenarios/mod-enb-cells-intra-freq-ho-sameport.conf
@@ -2,6 +2,7 @@
 modifiers:
   enb:
   - id: 0x19B
+    num_cells: 2
     cell_list:
     - cell_id: 0x01
       pci: 0x01
diff --git a/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf b/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf
index f4223a50..720b75b3 100644
--- a/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf
+++ b/sysmocom/scenarios/mod-enb-cells-intraenb-intrafreq-ho.conf
@@ -3,6 +3,7 @@ modifiers:
   enb:
   - id: 0x19B
     enable_measurements: true
+    num_cells: 2
     cell_list:
     - cell_id: 0x01
       pci: 0x01
diff --git a/sysmocom/scenarios/mod-enb-ncells@.conf b/sysmocom/scenarios/mod-enb-ncells@.conf
deleted file mode 100644
index b57b94a6..00000000
--- a/sysmocom/scenarios/mod-enb-ncells@.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-modifiers:
-  enb:
-  - num_cells: ${param1}