diff --git a/site-modules/profile/manifests/icinga2/objects/common_checks.pp b/site-modules/profile/manifests/icinga2/objects/common_checks.pp
index e8e8c3e2..2a282281 100644
--- a/site-modules/profile/manifests/icinga2/objects/common_checks.pp
+++ b/site-modules/profile/manifests/icinga2/objects/common_checks.pp
@@ -1,122 +1,138 @@
 # Icinga2 common check definitions
 class profile::icinga2::objects::common_checks {
   $service_configuration = lookup('icinga2::service_configuration')
 
+  $target_file = '/etc/icinga2/zones.d/global-templates/services.conf'
+
   # Done locally on the master
   ::icinga2::object::service {'ping4':
     import        => ['generic-service'],
     apply         => true,
     check_command => 'ping4',
     assign        => ['host.address'],
-    target        => '/etc/icinga2/zones.d/global-templates/services.conf',
+    target        => $target_file,
   }
 
   ::icinga2::object::service {'linux-ssh':
     import        => ['generic-service'],
     apply         => true,
     check_command => 'ssh',
     assign        => ['host.vars.os == Linux'],
-    target        => '/etc/icinga2/zones.d/global-templates/services.conf',
+    target        => $target_file,
   }
 
   # Done remotely on the client: command_endpoint = host.name.
 
   each($service_configuration['load']) |$name, $vars| {
     if $name == 'default' {
       $assign = 'host.vars.os == Linux'
       $ignore = 'host.vars.noagent || host.vars.load'
     } else {
       $assign = "host.vars.os == Linux && host.vars.load == ${name}"
       $ignore = 'host.vars.noagent'
     }
 
     ::icinga2::object::service {"linux_load_${name}":
       import           => ['generic-service'],
       service_name     => 'load',
       apply            => true,
       check_command    => 'load',
       command_endpoint => 'host.name',
       assign           => [$assign],
       ignore           => [$ignore],
-      target           => '/etc/icinga2/zones.d/global-templates/services.conf',
+      target           => $target_file,
       vars             => $vars,
     }
 
   }
 
   ::icinga2::object::service {'linux_disks':
     import           => ['generic-service'],
     apply            => 'disk_name => config in host.vars.disks',
     check_command    => 'disk',
     command_endpoint => 'host.name',
     vars             => 'vars + config',
     assign           => ['host.vars.os == Linux'],
     ignore           => ['host.vars.noagent'],
-    target           => '/etc/icinga2/zones.d/global-templates/services.conf',
+    target           => $target_file,
   }
 
   ::icinga2::object::service {'apt':
     import           => ['generic-service'],
     apply            => true,
     check_command    => 'apt',
     command_endpoint => 'host.name',
     check_interval   => '3h',
     vars             => {
       apt_timeout => '120',
       apt_only_critical => 'true',
     },
     assign           => ['host.vars.os == Linux'],
     ignore           => ['host.vars.noagent'],
-    target           => '/etc/icinga2/zones.d/global-templates/services.conf',
+    target           => $target_file,
   }
 
   ::icinga2::object::service {'ntp':
     import           => ['generic-service'],
     apply            => true,
     check_command    => 'ntp_peer',
     command_endpoint => 'host.name',
     vars             => {
       ntp_address => 'localhost',
     },
     assign           => ['host.vars.os == Linux'],
     ignore           => ['host.vars.noagent'],
-    target           => '/etc/icinga2/zones.d/global-templates/services.conf',
+    target           => $target_file,
   }
 
   ::icinga2::object::service {'journalbeat':
     import           => ['generic-service'],
     apply            => true,
     check_command    => 'check_journal',
     command_endpoint => 'host.name',
     assign           => ['host.vars.os == Linux'],
     ignore           => ['-:"check_journal" !in host.vars.plugins', 'host.vars.noagent'],
-    target           => '/etc/icinga2/zones.d/global-templates/services.conf',
+    target           => $target_file,
   }
 
   ::icinga2::object::service {'puppet_agent':
     import           => ['generic-service'],
     apply            => true,
     check_command    => 'file_age',
     command_endpoint => 'host.name',
     vars             => {
       file_age_file          => '/var/lib/puppet/state/agent_disabled.lock',
       file_age_warning_time  => '14400', # in seconds, warning after 4h
       file_age_critical_time => '86400', # in seconds, critical after 24h
       file_age_ignoremissing => 'true',
     },
     assign           => ['host.vars.os == Linux'],
     ignore           => ['host.vars.noagent'],
-    target           => '/etc/icinga2/zones.d/global-templates/services.conf',
+    target           => $target_file,
+  }
+
+  ::icinga2::object::service {'check_postfix':
+    import           => ['generic-service'],
+    apply            => true,
+    name             => "Check postfix service",
+    check_command    => "check_systemd",
+    command_endpoint => 'host.name',
+    assign           => ['host.vars.os == Linux'],
+    vars             => {
+      check_systemd_unit => 'postfix@-.service',
+    },
+    ignore           => ['host.vars.noagent'],
+    target           => $target_file,
   }
 
   ::icinga2::object::service {'logstash_errors':
     import           => ['generic-service'],
     apply            => true,
     check_command    => 'check_logstash_errors.sh',
     command_endpoint => 'host.name',
     assign           => ['check_logstash_errors.sh in host.vars.plugins'],
     ignore           => ['host.vars.noagent'],
-    target           => '/etc/icinga2/zones.d/global-templates/services.conf',
+    target           => $target_file,
   }
 
 }