diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
index fab1649..532472a 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl
@@ -10,6 +10,11 @@
   },
 %endif
 
+% if enb.rf_dev_type == 'zmq':
+  /* Force sampling rate (if uncommented) */
+  sample_rate: ${enb.sample_rate},
+%endif
+
   /* Log filter: syntax: layer.field=value[,...]
 
      Possible layers are phy, mac, rlc, pdcp, rrc, nas, s1ap, x2ap, gtpu and
diff --git a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
index bbf9b47..466bc8f 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
@@ -1,18 +1,13 @@
-/* Parameters for b2x0 UHD device version 2018-10-18
- * Copyright (C) 2015-2018 Amarisoft
- */
 rf_driver: {
     name: "${enb.rf_dev_type}",
-    sync: "none",
+    sync: "${'1' if enb.rf_dev_type == 'zmq' else 'none'}",
 
     /* Use this for b2x0 devices. Bandwidth >= 10 Mhz */
     args: "${enb.rf_dev_args}",
-
-    /* Use this for bandwidth == 5 Mhz */
-    //args: "send_frame_size=1024,recv_frame_size=1024",
-
-    /* Use this for bandwidth < 5 Mhz */
-    //args: "send_frame_size=512,recv_frame_size=512",
+% if enb.rf_dev_type == 'zmq':
+        dl_sample_bits: 16,
+        ul_sample_bits: 16,
+% endif
 },
 
 tx_gain: 89.0, /* TX gain (in dB) B2x0: 0 to 89.8 dB */