diff --git a/Jenkinsfile b/Jenkinsfile
index 4ee24a407..26f5c1886 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -113,9 +113,7 @@ pipeline {
       emailNotification()
     }
     always {
-      node(label: 'slave') {
         ircNotification()
-      }
     }
   }
 }
diff --git a/modules/ocf_mail/files/site_ocf/aliases b/modules/ocf_mail/files/site_ocf/aliases
index e31593b36..c60915205 100644
--- a/modules/ocf_mail/files/site_ocf/aliases
+++ b/modules/ocf_mail/files/site_ocf/aliases
@@ -8,6 +8,7 @@ postmaster: sm
 mailer-daemon: postmaster
 
 mirrors: root
+ocfenforcer: root
 ocfstats: root
 jenkins: root
 rancid: root
diff --git a/modules/ocf_printhost/manifests/cups.pp b/modules/ocf_printhost/manifests/cups.pp
index 46c0b4fed..62c8307a3 100644
--- a/modules/ocf_printhost/manifests/cups.pp
+++ b/modules/ocf_printhost/manifests/cups.pp
@@ -59,9 +59,16 @@
     }
   }
 
+  #Tea4cups saves files based on its owner
+  file { '/usr/lib/cups/backend/tea4cups':
+    ensure => 'file',
+    owner  => 'ocfenforcer',
+    mode   => '0700';
+  }
+
   mount { '/var/spool/cups':
     device  => 'tmpfs',
     fstype  => 'tmpfs',
-    options => 'mode=0710,gid=lp,noatime,nodev,noexec,nosuid';
+    options => 'uid=ocfenforcer,mode=0710,gid=lp,noatime,nodev,noexec,nosuid';
   }
 }
diff --git a/modules/ocf_printhost/manifests/enforcer.pp b/modules/ocf_printhost/manifests/enforcer.pp
index ef07c1271..1a634f6f7 100644
--- a/modules/ocf_printhost/manifests/enforcer.pp
+++ b/modules/ocf_printhost/manifests/enforcer.pp
@@ -1,4 +1,8 @@
 class ocf_printhost::enforcer {
+  user { 'ocfenforcer':
+    ensure => present,
+  }
+
   package { ['cups-tea4cups', 'mariadb-client']: }
 
   $mysql_password = assert_type(Pattern[/^[a-zA-Z0-9]*$/], lookup('ocfprinting::mysql::password'))
@@ -19,6 +23,7 @@
 
     '/opt/share/enforcer':
       ensure => directory,
+      owner  => 'ocfenforcer',
       mode   => '0500';
 
     '/opt/share/enforcer/enforcer.conf':
@@ -26,6 +31,8 @@
         'ocf_printhost/enforcer/enforcer.conf.erb',
         'ocf/broker/broker.conf.erb',
       ),
+      owner     => 'ocfenforcer',
+      mode      => '0500',
       show_diff => false;
   }
 
diff --git a/modules/ocf_printhost/templates/cups/tea4cups.conf.erb b/modules/ocf_printhost/templates/cups/tea4cups.conf.erb
index 989f7b235..35ebea867 100644
--- a/modules/ocf_printhost/templates/cups/tea4cups.conf.erb
+++ b/modules/ocf_printhost/templates/cups/tea4cups.conf.erb
@@ -8,5 +8,5 @@ keepfiles : no
 <% else %>
 keepfiles : yes
 <% end %>
-prehook_enforcer : /usr/local/bin/enforcer prehook
-posthook_enforcer : /usr/local/bin/enforcer posthook
+prehook_enforcer : sudo -Eu ocfenforcer /usr/local/bin/enforcer prehook
+posthook_enforcer : sudo -Eu ocfenforcer /usr/local/bin/enforcer posthook