diff --git a/daemon/dtls.c b/daemon/dtls.c
index 9b7b5a7b1..d6cf626e3 100644
--- a/daemon/dtls.c
+++ b/daemon/dtls.c
@@ -241,8 +241,10 @@ static int cert_init(void) {
 
 	/* common name */
 
+	const char *cn = rtpe_config.software_id ?: "rtpengine";
+	size_t cn_len = MIN(strlen(cn), 63);
 	if (!X509_NAME_add_entry_by_NID(name, NID_commonName, MBSTRING_UTF8,
-				(unsigned char *) "rtpengine", -1, -1, 0))
+				(unsigned char *) cn, cn_len, -1, 0))
 		goto err;
 
 	if (!X509_set_subject_name(x509, name))