diff --git a/jans-orm/cdi/src/main/java/io/jans/orm/service/PersistanceFactoryService.java b/jans-orm/cdi/src/main/java/io/jans/orm/service/PersistanceFactoryService.java
index 2dde3c65681..cbd637e2d54 100644
--- a/jans-orm/cdi/src/main/java/io/jans/orm/service/PersistanceFactoryService.java
+++ b/jans-orm/cdi/src/main/java/io/jans/orm/service/PersistanceFactoryService.java
@@ -187,7 +187,7 @@ private void replaceWithUpperCasedSystemValues(PropertiesConfiguration propertie
 		Iterator<?> keys = propertiesConfiguration.getKeys();
         while (keys.hasNext()) {
             String key = (String) keys.next();
-            String envKey = key.toUpperCase().replaceAll(".", "_").replaceAll("-", "_");
+            String envKey = key.toUpperCase().replaceAll("\\.", "\\_").replaceAll("\\-", "\\_");
 			if (System.getenv(envKey) != null) {
 				propertiesConfiguration.setProperty(key, System.getenv(envKey));
 			}