diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 839ab44..d9d6614 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -283,11 +283,6 @@ class puppet::server::common inherits puppet::client {
             default => "puppet-server",
         },
         ensure => installed,
-        notify => $::operatingsystem ? {
-            debian  => Exec["stop-puppetmaster"],
-            ubuntu  => Exec["stop-puppetmaster"],
-            default => undef,
-        },
         before => File["/etc/puppet/puppet.conf"],
     }
 
@@ -297,7 +292,7 @@ class puppet::server::common inherits puppet::client {
                 command     => "pkill -u puppet ; true",
                 path        => "/bin:/usr/bin:/sbin:/usr/sbin",
                 refreshonly => true,
-                before      => File["/etc/default/puppetmaster"],
+                subscribe   => Package["puppetmaster"],
             }
         }
     }
@@ -660,9 +655,15 @@ class puppet::server::passenger {
     }
     file { "/var/lib/passenger/puppet/config.ru":
         ensure => present,
-        mode   => "0644",
-        owner  => "root",
-        group  => "root",
+        mode   => "0444",
+        owner  => $::operatingsystem ? {
+            "ubuntu" => "puppet",
+            default  => "root",
+        },
+        group  => $::operatingsystem ? {
+            "ubuntu" => "puppet",
+            default  => "root",
+        },
         source => "/usr/share/puppet/ext/rack/files/config.ru",
     }
 
diff --git a/puppet/templates/passenger-httpd.conf.erb b/puppet/templates/passenger-httpd.conf.erb
index f9903f0..7a209ab 100644
--- a/puppet/templates/passenger-httpd.conf.erb
+++ b/puppet/templates/passenger-httpd.conf.erb
@@ -43,8 +43,10 @@ Listen 8140
 
   # Passenger settings
   PassengerEnabled On
+<% unless @operatingsystem == 'Ubuntu' -%>
   PassengerUser puppet
   PassengerGroup puppet
+<% end -%>
   PassengerHighPerformance On
   PassengerMaxRequests 1000
   PassengerTempDir /var/run/passenger