diff --git a/cert_scripts/create_certificates.sh b/cert_scripts/create_certificates.sh
index b51f308e..79e26ae6 100755
--- a/cert_scripts/create_certificates.sh
+++ b/cert_scripts/create_certificates.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 
+hn=$(hostname)
 howmany=10
 cert_life=365
-subject="/C=CA/ST=British Columbia/L=Vancouver/O=Arilia Wireless/OU=Engineering/CN=ucentral/emailAddress=support@example.com"
+subject="/C=CA/ST=British Columbia/L=Vancouver/O=Arilia Wireless/OU=Engineering/CN=$hn/emailAddress=support@example.com"
 
 openssl genrsa -out server-key.pem 2048
 openssl req -new -key server-key.pem -subj "$subject" -out server.csr
@@ -11,4 +12,4 @@ openssl x509 -req -days $cert_life -in server.csr -signkey server-key.pem -out s
 for i in `eval echo {1..$howmany}`
 do
   openssl x509 -signkey server-key.pem -in server.csr -req -days $cert_life -out dev-$i-cert.pem
-done
\ No newline at end of file
+done