diff --git a/modules/rhizo_base/templates/osmo-msc.cfg.erb b/modules/rhizo_base/templates/osmo-msc.cfg.erb
index 94103bb..582cb6e 100644
--- a/modules/rhizo_base/templates/osmo-msc.cfg.erb
+++ b/modules/rhizo_base/templates/osmo-msc.cfg.erb
@@ -69,12 +69,14 @@ network
  authentication optional
  rrlp mode none
  mm info 1
+ no call-waiting
 msc
 <% if @repo == 'nightly' -%> sms-database <%= @sms_db %>
 <% end -%>
  mncc external /tmp/bsc_mncc
  mncc guard-timeout 180
  ncss guard-timeout 30
+ assign-tmsi
  cs7-instance-a 0
  auth-tuple-max-reuse-count 3
  auth-tuple-reuse-on-error 1