diff --git a/manifests/agent.pp b/manifests/agent.pp
index ed20d0f..9618afb 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -14,14 +14,11 @@ class puppet::agent (
 
   case $::kernel {
     'Linux' : {
-      $puppetpkgs = ['puppet', 'puppet-common']
+      $puppetpkgs = ['puppet-agent']
 
       Package {
         provider => 'apt' }
 
-      if $::lsbdistid != 'Ubuntu' {
-        package { 'ruby-msgpack': ensure => $ensure }
-      }
     }
     default : {
       $puppetpkgs = 'puppet'
@@ -91,7 +88,7 @@ class puppet::agent (
   # #settings
   if $ensure != 'absent' {
     Ini_setting {
-      path    => '/etc/puppet/puppet.conf',
+      path    => '/etc/puppetlabs/puppet/puppet.conf',
       section => 'agent',
     }
 
diff --git a/manifests/puppetlabs_apt.pp b/manifests/puppetlabs_apt.pp
index 30c8937..49ccb66 100644
--- a/manifests/puppetlabs_apt.pp
+++ b/manifests/puppetlabs_apt.pp
@@ -1,8 +1,9 @@
 class puppet::puppetlabs_apt ($ensure = 'present') {
-  apt::source { 'puppetlabs':
+  apt::source { 'puppetlabs-pc1':
     ensure   => $ensure,
-    key      => '4BD6EC30',
+    key      => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
     location => 'http://apt.puppetlabs.com',
-    repos    => 'main dependencies',
+    repos    => 'PC1',
   }
+
 }