diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index 11704b6..89e65f1 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -51,7 +51,7 @@
   gtp_addr: "${enb.gtp_bind_addr}",
 
   /* high 20 bits of SIB1.cellIdentifier */
-  enb_id: 0x19B,
+  enb_id: ${enb.id},
 
   /* list of cells */
   cell_list: [
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index 94e724b..95b10f0 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -19,7 +19,8 @@
 #
 #####################################################################
 [enb]
-enb_id = 0x19B
+# need hex value here for enb_id due to bug: https://github.com/srsLTE/srsLTE/issues/485
+enb_id = ${hex(int(enb.id))}
 mcc = ${enb.mcc}
 mnc = ${enb.mnc}
 mme_addr = ${enb.mme_addr}