diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
index 9c6f27412b8192d0126fa5e43f34e9b0fce94056..9cc9d6b23921cae269a4a8bd59747e8e7a5ff1b7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
@@ -55,7 +55,7 @@ public class DssServiceRpcFactory implements IRpcServiceFactory
         Class<IRpcServiceNameServer> clazz = IRpcServiceNameServer.class;
         if (getServerCertificateFromServer)
         {
-            new SslCertificateHelper(nameServerURL, getConfigDirectory(), "dss").setUpKeyStore();
+            new SslCertificateHelper(nameServerURL, getKeystoreFile(), "dss").setUpKeyStore();
         }
 
         IRpcServiceNameServer nameServer =
@@ -71,13 +71,18 @@ public class DssServiceRpcFactory implements IRpcServiceFactory
         String serviceURL = serverURL + ifaceVersion.getUrlSuffix();
         if (getServerCertificateFromServer)
         {
-            new SslCertificateHelper(serviceURL, getConfigDirectory(), "dss").setUpKeyStore();
+            new SslCertificateHelper(serviceURL, getKeystoreFile(), "dss").setUpKeyStore();
         }
 
         return new ServiceProxyBuilder<T>(serviceURL, ifaceClazz, SERVER_TIMEOUT_MIN, 1)
                 .getServiceInterface();
     }
 
+    private File getKeystoreFile()
+    {
+        return new File(getConfigDirectory(), "keystore");
+    }
+    
     private File getConfigDirectory()
     {
         String homeDir = System.getProperty("dss.root");