diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 0e430a3ce..70d4c4b6a 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -145,7 +145,7 @@ rediskeyperms:
     - signing_policy: filebeat
     - public_key: /etc/pki/filebeat.key
 {% if grains.role == 'so-heavynode' %}
-    - CN: {{grains.id}}
+    - CN: {{grains.host}}
 {% else %}
     - CN: {{manager}}
 {% endif %}