diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg
index 9bce593099..dc9cd1b6ee 100644
--- a/roles/nagios_server/files/nagios/services/ssl.cfg
+++ b/roles/nagios_server/files/nagios/services/ssl.cfg
@@ -87,3 +87,10 @@ define service {
   check_command         check_ssl_cert!console-openshift-console.apps.ocp.stg.fedoraproject.org!25
   use                   defaulttemplate
 }
+
+define service {
+  host_name             retrace.fedoraproject.org
+  service_description   http-cert-retrace.fedoraproject.org
+  check_command         check_ssl_cert!retrace.fedoraproject.org!25
+  use                   defaulttemplate
+}
diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
index df6471c6d7..7bf8ec7025 100644
--- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -343,11 +343,3 @@ define service {
   max_check_attempts    8
   use                   websitetemplate
 }
-
-define service {
-  host_name             retrace.fedoraproject.org
-  service_description   http-cert-retrace.fedoraproject.org
-  check_command         check_website_ssl!retrace.fedoraproject.org!/ABRT/
-  max_check_attempts    8
-  use                   websitetemplate
-}