diff --git a/manifests/params.pp b/manifests/params.pp
index 1f95f7c..9880f8b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -8,11 +8,13 @@
 
   case $::osfamily {
     'Debian' : {
+      $os = downcase($::operatingsystem)
+
       $key_signature            = '434975BD900CCBE4F7EE1B1ED208507CA14F4FCA'
       $package_name             = 'erlang-nox'
       $local_repo_location      = undef
-      $remote_repo_key_location = 'http://packages.erlang-solutions.com/debian/erlang_solutions.asc'
-      $remote_repo_location     = 'http://packages.erlang-solutions.com/debian'
+      $remote_repo_key_location = "http://packages.erlang-solutions.com/${os}/erlang_solutions.asc"
+      $remote_repo_location     = "http://packages.erlang-solutions.com/${os}"
       $repos                    = 'contrib'
     }
     'RedHat', 'SUSE', 'Archlinux' : {
diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
index dc5dbc9..6bcc098 100644
--- a/manifests/repo/apt.pp
+++ b/manifests/repo/apt.pp
@@ -28,14 +28,16 @@
   $repos                    = $erlang::repos,
 ) {
 
-  Class['erlang::repo::apt'] -> Package<| title == $package_name |>
-
-  apt::source { 'erlang':
-    include_src => false,
-    key         => $key_signature,
-    key_source  => $remote_repo_key_location,
-    location    => $remote_repo_location,
-    repos       => $repos,
+  ::apt::source { 'erlang':
+    include           => { 'src' => false },
+    key               => {
+      'id'     => $key_signature,
+      'server' => 'hkp://keyserver.ubuntu.com:80',
+      'source' => $remote_repo_key_location,
+    },
+    location          => $remote_repo_location,
+    release           => $::lsbdistcodename,
+    repos             => $repos,
   }
 
 }