diff --git a/ca.go b/ca.go
index 29cc238..54ae09d 100644
--- a/ca.go
+++ b/ca.go
@@ -477,7 +477,7 @@ func issueSingleCertificate(def CertificateDefinition) error {
 	}
 
 	// Add default dns SAN for server/server-only if none specified
-	if (def.Type == "server" || def.Type == "server-only") && len(def.SAN) == 0 {
+	if strings.Contains(def.Type, "server") && len(def.SAN) == 0 {
 		def.SAN = append(def.SAN, "dns:"+def.Subject)
 	}