diff --git a/etc/dm.openssl.conf.template b/etc/dm.openssl.conf.template
index d745ec3a6d2da50b0e47a7f92aecf1a9c79abd98..cae7ab087bd1a6b57decea747dbc3a89932ad5ab 100644
--- a/etc/dm.openssl.conf.template
+++ b/etc/dm.openssl.conf.template
@@ -144,14 +144,17 @@ countryName_max			= 2
 #localityName_default		= 
 
 0.organizationName		= Organization Name (eg, company)
-0.organizationName_default	= Argonne National Laboratory
+#0.organizationName_default = Argonne National Laboratory
+0.organizationName_default  = CA_ORG_NAME_0
 
 # we can do this but it is not needed normally :-)
 1.organizationName		= Second Organization Name (eg, company)
-1.organizationName_default	= Advanced Photon Source
+#1.organizationName_default  = Advanced Photon Source
+1.organizationName_default  = CA_ORG_NAME_1
 
 organizationalUnitName		= Organizational Unit Name (eg, section)
-organizationalUnitName_default	= AES/SSG
+#organizationalUnitName_default  = AES/SSG
+organizationalUnitName_default  = CA_UNIT_NAME
 
 commonName          = Common Name (eg, your name or your server\'s hostname)
 commonName_max          = 64