diff --git a/kie-server-parent/kie-server-services/kie-server-services-jbpm/src/main/java/org/kie/server/services/jbpm/JbpmKieServerExtension.java b/kie-server-parent/kie-server-services/kie-server-services-jbpm/src/main/java/org/kie/server/services/jbpm/JbpmKieServerExtension.java
index bb72baa7fd..0d2d1a94f9 100644
--- a/kie-server-parent/kie-server-services/kie-server-services-jbpm/src/main/java/org/kie/server/services/jbpm/JbpmKieServerExtension.java
+++ b/kie-server-parent/kie-server-services/kie-server-services-jbpm/src/main/java/org/kie/server/services/jbpm/JbpmKieServerExtension.java
@@ -661,6 +661,11 @@ protected Map<String, String> getPersistenceProperties(KieServerConfig config) {
         persistenceProperties.put("hibernate.transaction.jta.platform", config.getConfigItemValue(KieServerConstants.CFG_PERSISTANCE_TM, "org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform"));
         persistenceProperties.put("javax.persistence.jtaDataSource", config.getConfigItemValue(KieServerConstants.CFG_PERSISTANCE_DS, "java:jboss/datasources/ExampleDS"));
 
+        System.getProperties().stringPropertyNames()
+                .stream()
+                .filter(PersistenceUnitInfoLoader::isValidPersistenceKey)
+                .forEach(name -> persistenceProperties.put(name, System.getProperty(name)));
+
         return persistenceProperties;
     }
 
diff --git a/kie-server-parent/kie-server-services/kie-server-services-jbpm/src/main/java/org/kie/server/services/jbpm/jpa/PersistenceUnitInfoLoader.java b/kie-server-parent/kie-server-services/kie-server-services-jbpm/src/main/java/org/kie/server/services/jbpm/jpa/PersistenceUnitInfoLoader.java
index c0217026e9..b3ad7824d5 100644
--- a/kie-server-parent/kie-server-services/kie-server-services-jbpm/src/main/java/org/kie/server/services/jbpm/jpa/PersistenceUnitInfoLoader.java
+++ b/kie-server-parent/kie-server-services/kie-server-services-jbpm/src/main/java/org/kie/server/services/jbpm/jpa/PersistenceUnitInfoLoader.java
@@ -149,4 +149,11 @@ public static PersistenceUnitInfo load(InputStream inputStream, InitialContext i
         return persistenceUnitInfo;
     }
 
+    public static Boolean isValidPersistenceKey(String propertyName) {
+        if (propertyName.startsWith("hibernate.") || propertyName.startsWith("javax.persistence")) {
+            return true;
+        }
+
+        return false;
+    }
 }