diff --git a/salt/states/rmt/files/rmt-server.cnf.jinja b/salt/states/rmt/files/rmt-server.cnf.jinja
index 2b17cc2..dec3d9c 100644
--- a/salt/states/rmt/files/rmt-server.cnf.jinja
+++ b/salt/states/rmt/files/rmt-server.cnf.jinja
@@ -22,11 +22,10 @@ keyUsage                       = digitalSignature, keyEncipherment, keyAgreement
 subjectAltName                 = @alt_names
 
 [req_distinguished_name]
-CN                             = localhost
+CN                             = rmt.{{ pillar['network']['domain'] }}
 
 [alt_names]
-DNS.0                          = localhost
-DNS.1                          = rmt.{{ pillar['network']['domain'] }}
+DNS.0                          = rmt.{{ pillar['network']['domain'] }}
 IP.0                           = {{ pillar['network']['ip'] }}
 {% for vlan in pillar['network']['vlan'] -%}
 IP.{{ loop.index }}                           = {{ vlan['address'] }}