diff --git a/modules/rhizo_base/templates/osmo-bsc-bts.erb b/modules/rhizo_base/templates/osmo-bsc-bts.erb
index f78581e..6f4c8e3 100644
--- a/modules/rhizo_base/templates/osmo-bsc-bts.erb
+++ b/modules/rhizo_base/templates/osmo-bsc-bts.erb
@@ -10,9 +10,12 @@
   cell reselection hysteresis 4
   rxlev access min 0
   radio-link-timeout 32
-  channel allocator ascending
+  channel allocator mode chan-req ascending
+  channel allocator mode assignment ascending
+  channel allocator mode handover ascending
   rach tx integer 9
   rach max transmission 7
+  rach max-delay 63
   channel-description attach 1
   channel-description bs-pa-mfrms 5
   channel-description bs-ag-blks-res 1
@@ -22,6 +25,7 @@
   early-classmark-sending-3g allowed
   ipa unit-id 1000 <%= bts["uid"] %>
   oml ipa stream-id 255 line 0
+  neighbor-list mode automatic
 <% @bts.each_with_index do |b, i| -%>
 <% if i != index -%>
   neighbor bts <%= i %>
@@ -59,6 +63,7 @@
   gprs routing area 21
   gprs network-control-order nc0
   gprs ccn-active 0
+  gprs power-control alpha 0
   gprs cell bvci <%= index+2 %>
   gprs cell timer blocking-timer 3
   gprs cell timer blocking-retries 3
@@ -81,12 +86,12 @@
   gprs ns timer tns-alive-retries 10
   gprs nsvc 0 nsvci 10<%= index+2 %>
   gprs nsvc 0 local udp port 23<%= index+Integer(bts["lac"]) %>
-  gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip <%= @sgsn_ip_address %>
+  gprs nsvc 0 remote udp port 23000
   gprs nsvc 1 nsvci 0
   gprs nsvc 1 local udp port 0
-  gprs nsvc 1 remote udp port 0
   gprs nsvc 1 remote ip 0.0.0.0
+  gprs nsvc 1 remote udp port 0
 <% if bts["gprs_m"] == "egprs" -%>
   gprs egprs-packet-channel-request
 <% end -%>
@@ -95,6 +100,7 @@
    mode static
   ms-power-control
    mode dyn-bts
+   ctrl-interval 2
    step-size inc 4 red 2
 <% if bts["UL_tgt"] -%>
    rxlev-thresh lower <%= bts["UL_tgt"]+107 %> upper <%= bts["UL_tgt"]+113 %>
diff --git a/modules/rhizo_base/templates/osmo-bsc-head.erb b/modules/rhizo_base/templates/osmo-bsc-head.erb
index 67f4350..87cb6ec 100644
--- a/modules/rhizo_base/templates/osmo-bsc-head.erb
+++ b/modules/rhizo_base/templates/osmo-bsc-head.erb
@@ -7,8 +7,9 @@ log stderr
  logging color 1
  logging print category-hex 0
  logging print category 1
- logging print level 1
+ logging print thread-id 0
  logging timestamp 0
+ logging print level 1
  logging print file 1
  logging level rll notice
  logging level mm notice
@@ -29,6 +30,9 @@ log stderr
  logging level ts notice
  logging level as notice
  logging level cbs notice
+ logging level lcs notice
+ logging level reset notice
+ logging level loop notice
  logging level lglobal notice
  logging level llapd notice
  logging level linp notice
@@ -48,6 +52,12 @@ log stderr
  logging level lmgcp notice
  logging level ljibuf notice
  logging level lrspro notice
+ logging level lns notice
+ logging level lbssgp notice
+ logging level lnsdata notice
+ logging level lnssignal notice
+ logging level liuup notice
+ logging level lpfcp notice
 !
 stats interval 10
 stats reporter statsd
@@ -82,9 +92,9 @@ network
  handover2 maximum distance 10
  handover2 min rxlev -95
  handover2 min rxqual 5
+ handover2 min-free-slots tch/h 2
  handover2 penalty-time failed-ho 5
  handover2 penalty-time failed-assignment 5
- handover2 min-free-slots tch/h 2
  handover2 congestion-check 30
 <% if @mncc_codec == 'AMR' -%>
  dyn_ts_allow_tch_f 0