diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index 45d9e5f..3429bf8 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -36,6 +36,10 @@ class rhizo_base::apt::common {
       content => template("rhizo_base/$lsbdistcodename-pinning.pref.erb"),
     }
 
+  file { '/etc/apt/sources.list.d/freeswitch.list':
+      ensure  => absent,
+    }
+
   apt::source { 'rhizomatica':
       location          => 'http://dev.rhizomatica.org/ubuntu/',
       release           => 'precise',
@@ -64,12 +68,6 @@ class rhizo_base::apt::common {
       ensure  => installed,
     }
 
-  apt::key { 'freeswitch':
-      id      => '5E098B3D18406E8E19543709BD3189F5A2B57698',
-      source  => 'https://files.freeswitch.org/repo/deb/freeswitch-1.8/fsstretch-archive-keyring.gpg',
-      ensure  => refreshed
-    }
-
   apt::key { 'opensuse':
       id      => '0080689BE757A876CB7DC26962EB1A0917280DDF',
       source  => 'https://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_10/Release.key',
diff --git a/modules/rhizo_base/manifests/misc.pp b/modules/rhizo_base/manifests/misc.pp
index dfc4242..9666a06 100644
--- a/modules/rhizo_base/manifests/misc.pp
+++ b/modules/rhizo_base/manifests/misc.pp
@@ -6,10 +6,6 @@
 
 class rhizo_base::misc {
 
-  file { '/etc/apt/sources.list.d/freeswitch.list':
-     ensure   => absent
-  }
-
   file { '/tmp/tmp':
      ensure    => directory,
      source    => 'puppet:///modules/rhizo_base/tmp/',