diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index be48887..85aca35 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -35,6 +35,7 @@
         'rf_dev_type': schema.STR,
         'rf_dev_args': schema.STR,
         'additional_args[]': schema.STR,
+        'inactivity_timer': schema.INT,
         'enable_measurements': schema.BOOL_STR,
         'enable_dl_awgn': schema.BOOL_STR,
         'dl_awgn_snr': schema.INT,
@@ -99,6 +100,8 @@
         self._txmode = int(values['enb'].get('transmission_mode', None))
         assert self._txmode
         config.overlay(values, dict(enb={ 'num_ports': self.num_ports() }))
+        self._inactivity_timer = int(values['enb'].get('inactivity_timer', None))
+        assert self._inactivity_timer
         assert self._epc is not None
         config.overlay(values, dict(enb={ 'addr': self.addr() }))
         config.overlay(values, dict(enb={ 'mme_addr': self._epc.addr() }))
diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index 155ad47..2893b9e 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -223,7 +223,7 @@
 
     /* (in ms) send RRC connection release after this time of network
        inactivity */
-    inactivity_timer: 10000,
+    inactivity_timer: ${enb.inactivity_timer},
 
     /* SRB configuration */
     srb_config: [
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index 81753d6..ac94313 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -272,7 +272,7 @@
 #pregenerate_signals  = false
 #tx_amplitude         = 0.6
 #link_failure_nof_err = 50
-rrc_inactivity_timer = 5000
+rrc_inactivity_timer = ${enb.inactivity_timer}
 #max_prach_offset_us  = 30
 #eea_pref_list = EEA0, EEA2, EEA1
 #eia_pref_list = EIA2, EIA1, EIA0