diff --git a/kie-aries-blueprint/src/test/resources/org/kie/aries/blueprint/environment.xml b/kie-aries-blueprint/src/test/resources/org/kie/aries/blueprint/environment.xml
index ed0ad4195f..5feb5def43 100644
--- a/kie-aries-blueprint/src/test/resources/org/kie/aries/blueprint/environment.xml
+++ b/kie-aries-blueprint/src/test/resources/org/kie/aries/blueprint/environment.xml
@@ -10,7 +10,7 @@
 
   <bean id="ds" class="org.kie.aries.blueprint.mocks.MockDataSource">
     <property name="driverClassName" value="org.h2.Driver"/>
-    <property name="url" value="jdbc:h2:tcp://localhost/DroolsFlow;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE"/>
+    <property name="url" value="jdbc:h2:tcp://localhost/DroolsFlow;MODE=LEGACY;NON_KEYWORDS=VALUE"/>
     <property name="username" value="sa"/>
     <property name="password" value=""/>
   </bean>
diff --git a/kie-osgi/kie-karaf-itests/pom.xml b/kie-osgi/kie-karaf-itests/pom.xml
index 0c2ac4aa67..fa1aec4c70 100644
--- a/kie-osgi/kie-karaf-itests/pom.xml
+++ b/kie-osgi/kie-karaf-itests/pom.xml
@@ -30,8 +30,8 @@
     <maven.jdbc.driver.jar/>
     <maven.jdbc.username>sa</maven.jdbc.username>
     <maven.jdbc.password>sa</maven.jdbc.password>
-    <maven.jdbc.url>jdbc:h2:mem:test_mem;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE</maven.jdbc.url>
-    <maven.jdbc.tcp.url>jdbc:h2:tcp://localhost/${project.basedir}/target/kie-karaf-itests;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE</maven.jdbc.tcp.url>
+    <maven.jdbc.url>jdbc:h2:mem:test_mem;MODE=LEGACY;NON_KEYWORDS=VALUE</maven.jdbc.url>
+    <maven.jdbc.tcp.url>jdbc:h2:tcp://localhost/${project.basedir}/target/kie-karaf-itests;MODE=LEGACY;NON_KEYWORDS=VALUE</maven.jdbc.tcp.url>
     <maven.jdbc.schema>public</maven.jdbc.schema>
   </properties>
 
diff --git a/kie-osgi/kie-karaf-itests/src/test/java/org/kie/karaf/itest/KieSpringjBPMPersistenceKarafIntegrationTest.java b/kie-osgi/kie-karaf-itests/src/test/java/org/kie/karaf/itest/KieSpringjBPMPersistenceKarafIntegrationTest.java
index 4bea2c9262..d0da413152 100644
--- a/kie-osgi/kie-karaf-itests/src/test/java/org/kie/karaf/itest/KieSpringjBPMPersistenceKarafIntegrationTest.java
+++ b/kie-osgi/kie-karaf-itests/src/test/java/org/kie/karaf/itest/KieSpringjBPMPersistenceKarafIntegrationTest.java
@@ -195,7 +195,7 @@ public Object call() {
     public static Server startH2Server() {
         try {
             // start h2 in memory database
-            Server server = Server.createTcpServer(new String[0]);
+            Server server = Server.createTcpServer(new String[]{"-ifNotExists"});
             server.start();
             return server;
         } catch (Throwable t) {
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
index 01e3454a27..5aeedb8613 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
@@ -46,7 +46,7 @@ protected void before() throws Throwable {
             Properties driverProperties = new Properties();
             driverProperties.setProperty("user", "sa");
             driverProperties.setProperty("password", "");
-            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE");
+            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE");
             driverProperties.setProperty("className", "org.h2.jdbcx.JdbcDataSource");
             driverProperties.setProperty("driverClassName", "org.h2.Driver");
 
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
index c22f22df95..58995538d2 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
@@ -49,7 +49,7 @@ protected void before() throws Throwable {
             Properties driverProperties = new Properties();
             driverProperties.setProperty("user", "sa");
             driverProperties.setProperty("password", "");
-            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE");
+            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE");
             driverProperties.setProperty("className", "org.h2.jdbcx.JdbcDataSource");
             driverProperties.setProperty("driverClassName", "org.h2.Driver");
 
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-policy/src/test/java/org/kie/server/integrationtests/policy/DBExternalResource.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-policy/src/test/java/org/kie/server/integrationtests/policy/DBExternalResource.java
index 2407bb7ef0..ba4e747d07 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-policy/src/test/java/org/kie/server/integrationtests/policy/DBExternalResource.java
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-policy/src/test/java/org/kie/server/integrationtests/policy/DBExternalResource.java
@@ -42,7 +42,7 @@ protected void before() throws Throwable {
             Properties driverProperties = new Properties();
             driverProperties.setProperty("user", "sa");
             driverProperties.setProperty("password", "");
-            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE");
+            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE");
             driverProperties.setProperty("className", "org.h2.jdbcx.JdbcDataSource");
             driverProperties.setProperty("driverClassName", "org.h2.Driver");
 
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-router/src/test/java/org/kie/server/integrationtests/router/DBExternalResource.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-router/src/test/java/org/kie/server/integrationtests/router/DBExternalResource.java
index 0e3121349f..b538e5a474 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-router/src/test/java/org/kie/server/integrationtests/router/DBExternalResource.java
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-router/src/test/java/org/kie/server/integrationtests/router/DBExternalResource.java
@@ -46,7 +46,7 @@ protected void before() throws Throwable {
             Properties driverProperties = new Properties();
             driverProperties.setProperty("user", "sa");
             driverProperties.setProperty("password", "");
-            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE");
+            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE");
             driverProperties.setProperty("className", "org.h2.jdbcx.JdbcDataSource");
             driverProperties.setProperty("driverClassName", "org.h2.Driver");
 
diff --git a/kie-server-parent/kie-server-tests/pom.xml b/kie-server-parent/kie-server-tests/pom.xml
index aa9118c1f8..5c3bd02d9b 100644
--- a/kie-server-parent/kie-server-tests/pom.xml
+++ b/kie-server-parent/kie-server-tests/pom.xml
@@ -59,7 +59,7 @@
     <!-- Kie server datasource configuration. -->
     <!--  <org.kie.server.persistence.ds/> Defined in container profiles.-->
     <org.kie.server.persistence.dialect>org.hibernate.dialect.H2Dialect</org.kie.server.persistence.dialect>
-    <org.kie.server.datasource.connection.url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE</org.kie.server.datasource.connection.url>
+    <org.kie.server.datasource.connection.url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=LEGACY;NON_KEYWORDS=VALUE</org.kie.server.datasource.connection.url>
     <org.kie.server.datasource.username>sa</org.kie.server.datasource.username>
     <org.kie.server.datasource.password>sa</org.kie.server.datasource.password>
     <org.kie.server.datasource.driver.class>org.h2.jdbcx.JdbcDataSource</org.kie.server.datasource.driver.class>
@@ -660,7 +660,7 @@
                       <parameters>
                         <user>sa</user>
                         <password>sa</password>
-                        <url>jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE</url>
+                        <url>jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;MODE=LEGACY;NON_KEYWORDS=VALUE</url>
                         <description>H2 Data Source</description>
                         <loginTimeout>0</loginTimeout>
                         <testOnBorrow>false</testOnBorrow>
@@ -1182,7 +1182,7 @@
                     <!-- Datasource -->
                     <cargo.datasource.datasource.h2>
                       cargo.datasource.driver=org.h2.Driver|
-                      cargo.datasource.url=jdbc:h2:mem:test-db;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE|
+                      cargo.datasource.url=jdbc:h2:mem:test-db;MODE=LEGACY;NON_KEYWORDS=VALUE|
                       cargo.datasource.jndi=jdbc/jbpm|
                       cargo.datasource.username=sa|
                       cargo.datasource.password=|
@@ -1318,7 +1318,7 @@
                     <!-- Datasource -->
                     <cargo.datasource.datasource.h2>
                       cargo.datasource.driver=org.h2.jdbcx.JdbcDataSource|
-                      cargo.datasource.url=jdbc:h2:mem:test-db;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE|
+                      cargo.datasource.url=jdbc:h2:mem:test-db;MODE=LEGACY;NON_KEYWORDS=VALUE|
                       cargo.datasource.jndi=jdbc/jbpm|
                       cargo.datasource.username=sa|
                       cargo.datasource.password=|
diff --git a/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/java/org/kie/server/spring/boot/autoconfiguration/audit/replication/ApplicationSender.java b/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/java/org/kie/server/spring/boot/autoconfiguration/audit/replication/ApplicationSender.java
index 8a48dfc015..70cc72e9bc 100644
--- a/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/java/org/kie/server/spring/boot/autoconfiguration/audit/replication/ApplicationSender.java
+++ b/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/java/org/kie/server/spring/boot/autoconfiguration/audit/replication/ApplicationSender.java
@@ -46,7 +46,7 @@ public DataSource secondaryDataSource() {
     @ConditionalOnMissingBean(name = "auditEntityManagerFactory")
     @ConditionalOnProperty(name = "kieserver.audit-replication.consumer", havingValue = "true")
     public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("datasource-replica") DataSource dataSource, JpaProperties jpaProperties) {
-        jpaProperties.getProperties().put("url", "jdbc:h2:mem:kieserver-replication;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE");
+        jpaProperties.getProperties().put("url", "jdbc:h2:mem:kieserver-replication;MODE=LEGACY;NON_KEYWORDS=VALUE");
         return EntityManagerFactoryHelper.create(applicationContext,
                                                  dataSource,
                                                  jpaProperties,
diff --git a/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/resources/application-integrationtest.properties b/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/resources/application-integrationtest.properties
index 3bf45e1a90..9696f241ba 100644
--- a/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/resources/application-integrationtest.properties
+++ b/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/resources/application-integrationtest.properties
@@ -41,11 +41,11 @@ jbpm.executor.enabled=false
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:mem:kieserver;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:mem:kieserver;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.h2.console.enabled=true
 
-spring.datasource.second.url=jdbc:h2:mem:kieserver-replica;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.second.url=jdbc:h2:mem:kieserver-replica;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.second.username=sa
 spring.datasource.second.password=sa
 spring.datasource.second.driverClassName=org.h2.Driver
diff --git a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/main/resources/application.properties
index 633a0ef3da..19333feaa9 100644
--- a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/main/resources/application.properties
@@ -8,7 +8,7 @@ server.port=8090
 spring.datasource.name=jbpm
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
diff --git a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/application-quartz.properties b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/application-quartz.properties
index 183ac81af8..433c2e80b6 100644
--- a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/application-quartz.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/application-quartz.properties
@@ -16,7 +16,7 @@ jbpm.quartz.configuration=quartz-db.properties
 quartz.datasource.name=quartz
 quartz.datasource.username=sa
 quartz.datasource.password=sa
-quartz.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+quartz.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 quartz.datasource.driver-class-name=org.h2.Driver
 
 quartz.datasource.dbcp2.maxTotal=15
diff --git a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/quartz_tables_h2.sql b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/quartz_tables_h2.sql
index abb38d5b65..e7d0e07f50 100644
--- a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/quartz_tables_h2.sql
+++ b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/quartz_tables_h2.sql
@@ -8,18 +8,7 @@
 -- In your Quartz properties file, you'll need to set 
 -- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
 
-DROP TABLE IF EXISTS QRTZ_CALENDARS;
-DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
-DROP TABLE IF EXISTS QRTZ_LOCKS;
-DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
-DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGER_LISTENERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGERS;
+DROP ALL OBJECTS;
 
 CREATE TABLE QRTZ_CALENDARS (
   SCHED_NAME VARCHAR(120) NOT NULL,
diff --git a/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/src/main/resources/application.properties
index 821122d774..3f26a0fe9c 100644
--- a/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/src/main/resources/application.properties
@@ -29,7 +29,7 @@ kieserver.scenariosimulation.enabled=true
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-integ-tests-sample/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-integ-tests-sample/src/main/resources/application.properties
index 4daefb6b8d..e32e38f265 100644
--- a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-integ-tests-sample/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-integ-tests-sample/src/main/resources/application.properties
@@ -31,7 +31,7 @@ kieserver.scenariosimulation.enabled=true
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/src/main/resources/application.properties
index 2b673258f8..0bde585ff6 100644
--- a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/src/main/resources/application.properties
@@ -30,7 +30,7 @@ kieserver.scenariosimulation.enabled=true
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/main/resources/application.properties
index 2b673258f8..0bde585ff6 100644
--- a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/main/resources/application.properties
@@ -30,7 +30,7 @@ kieserver.scenariosimulation.enabled=true
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/test/resources/application-kafka.properties b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/test/resources/application-kafka.properties
index 3036a9b75b..2f691d7086 100644
--- a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/test/resources/application-kafka.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/test/resources/application-kafka.properties
@@ -13,5 +13,5 @@ spring.jpa.properties.hibernate.show_sql=false
 
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-kafka-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-kafka-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
diff --git a/kie-spring-boot/kie-spring-boot-starters/jbpm-spring-boot-starter-basic/README.md b/kie-spring-boot/kie-spring-boot-starters/jbpm-spring-boot-starter-basic/README.md
index 50a4184b9d..ff55f43ce0 100644
--- a/kie-spring-boot/kie-spring-boot-starters/jbpm-spring-boot-starter-basic/README.md
+++ b/kie-spring-boot/kie-spring-boot-starters/jbpm-spring-boot-starter-basic/README.md
@@ -40,7 +40,7 @@ Mandatory configuration that must be placed in application.properties is related
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.type=org.apache.tomcat.jdbc.pool.XADataSource
 
diff --git a/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/README.md b/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/README.md
index 46f40e407b..e16bbe8b49 100644
--- a/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/README.md
+++ b/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/README.md
@@ -41,7 +41,7 @@ Mandatory configuration that must be placed in application.properties is related
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.type=org.apache.tomcat.jdbc.pool.XADataSource
 
diff --git a/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/README.md b/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/README.md
index a00d11b323..f389e8d217 100644
--- a/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/README.md
+++ b/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/README.md
@@ -46,7 +46,7 @@ Mandatory configuration that must be placed in application.properties is related
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;OLD_INFORMATION_SCHEMA=TRUE
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.type=org.apache.tomcat.jdbc.pool.XADataSource