diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index 2dbaade..010d1e1 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -95,7 +95,7 @@ class rhizo_base::apt::buster inherits rhizo_base::apt::common {
       release     => './',
       repos       => '',
       key         => {
-        'id'      => '0080689BE757A876CB7DC26962EB1A0917280DDF',
+        'id'      => '6B2A9F3792D15EB70D4E6A8F86A730B653725973',
         'source'  => 'https://downloads.osmocom.org/packages/osmocom:/latest/Debian_10/Release.key'
        },
       notify      => Exec['apt_update'],
@@ -157,7 +157,8 @@ class rhizo_base::apt::stretch inherits rhizo_base::apt::common {
 
    file { [ '/etc/apt/sources.list.d/osmocom-latest.list',
             '/etc/apt/sources.list.d/osmocom-nightly.list',
-            '/etc/apt/sources.list.d/osmocom.list' ]:
+            '/etc/apt/sources.list.d/osmocom.list',
+            '/etc/apt/sources.list.d/apt.postgresql.org.list' ]:
       ensure     => absent,
     }
 }
diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index 0b3e8ca..70e0017 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -300,8 +300,8 @@ schedule { 'never':
     owner     => 'root',
   }
 
-  $bts_user = { 'UmSite' => 'fairwaves', '2050M' => 'root', '2050S' => 'root',
-                '1020' => 'root', '2100' => 'root', 'ocsdr' => 'oc', '1002' => 'root' }
+  $bts_user = { 'UmSite' => 'fairwaves@', 'UmSite1' => 'rhizomatica@', '2050M' => 'root@', '2050S' => 'root@',
+                '1020' => 'root@', '2100' => 'root@', 'ocsdr' => 'oc@', '1002' => 'root@' }
   file { "/etc/profile.d/rccn-functions.sh":
       ensure  => present,
       content  => template('rhizo_base/rccn-functions.sh.erb'),
diff --git a/modules/rhizo_base/templates/osmo-bsc-head.erb b/modules/rhizo_base/templates/osmo-bsc-head.erb
index c4675fc..3be7508 100644
--- a/modules/rhizo_base/templates/osmo-bsc-head.erb
+++ b/modules/rhizo_base/templates/osmo-bsc-head.erb
@@ -78,7 +78,7 @@ network
  handover2 window rxlev averaging 7
  handover2 window rxlev neighbor averaging 7
  handover2 power budget interval 6
- handover2 power budget hysteresis 10
+ handover2 power budget hysteresis 12
  handover2 maximum distance 10
  handover2 min rxlev -95
  handover2 min rxqual 5
diff --git a/modules/rhizo_base/templates/rccn-functions.sh.erb b/modules/rhizo_base/templates/rccn-functions.sh.erb
index 3d88bdc..d6f7f42 100644
--- a/modules/rhizo_base/templates/rccn-functions.sh.erb
+++ b/modules/rhizo_base/templates/rccn-functions.sh.erb
@@ -80,7 +80,7 @@ f() {
     tmux a -t SIP
     return
   fi
-  tmux new-session -n SIP "sudo sngrep -d any" \; splitw -p 60 "fs_cli -r" \; select-window -t SIP \;
+  tmux new-session -s SIP "sudo sngrep -d any" \; splitw -p 60 "fs_cli -r" \; select-window -t SIP \;
 }
 
 rk_ext() {