diff --git a/openair-cn/S6A/freediameter/make_certs.sh b/openair-cn/S6A/freediameter/make_certs.sh
index feb1340c76..97cc258b22 100755
--- a/openair-cn/S6A/freediameter/make_certs.sh
+++ b/openair-cn/S6A/freediameter/make_certs.sh
@@ -39,10 +39,10 @@ HOSTNAME=$(hostname -f)
 echo "Creating certificate for user '$HOSTNAME'"
 
 # CA self certificate
-openssl req  -new -batch -x509 -days 3650 -nodes -newkey rsa:1024 -out cacert.pem -keyout cakey.pem -subj /CN=pft/C=FR/ST=PACA/L=Aix/O=Eurecom/OU=CM
+openssl req  -new -batch -x509 -days 3650 -nodes -newkey rsa:1024 -out cacert.pem -keyout cakey.pem -subj /CN=eur/C=FR/ST=PACA/L=Aix/O=Eurecom/OU=CM
 
 openssl genrsa -out user.key.pem 1024
-openssl req -new -batch -out user.csr.pem -key user.key.pem -subj /CN=$HOSTNAME.pft/C=FR/ST=PACA/L=Aix/O=Eurecom/OU=CM
+openssl req -new -batch -out user.csr.pem -key user.key.pem -subj /CN=$HOSTNAME.eur/C=FR/ST=PACA/L=Aix/O=Eurecom/OU=CM
 openssl ca -cert cacert.pem -keyfile cakey.pem -in user.csr.pem -out user.cert.pem -outdir . -batch
 
 if [ ! -d /usr/local/etc/freeDiameter ]