diff --git a/roles/pagure/fedmsg/templates/ssl.py.j2 b/roles/pagure/fedmsg/templates/ssl.py.j2
index 22c9e44ee3..4db87f149c 100644
--- a/roles/pagure/fedmsg/templates/ssl.py.j2
+++ b/roles/pagure/fedmsg/templates/ssl.py.j2
@@ -9,8 +9,8 @@ config = dict(
     crl_cache_expiry=86400,  # Daily
 
     certnames=dict([
-        ("shell.pagure01", "shell-{{inventory_hostname}}"),
-        ("pagure.pagure01", "pagure-{{inventory_hostname}}"),
+        ("shell.{{inventory_hostname_short}}", "shell-{{inventory_hostname}}"),
+        ("pagure.{{inventory_hostname_short}}", "pagure-{{inventory_hostname}}"),
     ]),
 )