diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp
index 2a5699b..a7940d3 100644
--- a/modules/rhizo_base/manifests/osmocom.pp
+++ b/modules/rhizo_base/manifests/osmocom.pp
@@ -103,10 +103,10 @@ class rhizo_base::osmocom {
   $ts0_phys_chan = "CCCH"
   $ts1_phys_chan = "SDCCH8"
 
-  if $mncc_codec == "AMR" {
-       $phys_chan = "TCH/H"
-  } else {
+  if $mncc_codec == "GSM" {
        $phys_chan = "TCH/F"
+  } else {
+       $phys_chan = "TCH/H"
   }
 
   unless hiera('rhizo::local_osmobsc_cfg') == "1" {
diff --git a/modules/rhizo_base/templates/osmo-bsc-bts.erb b/modules/rhizo_base/templates/osmo-bsc-bts.erb
index 01a1ef3..8815bbe 100644
--- a/modules/rhizo_base/templates/osmo-bsc-bts.erb
+++ b/modules/rhizo_base/templates/osmo-bsc-bts.erb
@@ -80,10 +80,17 @@
    max_power_red <%= bts["red"] %>
    rsl e1 tei 0
    timeslot 0
+<% if index == 0 -%>
     phys_chan_config <%= @ts0_phys_chan %>
     hopping enabled 0
    timeslot 1
     phys_chan_config <%= @ts1_phys_chan %>
+<% else -%>
+    phys_chan_config <%= @phys_chan %>
+    hopping enabled 0
+   timeslot 1
+    phys_chan_config <%= @phys_chan %>
+<% end -%>
     hopping enabled 0
    timeslot 2
     phys_chan_config <%= @phys_chan %>