diff --git a/openair-cn/OPENAIRHSS/conf/make_certs.sh b/openair-cn/OPENAIRHSS/conf/make_certs.sh
index b1c8fd5faa5b68ad4e029269f1c7d0bb763f658e..ebc5eeca24328e88580ba80db7eb3c81a07c6ccc 100755
--- a/openair-cn/OPENAIRHSS/conf/make_certs.sh
+++ b/openair-cn/OPENAIRHSS/conf/make_certs.sh
@@ -39,7 +39,10 @@ mkdir demoCA
 echo 01 > demoCA/serial
 touch demoCA/index.txt
 
-echo "Creating certificate for HSS"
+user=$(whoami)
+HOSTNAME=$(hostname -f)
+
+echo "Creating HSS certificate for user '$HOSTNAME'.'$REALM'"
 # 
 # # CA self certificate
 # openssl req  -new -batch -x509 -days 3650 -nodes -newkey rsa:1024 -out cacert.pem -keyout cakey.pem -subj /CN=test.fr/C=FR/ST=Biot/L=Aix/O=test.fr/OU=mobiles
@@ -55,7 +58,7 @@ openssl req  -new -batch -x509 -days 3650 -nodes -newkey rsa:1024 -out cacert.pe
 openssl genrsa -out hss.key.pem 1024
 
 # Generate a CSR (Certificate Signing Request) that will be self-signed
-openssl req -new -batch -out hss.csr.pem -key hss.key.pem -subj /CN=hss.$REALM/C=FR/ST=PACA/L=Aix/O=Eurecom/OU=CM
+openssl req -new -batch -out hss.csr.pem -key hss.key.pem -subj /CN=$HOSTNAME.$REALM/C=FR/ST=PACA/L=Aix/O=Eurecom/OU=CM
 
 # Certification authority
 openssl ca -cert cacert.pem -keyfile cakey.pem -in hss.csr.pem -out hss.cert.pem -outdir . -batch