diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index 935960e..2dbaade 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -17,8 +17,11 @@ class rhizo_base::apt {
 
 class rhizo_base::apt::common {
 
-  $osmo_repo = hiera('rhizo::osmo_repo', 'latest')
-  $fs_pin    = hiera('rhizo::fs_pin', '1.10.3*')
+
+  $fs_version = "${lsbdistcodename}" ? {
+    'buster'   =>  '1.8.6',
+    'stretch'  =>  '1.6.20',
+  }
 
   class { '::apt':
      update => {
diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp
index a58ac1b..a0f1634 100644
--- a/modules/rhizo_base/manifests/freeswitch.pp
+++ b/modules/rhizo_base/manifests/freeswitch.pp
@@ -118,18 +118,10 @@ class rhizo_base::freeswitch::common {
   $reg_provider   = $rhizo_base::reg_provider
   $mncc_ip_address = $rhizo_base::mncc_ip_address
 
-  $fs_ensure      = hiera('rhizo::fs_version', 'present')
-  $fs_deb_version = "${lsbdistcodename}_${fs_ensure}" ? {
-    'buster_1.8.6'   =>  '1.8.6',
-    'stretch_1.6.20:' =>  '1.6.20',
-    default    =>  '1.10.3~release~15~129de34d84~$lsbdistcodename-1~$lsbdistcodename+1'
+  $fs_version = "${lsbdistcodename}" ? {
+    'buster'   =>  '1.8.6',
+    'stretch'  =>  '1.6.20',
   }
-  $fs_lib_version = "${lsbdistcodename}_${fs_ensure}" ? {
-    'buster_1.8.6'   =>  '1.8.6',
-    'stretch_1.6.20:' =>  '1.6.20',
-    default    =>  '1.10.3'
-  }
-
   package {
     [
     'freeswitch-mod-b64',
@@ -144,7 +136,8 @@ class rhizo_base::freeswitch::common {
     }
 
   package {
-    ['freeswitch-mod-amr', 'freeswitch-mod-amrwb',
+    ['freeswitch', 'libfreeswitch1', 'freeswitch-lang-en',
+    'freeswitch-mod-amr', 'freeswitch-mod-amrwb',
     'freeswitch-mod-commands',
     'freeswitch-mod-console', 'freeswitch-mod-db',
     'freeswitch-mod-dialplan-xml', 'freeswitch-mod-dptools',
@@ -159,17 +152,13 @@ class rhizo_base::freeswitch::common {
     'freeswitch-mod-sndfile', 'freeswitch-mod-sofia',
     'freeswitch-mod-shout', 'freeswitch-mod-tone-stream',
     'freeswitch-mod-voicemail', 'freeswitch-mod-voicemail-ivr',
-    'freeswitch-mod-cdr-pg-csv',
-    'libfreeswitch1', 'freeswitch-mod-spandsp',
-    'freeswitch-sounds-es-mx-maria' ]:
-      ensure  => installed,
+    'freeswitch-mod-cdr-pg-csv', 'freeswitch-mod-spandsp' ]:
+      ensure  => $fs_version,
       require => Class['rhizo_base::apt'],
     }
-
-  package {
-    ['freeswitch', 'freeswitch-lang-en']:
-      ensure  => $fs_ensure,
-      require => Class['rhizo_base::apt'],
+  package { 'freeswitch-sounds-es-mx-maria':
+      ensure  => installed,
+      require => Package['freeswitch']
     }
 
   unless ($rhizo_base::osmo_stack == "split") {
diff --git a/modules/rhizo_base/templates/buster-pinning.pref.erb b/modules/rhizo_base/templates/buster-pinning.pref.erb
index a87e72a..b22ad51 100644
--- a/modules/rhizo_base/templates/buster-pinning.pref.erb
+++ b/modules/rhizo_base/templates/buster-pinning.pref.erb
@@ -1,5 +1,5 @@
 Package: freeswitch* libfreeswitch*
-Pin: version <%= @fs_pin %>
+Pin: version <%= @fs_version %>
 Pin-Priority: 510
 
 Package: postgresql-*-9.6 
diff --git a/modules/rhizo_base/templates/fs_ensure.erb b/modules/rhizo_base/templates/fs_ensure.erb
index 61e81d9..d3be997 100644
--- a/modules/rhizo_base/templates/fs_ensure.erb
+++ b/modules/rhizo_base/templates/fs_ensure.erb
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 dpkg -l | egrep freeswitch-mod\|libfreeswitch | cut -f3 -d\  |\
-sed 's/\(.*\)/\1=<%= @fs_deb_version %>/' | sort -r |\
+sed 's/\(.*\)/\1=<%= @fs_version %>/' | sort -r |\
 sudo xargs -p apt install --assume-yes --allow-downgrades
diff --git a/modules/rhizo_base/templates/stretch-pinning.pref.erb b/modules/rhizo_base/templates/stretch-pinning.pref.erb
index 7d6be74..5cabc47 100644
--- a/modules/rhizo_base/templates/stretch-pinning.pref.erb
+++ b/modules/rhizo_base/templates/stretch-pinning.pref.erb
@@ -1,5 +1,5 @@
 Package: freeswitch* libfreeswitch*
-Pin: version <%= @fs_pin %>
+Pin: version <%= @fs_version %>
 Pin-Priority: 510
 
 Package: postgresql-*-9.6