diff --git a/roles/kubernetes/secrets/files/make-ssl.sh b/roles/kubernetes/secrets/files/make-ssl.sh
index 2a4b930ea2b1f2b9b0e9ced51991b62ea1c3c816..f8c8d129c7af650be4e0e699f8880dae92da88e1 100755
--- a/roles/kubernetes/secrets/files/make-ssl.sh
+++ b/roles/kubernetes/secrets/files/make-ssl.sh
@@ -125,7 +125,7 @@ if [ -n "$MASTERS" ]; then
     gen_key_and_cert_front_proxy "front-proxy-client" "/CN=front-proxy-client"
 
     for host in $MASTERS; do
-        cn="${host%%.*}"
+        cn="${host}"
         # admin
         gen_key_and_cert "admin-${host}" "/CN=kube-admin-${cn}/O=system:masters"
     done
@@ -134,7 +134,7 @@ fi
 # Nodes
 if [ -n "$HOSTS" ]; then
     for host in $HOSTS; do
-        cn="${host%%.*}"
+        cn="${host}"
         gen_key_and_cert "node-${host}" "/CN=system:node:${cn,,}/O=system:nodes"
     done
 fi