diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 7c3b5a52e86..5b7594419d4 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -43,6 +43,7 @@ import javax.crypto.SecretKey;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.utils.nio.Link;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
@@ -616,7 +617,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
 
         if (null != confFile) {
             confPath = confFile.getParent();
-            keystorePath = confPath + "/cloud.keystore";
+            keystorePath = confPath + Link.keystoreFile;
             keystoreFile = new File(keystorePath);
         }
 
diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java
index 39ca1d8bee3..e0b4d7e03e7 100755
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -65,6 +65,7 @@ public class Link {
     private boolean _gotFollowingPacket;
 
     private SSLEngine _sslEngine;
+    public static String keystoreFile = "/cloudmanagementserver.keystore";
 
     public Link(InetSocketAddress addr, NioConnection connection) {
         _addr = addr;
@@ -417,7 +418,7 @@ public class Link {
             final Properties dbProps = DbProperties.getDbProperties();
             char[] passphrase = dbProps.getProperty("db.cloud.keyStorePassphrase").toCharArray();
             String confPath = confFile.getParent();
-            String keystorePath = confPath + "/cloud.keystore";
+            String keystorePath = confPath + keystoreFile;
             if (new File(keystorePath).exists()) {
                 stream = new FileInputStream(keystorePath);
             } else {