diff --git a/modules/rhizo_base/templates/osmo-bsc-bts.erb b/modules/rhizo_base/templates/osmo-bsc-bts.erb
index 3dbd743..f3710ec 100644
--- a/modules/rhizo_base/templates/osmo-bsc-bts.erb
+++ b/modules/rhizo_base/templates/osmo-bsc-bts.erb
@@ -23,6 +23,11 @@
   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 %>
+<% end -%>
+<% end -%>
   codec-support fr amr
   amr tch-f modes 4 5
   amr tch-f threshold ms 32
@@ -39,6 +44,7 @@
   gprs mode <%= bts["gprs_m"] %>
   gprs routing area 21
   gprs network-control-order nc0
+  gprs ccn-active 0
   gprs cell bvci <%= index+2 %>
   gprs cell timer blocking-timer 3
   gprs cell timer blocking-retries 3
@@ -67,8 +73,7 @@
   gprs nsvc 1 local udp port 0
   gprs nsvc 1 remote udp port 0
   gprs nsvc 1 remote ip 0.0.0.0
-<% if @repo == 'nightly' && bts["gprs_m"] == "egprs" %>  gprs egprs-packet-channel-request
-<% end -%>
+  gprs egprs-packet-channel-request
   no force-combined-si
   bs-power-control
    mode static
diff --git a/modules/rhizo_base/templates/osmo-bsc-head.erb b/modules/rhizo_base/templates/osmo-bsc-head.erb
index 638ff2e..7b02512 100644
--- a/modules/rhizo_base/templates/osmo-bsc-head.erb
+++ b/modules/rhizo_base/templates/osmo-bsc-head.erb
@@ -81,3 +81,4 @@ network
  dyn_ts_allow_tch_f 0
 <% end -%>
  meas-feed destination 127.0.0.1 8888
+ neighbor-resolution bind 172.16.0.1 4248
diff --git a/modules/rhizo_base/templates/osmo-pcu.cfg.erb b/modules/rhizo_base/templates/osmo-pcu.cfg.erb
index 6306b2e..669ce57 100644
--- a/modules/rhizo_base/templates/osmo-pcu.cfg.erb
+++ b/modules/rhizo_base/templates/osmo-pcu.cfg.erb
@@ -1,8 +1,8 @@
 pcu
-<% if @gprs == 'egprs' -%> egprs only
-<% end -%>
  flow-control-interval 10
  cs 4
  alloc-algorithm dynamic
- alpha 0
  gamma 0
+<% if @osmo_stack == "split" -%>
+ neighbor resolution 172.16.0.1 4248
+<% end -%>