diff --git a/roles/nagios_server/files/nagios/commands/httpd.cfg b/roles/nagios_server/files/nagios/commands/httpd.cfg
index 21843f4be9..81ce918485 100644
--- a/roles/nagios_server/files/nagios/commands/httpd.cfg
+++ b/roles/nagios_server/files/nagios/commands/httpd.cfg
@@ -66,6 +66,11 @@ define command{
        command_line    $USER1$/check_http --sni -I $HOSTADDRESS$ -H $ARG1$ -C $ARG2$
 }
 
+define command{
+       command_name    check_ssl_cert_otherport
+       command_line    $USER1$/check_http --sni -I $HOSTADDRESS$ -H $ARG1$ -C $ARG2$ -p $ARG3$
+}
+
 define command{
         command_name    check_website_publiclist_ssl
         command_line    $USER1$/check_http -w 40 -c 60 --ssl -I $HOSTADDRESS$ -H $ARG1$ -u $ARG2$ -s "$ARG3$"
diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg
index dc9cd1b6ee..705c250757 100644
--- a/roles/nagios_server/files/nagios/services/ssl.cfg
+++ b/roles/nagios_server/files/nagios/services/ssl.cfg
@@ -79,6 +79,13 @@ define service {
   use                   defaulttemplate
 }
 
+define service {
+  hostgroup_name        oneproxy
+  service_description   https-ocp4-prod-api-cert
+  check_command         check_ssl_cert_otherport!api.ocp.fedoraproject.org!25!6443
+  use                   defaulttemplate
+}
+
 # ocp4 cluster stg
 
 define service {
@@ -88,6 +95,13 @@ define service {
   use                   defaulttemplate
 }
 
+define service {
+  hostgroup_name        oneproxy-stg
+  service_description   https-ocp4-stg-api-cert
+  check_command         check_ssl_cert_otherport!api.ocp.stg.fedoraproject.org!25!6443
+  use                   defaulttemplate
+}
+
 define service {
   host_name             retrace.fedoraproject.org
   service_description   http-cert-retrace.fedoraproject.org