diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
index 0d53ccb..4f39f79 100644
--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
@@ -57,8 +57,8 @@
 % endif
   ip.access unit_id ${bts.ipa_unit_id} 0
   oml ip.access stream_id ${bts.stream_id} line 0
-% if bts.get('sgsn', False):
-  gprs mode gprs
+% if bts.get('sgsn', False) and bts['gprs_mode'] != 'none':
+  gprs mode ${bts.gprs_mode}
   gprs routing area ${bts.routing_area_code}
   gprs network-control-order nc1
   gprs cell bvci ${bts.bvci}
diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
index e7f2fb8..ede1902 100644
--- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl
@@ -18,7 +18,7 @@
  bind-ip ${osmo_trx.trx_ip}
  remote-ip ${osmo_trx.bts_ip}
  base-port 5700
- egprs disable
+ egprs ${osmo_trx.egprs}
 %if osmo_trx.get('multi_arfcn', False):
  multi-arfcn enable
 %else: