diff --git a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
index a9a87dc4..5ca7cf27 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
@@ -248,6 +248,12 @@ class eid::nagios_monitor {
       description    => 'Check Docker Containers',
       contact_groups => ['alerts']
   }
+  nagioscfg::service {'check_submission_cert':
+      hostgroup_name => ['eid::relay'],
+      check_command  => 'check_ssl_cert_altname_protocol!14!7!587!relay.swedenconnect.se!smtp',
+      description    => 'Check certificate on submission port',
+      contact_groups => ['alerts']
+  }  
   nagioscfg::command {'check_ssl_cert_3':
       command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -A -H '\$HOSTNAME\$' -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
   }
@@ -265,6 +271,9 @@ class eid::nagios_monitor {
   nagioscfg::command {'check_ssl_cert_altname':
       command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -n '\$ARG4\$' --altnames -H '\$HOSTNAME\$' --ignore-ocsp -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
   }
+  nagioscfg::command {'check_ssl_cert_altname_protocol':
+      command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -n '\$ARG4\$' --altnames -H '\$HOSTNAME\$' --ignore-ocsp -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$' -P '\$ARG5\$'"
+  }
   nagioscfg::host {'prid.sveidas.se': sort_alphabetically => true}
   nagioscfg::service {'check_public_ssl_cert_altname':
       host_name      => ['prid.sveidas.se'],