diff --git a/distro/src/notice.txt b/distro/src/notice.txt
index 4bcd443a5c8..958d26a0006 100644
--- a/distro/src/notice.txt
+++ b/distro/src/notice.txt
@@ -100,7 +100,6 @@ org.apache.geronimo.bundles     json                        20090211_1      The
 org.apache.groovy               groovy                      4.0.17          The Apache Software License, Version 2.0
 org.apache.groovy               groovy-jsr223               4.0.17          The Apache Software License, Version 2.0
 org.eclipse.angus               angus-mail                  2.0.2           EDL 1.0 / EPL 2.0
-org.liquibase                   liquibase-core              4.5.0           Apache License, Version 2.0
 org.mybatis                     mybatis                     3.5.13          The Apache Software License, Version 2.0
 org.mybatis                     mybatis-spring              3.0.3           The Apache Software License, Version 2.0
 org.mvel                        mvel2                       2.2.6.Final     The Apache Software License, Version 2.0
diff --git a/modules/flowable-app-engine-api/pom.xml b/modules/flowable-app-engine-api/pom.xml
index 2a5ecb83fb4..c7db8397465 100644
--- a/modules/flowable-app-engine-api/pom.xml
+++ b/modules/flowable-app-engine-api/pom.xml
@@ -25,6 +25,10 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-engine-common-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-engine-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.flowable</groupId>
             <artifactId>flowable-variable-service-api</artifactId>
diff --git a/modules/flowable-app-engine-api/src/main/java/org/flowable/app/api/AppManagementService.java b/modules/flowable-app-engine-api/src/main/java/org/flowable/app/api/AppManagementService.java
index 39ed6b69b19..71a4f7d114c 100644
--- a/modules/flowable-app-engine-api/src/main/java/org/flowable/app/api/AppManagementService.java
+++ b/modules/flowable-app-engine-api/src/main/java/org/flowable/app/api/AppManagementService.java
@@ -15,6 +15,8 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.flowable.common.engine.api.lock.LockManager;
+
 /**
  * @author Tijs Rademakers
  */
@@ -30,4 +32,15 @@ public interface AppManagementService {
      */
     Collection<String> getTableNames();
 
+    /**
+     * Acquire a lock manager for the requested lock.
+     * This is a stateless call, this means that every time a lock manager
+     * is requested a new one would be created. Make sure that you release the lock
+     * once you are done.
+     *
+     * @param lockName the name of the lock that is being requested
+     *
+     * @return the lock manager for the given lock
+     */
+    LockManager getLockManager(String lockName);
 }
diff --git a/modules/flowable-app-engine-rest/src/test/java/org/flowable/app/rest/service/BaseSpringRestTestCase.java b/modules/flowable-app-engine-rest/src/test/java/org/flowable/app/rest/service/BaseSpringRestTestCase.java
index 3a8f416a9c0..0d458a24653 100644
--- a/modules/flowable-app-engine-rest/src/test/java/org/flowable/app/rest/service/BaseSpringRestTestCase.java
+++ b/modules/flowable-app-engine-rest/src/test/java/org/flowable/app/rest/service/BaseSpringRestTestCase.java
@@ -273,15 +273,7 @@ protected void assertAndEnsureCleanDb() throws Throwable {
                 appEngineConfiguration,
                 TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK,
                 exception == null,
-                new Command<Void>() {
-                    @Override
-                    public Void execute(CommandContext commandContext) {
-                        SchemaManager schemaManager = CommandContextUtil.getAppEngineConfiguration(commandContext).getSchemaManager();
-                        schemaManager.schemaDrop();
-                        schemaManager.schemaCreate();
-                        return null;
-                    }
-                }
+                appEngineConfiguration.getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-app-engine-spring/src/main/java/org/flowable/app/spring/SpringAppEngineConfiguration.java b/modules/flowable-app-engine-spring/src/main/java/org/flowable/app/spring/SpringAppEngineConfiguration.java
index bd51301366f..8c04fcb6c70 100644
--- a/modules/flowable-app-engine-spring/src/main/java/org/flowable/app/spring/SpringAppEngineConfiguration.java
+++ b/modules/flowable-app-engine-spring/src/main/java/org/flowable/app/spring/SpringAppEngineConfiguration.java
@@ -62,8 +62,8 @@ public SpringAppEngineConfiguration() {
     }
 
     @Override
-    public AppEngine buildAppEngine() {
-        AppEngine appEngine = super.buildAppEngine();
+    public AppEngine buildEngine() {
+        AppEngine appEngine = super.buildEngine();
         AppEngines.setInitialized(true);
         enginesBuild.add(appEngine.getName());
         return appEngine;
diff --git a/modules/flowable-app-engine-spring/src/main/java/org/flowable/app/spring/autodeployment/AbstractAppAutoDeploymentStrategy.java b/modules/flowable-app-engine-spring/src/main/java/org/flowable/app/spring/autodeployment/AbstractAppAutoDeploymentStrategy.java
index 362495fc5af..c0ec473faa7 100644
--- a/modules/flowable-app-engine-spring/src/main/java/org/flowable/app/spring/autodeployment/AbstractAppAutoDeploymentStrategy.java
+++ b/modules/flowable-app-engine-spring/src/main/java/org/flowable/app/spring/autodeployment/AbstractAppAutoDeploymentStrategy.java
@@ -20,7 +20,7 @@
 
 import org.flowable.app.api.repository.AppDeploymentBuilder;
 import org.flowable.app.engine.AppEngine;
-import org.flowable.common.engine.impl.lock.LockManager;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.spring.CommonAutoDeploymentProperties;
 import org.flowable.common.spring.CommonAutoDeploymentStrategy;
 import org.springframework.core.io.Resource;
diff --git a/modules/flowable-app-engine/pom.xml b/modules/flowable-app-engine/pom.xml
index 758a66c8e3b..566aafd7aa3 100644
--- a/modules/flowable-app-engine/pom.xml
+++ b/modules/flowable-app-engine/pom.xml
@@ -51,10 +51,6 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-identitylink-service</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/AppEngineConfiguration.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/AppEngineConfiguration.java
index ae3d4a4ab25..eb3e792fc34 100644
--- a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/AppEngineConfiguration.java
+++ b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/AppEngineConfiguration.java
@@ -28,10 +28,10 @@
 import org.flowable.app.api.AppRepositoryService;
 import org.flowable.app.api.repository.AppResourceConverter;
 import org.flowable.app.engine.impl.AppEngineImpl;
+import org.flowable.app.engine.impl.AppEnginePostEngineBuildConsumer;
 import org.flowable.app.engine.impl.AppManagementServiceImpl;
 import org.flowable.app.engine.impl.AppRepositoryServiceImpl;
 import org.flowable.app.engine.impl.cfg.StandaloneInMemAppEngineConfiguration;
-import org.flowable.app.engine.impl.cmd.SchemaOperationsAppEngineBuild;
 import org.flowable.app.engine.impl.db.AppDbSchemaManager;
 import org.flowable.app.engine.impl.db.EntityDependencyOrder;
 import org.flowable.app.engine.impl.deployer.AppDeployer;
@@ -52,6 +52,7 @@
 import org.flowable.app.engine.impl.persistence.entity.data.impl.MybatisResourceDataManager;
 import org.flowable.app.engine.impl.persistence.entity.deploy.AppDefinitionCacheEntry;
 import org.flowable.common.engine.api.scope.ScopeTypes;
+import org.flowable.common.engine.impl.AbstractBuildableEngineConfiguration;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.EngineConfigurator;
 import org.flowable.common.engine.impl.EngineDeployer;
@@ -73,7 +74,6 @@
 import org.flowable.common.engine.impl.persistence.entity.TableDataManager;
 import org.flowable.eventregistry.impl.configurator.EventRegistryEngineConfigurator;
 import org.flowable.identitylink.service.IdentityLinkServiceConfiguration;
-import org.flowable.identitylink.service.impl.db.IdentityLinkDbSchemaManager;
 import org.flowable.idm.api.IdmEngineConfigurationApi;
 import org.flowable.idm.api.IdmIdentityService;
 import org.flowable.idm.engine.configurator.IdmEngineConfigurator;
@@ -81,7 +81,6 @@
 import org.flowable.variable.api.types.VariableTypes;
 import org.flowable.variable.service.VariableServiceConfiguration;
 import org.flowable.variable.service.impl.db.IbatisVariableTypeHandler;
-import org.flowable.variable.service.impl.db.VariableDbSchemaManager;
 import org.flowable.variable.service.impl.types.BooleanType;
 import org.flowable.variable.service.impl.types.ByteArrayType;
 import org.flowable.variable.service.impl.types.DateType;
@@ -103,11 +102,10 @@
 import org.flowable.variable.service.impl.types.StringType;
 import org.flowable.variable.service.impl.types.UUIDType;
 
-public class AppEngineConfiguration extends AbstractEngineConfiguration implements
+public class AppEngineConfiguration extends AbstractBuildableEngineConfiguration<AppEngine> implements
         AppEngineConfigurationApi, HasExpressionManagerEngineConfiguration, HasVariableTypes {
 
     public static final String DEFAULT_MYBATIS_MAPPING_FILE = "org/flowable/app/db/mapping/mappings.xml";
-    public static final String LIQUIBASE_CHANGELOG_PREFIX = "ACT_APP_";
 
     protected String appEngineName = AppEngines.NAME_DEFAULT;
 
@@ -124,8 +122,6 @@ public class AppEngineConfiguration extends AbstractEngineConfiguration implemen
 
     protected boolean disableIdmEngine;
     protected boolean disableEventRegistry;
-
-    protected boolean executeServiceSchemaManagers = true;
     
     protected AppDeployer appDeployer;
     protected AppDeploymentManager deploymentManager;
@@ -136,8 +132,6 @@ public class AppEngineConfiguration extends AbstractEngineConfiguration implemen
 
     protected ExpressionManager expressionManager;
     protected Collection<Consumer<ExpressionManager>> expressionManagerConfigurers;
-    protected SchemaManager identityLinkSchemaManager;
-    protected SchemaManager variableSchemaManager;
 
     // Identitylink support
     protected IdentityLinkServiceConfiguration identityLinkServiceConfiguration;
@@ -191,11 +185,21 @@ public static AppEngineConfiguration createStandaloneInMemAppEngineConfiguration
         return new StandaloneInMemAppEngineConfiguration();
     }
 
-    public AppEngine buildAppEngine() {
-        init();
+    @Override
+    protected AppEngine createEngine() {
         return new AppEngineImpl(this);
     }
 
+    @Override
+    protected Consumer<AppEngine> createPostEngineBuildConsumer() {
+        return new AppEnginePostEngineBuildConsumer();
+    }
+
+    public AppEngine buildAppEngine() {
+        return buildEngine();
+    }
+
+    @Override
     protected void init() {
         initEngineConfigurations();
         initConfigurators();
@@ -241,40 +245,8 @@ protected void init() {
     }
 
     @Override
-    public void initSchemaManager() {
-        super.initSchemaManager();
-        initAppSchemaManager();
-
-        if (executeServiceSchemaManagers) {
-            initIdentityLinkSchemaManager();
-            initVariableSchemaManager();
-        }
-    }
-    
-    public void initSchemaManagementCommand() {
-        if (schemaManagementCmd == null) {
-            if (usingRelationalDatabase && databaseSchemaUpdate != null) {
-                this.schemaManagementCmd = new SchemaOperationsAppEngineBuild();
-            }
-        }
-    }
-
-    protected void initAppSchemaManager() {
-        if (this.schemaManager == null) {
-            this.schemaManager = new AppDbSchemaManager();
-        }
-    }
-
-    protected void initVariableSchemaManager() {
-        if (this.variableSchemaManager == null) {
-            this.variableSchemaManager = new VariableDbSchemaManager();
-        }
-    }
-
-    protected void initIdentityLinkSchemaManager() {
-        if (this.identityLinkSchemaManager == null) {
-            this.identityLinkSchemaManager = new IdentityLinkDbSchemaManager();
-        }
+    protected SchemaManager createEngineSchemaManager() {
+        return new AppDbSchemaManager();
     }
 
     @Override
@@ -675,14 +647,6 @@ public AppEngineConfiguration setDataSource(DataSource dataSource) {
         return this;
     }
 
-    public boolean isExecuteServiceSchemaManagers() {
-        return executeServiceSchemaManagers;
-    }
-
-    public void setExecuteServiceSchemaManagers(boolean executeServiceSchemaManagers) {
-        this.executeServiceSchemaManagers = executeServiceSchemaManagers;
-    }
-
     @Override
     public ExpressionManager getExpressionManager() {
         return expressionManager;
@@ -707,24 +671,6 @@ public AbstractEngineConfiguration addExpressionManagerConfigurer(Consumer<Expre
         return this;
     }
 
-    public SchemaManager getIdentityLinkSchemaManager() {
-        return identityLinkSchemaManager;
-    }
-
-    public AppEngineConfiguration setIdentityLinkSchemaManager(SchemaManager identityLinkSchemaManager) {
-        this.identityLinkSchemaManager = identityLinkSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getVariableSchemaManager() {
-        return variableSchemaManager;
-    }
-
-    public AppEngineConfiguration setVariableSchemaManager(SchemaManager variableSchemaManager) {
-        this.variableSchemaManager = variableSchemaManager;
-        return this;
-    }
-
     @Override
     public VariableTypes getVariableTypes() {
         return variableTypes;
diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppEngineImpl.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppEngineImpl.java
index 5c85c862ab7..b990628d45b 100644
--- a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppEngineImpl.java
+++ b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppEngineImpl.java
@@ -48,12 +48,6 @@ public AppEngineImpl(AppEngineConfiguration appEngineConfiguration) {
         LOGGER.info("AppEngine {} created", name);
         
         AppEngines.registerAppEngine(this);
-
-        if (appEngineConfiguration.getEngineLifecycleListeners() != null) {
-            for (EngineLifecycleListener engineLifecycleListener : appEngineConfiguration.getEngineLifecycleListeners()) {
-                engineLifecycleListener.onEngineBuilt(this);
-            }
-        }
     }
     
     @Override
diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppEnginePostEngineBuildConsumer.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppEnginePostEngineBuildConsumer.java
new file mode 100644
index 00000000000..6dae0dd4815
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppEnginePostEngineBuildConsumer.java
@@ -0,0 +1,35 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.app.engine.impl;
+
+import java.util.function.Consumer;
+
+import org.flowable.app.engine.AppEngine;
+import org.flowable.app.engine.AppEngineConfiguration;
+import org.flowable.common.engine.api.engine.EngineLifecycleListener;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class AppEnginePostEngineBuildConsumer implements Consumer<AppEngine> {
+
+    @Override
+    public void accept(AppEngine appEngine) {
+        AppEngineConfiguration engineConfiguration = appEngine.getAppEngineConfiguration();
+        if (engineConfiguration.getEngineLifecycleListeners() != null) {
+            for (EngineLifecycleListener engineLifecycleListener : engineConfiguration.getEngineLifecycleListeners()) {
+                engineLifecycleListener.onEngineBuilt(appEngine);
+            }
+        }
+    }
+}
diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppManagementServiceImpl.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppManagementServiceImpl.java
index 4ebbfec6c00..f2a160d57e9 100644
--- a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppManagementServiceImpl.java
+++ b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/AppManagementServiceImpl.java
@@ -18,7 +18,9 @@
 import org.flowable.app.api.AppManagementService;
 import org.flowable.app.engine.AppEngineConfiguration;
 import org.flowable.app.engine.impl.cmd.GetTableNamesCmd;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.impl.cmd.GetTableCountCmd;
+import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.common.engine.impl.service.CommonEngineServiceImpl;
 
 /**
@@ -39,5 +41,9 @@ public Map<String, Long> getTableCounts() {
     public Collection<String> getTableNames() {
         return commandExecutor.execute(new GetTableNamesCmd());
     }
-    
+ 
+    @Override
+    public LockManager getLockManager(String lockName) {
+        return new LockManagerImpl(commandExecutor, lockName, getConfiguration().getLockPollRate(), configuration.getEngineCfgKey());
+    }
 }
diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/aot/FlowableAppRuntimeHints.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/aot/FlowableAppRuntimeHints.java
index 76235896c78..901e525947a 100644
--- a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/aot/FlowableAppRuntimeHints.java
+++ b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/aot/FlowableAppRuntimeHints.java
@@ -25,7 +25,6 @@ public class FlowableAppRuntimeHints implements RuntimeHintsRegistrar {
     @Override
     public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
         ResourceHints resourceHints = hints.resources();
-        resourceHints.registerPattern("org/flowable/app/db/liquibase/flowable-app-db-changelog.xml");
         FlowableMyBatisResourceHintsRegistrar.registerMappingResources("org/flowable/app/db/mapping", hints, classLoader);
     }
 }
diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/cmd/SchemaOperationsAppEngineBuild.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/cmd/SchemaOperationsAppEngineBuild.java
deleted file mode 100644
index 0c47cac82c1..00000000000
--- a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/cmd/SchemaOperationsAppEngineBuild.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.app.engine.impl.cmd;
-
-import org.flowable.app.engine.impl.db.AppDbSchemaManager;
-import org.flowable.app.engine.impl.util.CommandContextUtil;
-import org.flowable.common.engine.impl.interceptor.Command;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
-
-/**
- * @author Tijs Rademakers
- */
-public class SchemaOperationsAppEngineBuild implements Command<Void> {
-
-    @Override
-    public Void execute(CommandContext commandContext) {
-        ((AppDbSchemaManager) CommandContextUtil.getAppEngineConfiguration(commandContext).getSchemaManager()).initSchema();
-        return null;
-    }
-
-}
diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/AppDbSchemaManager.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/AppDbSchemaManager.java
index 64af0b663fd..2d11324c466 100644
--- a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/AppDbSchemaManager.java
+++ b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/AppDbSchemaManager.java
@@ -12,100 +12,72 @@
  */
 package org.flowable.app.engine.impl.db;
 
-import org.flowable.app.engine.AppEngineConfiguration;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.app.engine.AppEngine;
 import org.flowable.app.engine.impl.util.CommandContextUtil;
-import org.flowable.common.engine.api.FlowableException;
-import org.flowable.common.engine.impl.db.EngineDatabaseConfiguration;
-import org.flowable.common.engine.impl.db.LiquibaseBasedSchemaManager;
-import org.flowable.common.engine.impl.db.LiquibaseDatabaseConfiguration;
-import org.flowable.common.engine.impl.db.SchemaManager;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.db.EngineSqlScriptBasedDbSchemaManager;
 
-public class AppDbSchemaManager extends LiquibaseBasedSchemaManager {
+public class AppDbSchemaManager extends EngineSqlScriptBasedDbSchemaManager {
+    
+    protected static final String APP_DB_SCHEMA_LOCK_NAME = "appDbSchemaLock";
     
-    public static final String LIQUIBASE_CHANGELOG = "org/flowable/app/db/liquibase/flowable-app-db-changelog.xml";
+    protected static final Map<String, String> changeLogVersionMap = Map.ofEntries(
+            Map.entry("1", "6.3.1.0"),
+            Map.entry("2", "6.4.0.0"),
+            Map.entry("3", "6.4.1.3")
+    );
 
     public AppDbSchemaManager() {
-        super("app", LIQUIBASE_CHANGELOG, AppEngineConfiguration.LIQUIBASE_CHANGELOG_PREFIX);
+        super("app");
     }
 
     @Override
-    protected LiquibaseDatabaseConfiguration getDatabaseConfiguration() {
-        return new EngineDatabaseConfiguration(CommandContextUtil.getAppEngineConfiguration());
+    protected String getEngineVersion() {
+        return AppEngine.VERSION;
     }
 
-    public void initSchema() {
-        initSchema(CommandContextUtil.getAppEngineConfiguration().getDatabaseSchemaUpdate());
-    }
-    
     @Override
-    public void schemaCreate() {
-        try {
-            
-            getCommonSchemaManager().schemaCreate();
-            getIdentityLinkSchemaManager().schemaCreate();
-            getVariableSchemaManager().schemaCreate();
-            
-            super.schemaCreate();
-        } catch (Exception e) {
-            throw new FlowableException("Error creating App engine tables", e);
-        }
+    protected String getSchemaVersionPropertyName() {
+        return "app.schema.version";
     }
 
     @Override
-    public void schemaDrop() {
-        try {
-            super.schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping App engine tables", e);
-        }
-        
-        try {
-            getVariableSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping variable tables", e);
-        }
-        
-        try {
-            getIdentityLinkSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping identity link tables", e);
-        }
-        
-        try {
-            getCommonSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping common tables", e);
-        }
+    protected String getDbSchemaLockName() {
+        return APP_DB_SCHEMA_LOCK_NAME;
     }
 
     @Override
-    public String schemaUpdate() {
-        try {
-            
-            getCommonSchemaManager().schemaUpdate();
-            
-            if (CommandContextUtil.getAppEngineConfiguration().isExecuteServiceSchemaManagers()) {
-                getIdentityLinkSchemaManager().schemaUpdate();
-                getVariableSchemaManager().schemaUpdate();
-            }
-
-            super.schemaUpdate();
+    protected String getEngineTableName() {
+        return "ACT_APP_DEPLOYMENT";
+    }
 
-        } catch (Exception e) {
-            throw new FlowableException("Error updating App engine tables", e);
-        }
-        return null;
+    @Override
+    protected String getChangeLogTableName() {
+        return "ACT_APP_DATABASECHANGELOG";
     }
     
-    protected SchemaManager getCommonSchemaManager() {
-        return CommandContextUtil.getAppEngineConfiguration().getCommonSchemaManager();
+    @Override
+    protected String getChangeLogTablePrefixName() {
+        return "ACT_APP";
     }
-    
-    protected SchemaManager getIdentityLinkSchemaManager() {
-        return CommandContextUtil.getAppEngineConfiguration().getIdentityLinkSchemaManager();
+
+    @Override
+    protected String getDbVersionForChangelogVersion(String changeLogVersion) {
+        if (StringUtils.isNotEmpty(changeLogVersion) && changeLogVersionMap.containsKey(changeLogVersion)) {
+            return changeLogVersionMap.get(changeLogVersion);
+        }
+        return "6.3.0.1";
     }
-    
-    protected SchemaManager getVariableSchemaManager() {
-        return CommandContextUtil.getAppEngineConfiguration().getVariableSchemaManager();
+
+    @Override
+    protected AbstractEngineConfiguration getEngineConfiguration() {
+        return CommandContextUtil.getAppEngineConfiguration();
+    }
+    @Override
+    protected String getResourcesRootDirectory() {
+        return "org/flowable/app/db/";
     }
 }
diff --git a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/DbSchemaDrop.java b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/DbSchemaDrop.java
index 6658a346d18..8a5063e9717 100644
--- a/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/DbSchemaDrop.java
+++ b/modules/flowable-app-engine/src/main/java/org/flowable/app/engine/impl/db/DbSchemaDrop.java
@@ -18,11 +18,9 @@
 
 import org.flowable.app.engine.AppEngine;
 import org.flowable.app.engine.AppEngineConfiguration;
-import org.flowable.app.engine.impl.util.CommandContextUtil;
 import org.flowable.app.engine.test.FlowableAppTestCase;
-import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.common.engine.impl.interceptor.CommandExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,13 +37,7 @@ public static void main(String[] args) {
             AppEngine cmmnEngine = AppEngineConfiguration.createAppEngineConfigurationFromInputStream(inputStream).buildAppEngine();
             CommandExecutor commandExecutor = cmmnEngine.getAppEngineConfiguration().getCommandExecutor();
             CommandConfig config = new CommandConfig().transactionNotSupported();
-            commandExecutor.execute(config, new Command<>() {
-                @Override
-                public Object execute(CommandContext commandContext) {
-                    CommandContextUtil.getAppEngineConfiguration(commandContext).getSchemaManager().schemaDrop();
-                    return null;
-                }
-            });
+            commandExecutor.execute(config, new SchemaOperationsEngineDropDbCmd(cmmnEngine.getAppEngineConfiguration().getEngineScopeType()));
             
         } catch (IOException e) {
             LOGGER.error("Could not create App engine", e);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.db2.create.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.db2.create.app.sql
new file mode 100644
index 00000000000..a073f293d1a
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.db2.create.app.sql
@@ -0,0 +1,18 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOY PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
+
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('app.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.h2.create.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.h2.create.app.sql
new file mode 100644
index 00000000000..e569bfd4bb5
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.h2.create.app.sql
@@ -0,0 +1,18 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
+
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('app.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.mssql.create.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.mssql.create.app.sql
new file mode 100644
index 00000000000..96b04c6d745
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.mssql.create.app.sql
@@ -0,0 +1,18 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ varchar(255) NOT NULL, NAME_ varchar(255), CATEGORY_ varchar(255), KEY_ varchar(255), DEPLOY_TIME_ datetime, TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_APP_DEPLOYMENT_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ varchar(255) NOT NULL, NAME_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_BYTES_ varbinary(MAX), CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, NAME_ varchar(255), KEY_ varchar(255) NOT NULL, VERSION_ int NOT NULL, CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_NAME_ varchar(4000), DESCRIPTION_ varchar(4000), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_APP_APPDEF_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('app.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.mysql.create.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.mysql.create.app.sql
new file mode 100644
index 00000000000..008baf25d54
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.mysql.create.app.sql
@@ -0,0 +1,20 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_APP_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(4000) NULL, DESCRIPTION_ VARCHAR(4000) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
+
+ALTER TABLE ACT_APP_DEPLOYMENT MODIFY DEPLOY_TIME_ datetime(3);
+
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('app.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.oracle.create.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.oracle.create.app.sql
new file mode 100644
index 00000000000..f6ff143894c
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.oracle.create.app.sql
@@ -0,0 +1,18 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), KEY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255), KEY_ VARCHAR2(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(4000), DESCRIPTION_ VARCHAR2(4000), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
+
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('app.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.postgres.create.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.postgres.create.app.sql
new file mode 100644
index 00000000000..c591e253c20
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/create/flowable.postgres.create.app.sql
@@ -0,0 +1,18 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP WITHOUT TIME ZONE, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_APP_DEPLOYMENT_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_APP_APPDEF_pkey" PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
+
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('app.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/liquibase/flowable-app-db-changelog.xml b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/liquibase/flowable-app-db-changelog.xml
deleted file mode 100644
index ded278eceea..00000000000
--- a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/liquibase/flowable-app-db-changelog.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog 
-                        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
-                        http://www.liquibase.org/xml/ns/dbchangelog-ext 
-                        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
-    <changeSet id="1" author="flowable">
-
-        <createTable tableName="ACT_APP_DEPLOYMENT">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="CATEGORY_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="KEY_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="DEPLOY_TIME_" type="datetime">
-                <constraints nullable="true" />
-            </column>
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <createTable tableName="ACT_APP_DEPLOYMENT_RESOURCE">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" primaryKeyName="PK_APP_DEPLOYMENT_RESOURCE" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="RESOURCE_BYTES_" type="longblob">
-                <constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <addForeignKeyConstraint constraintName="ACT_FK_APP_RSRC_DPL" 
-            referencedTableName="ACT_APP_DEPLOYMENT"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_APP_DEPLOYMENT_RESOURCE" 
-            baseColumnNames="DEPLOYMENT_ID_" />
-            
-        <createIndex tableName="ACT_APP_DEPLOYMENT_RESOURCE" indexName="ACT_IDX_APP_RSRC_DPL">
-            <column name="DEPLOYMENT_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_APP_APPDEF">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="KEY_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="VERSION_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="CATEGORY_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="RESOURCE_NAME_" type="varchar(4000)" />
-            <column name="DESCRIPTION_" type="varchar(4000)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-        
-        <addForeignKeyConstraint constraintName="ACT_FK_APP_DEF_DPLY" 
-            referencedTableName="ACT_APP_DEPLOYMENT"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_APP_APPDEF" 
-            baseColumnNames="DEPLOYMENT_ID_" />
-            
-        <createIndex tableName="ACT_APP_APPDEF" indexName="ACT_IDX_APP_DEF_DPLY">
-            <column name="DEPLOYMENT_ID_" />
-        </createIndex>
-
-    </changeSet>
-
-    <changeSet id="2" author="flowable" dbms="mysql,mariadb">
-
-        <modifyDataType tableName="ACT_APP_DEPLOYMENT" columnName="DEPLOY_TIME_" newDataType="datetime(3)" />
-
-    </changeSet>
-
-    <changeSet id="3" author="flowable">
-
-        <createIndex tableName="ACT_APP_APPDEF" indexName="ACT_IDX_APP_DEF_UNIQ" unique="true">
-            <column name="KEY_" />
-            <column name="VERSION_" />
-            <column name="TENANT_ID_" />
-        </createIndex>
-
-    </changeSet>
-
-</databaseChangeLog>
\ No newline at end of file
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.all.upgradestep.7100.to.7101.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.all.upgradestep.7100.to.7101.app.sql
new file mode 100644
index 00000000000..e06fb9c6585
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.all.upgradestep.7100.to.7101.app.sql
@@ -0,0 +1,5 @@
+insert into ACT_GE_PROPERTY
+values ('app.schema.version', '7.1.0.1', 1);
+
+drop table ACT_APP_DATABASECHANGELOG;
+drop table ACT_APP_DATABASECHANGELOGLOCK;
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.db2.upgradestep.6301.to.6310.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.db2.upgradestep.6301.to.6310.app.sql
new file mode 100644
index 00000000000..37c2141e0d1
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.db2.upgradestep.6301.to.6310.app.sql
@@ -0,0 +1,13 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOY PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.db2.upgradestep.6412.to.6413.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.db2.upgradestep.6412.to.6413.app.sql
new file mode 100644
index 00000000000..7e274a76f87
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.db2.upgradestep.6412.to.6413.app.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.h2.upgradestep.6301.to.6310.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.h2.upgradestep.6301.to.6310.app.sql
new file mode 100644
index 00000000000..44b1cc1dd2a
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.h2.upgradestep.6301.to.6310.app.sql
@@ -0,0 +1,13 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.h2.upgradestep.6412.to.6413.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.h2.upgradestep.6412.to.6413.app.sql
new file mode 100644
index 00000000000..7e274a76f87
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.h2.upgradestep.6412.to.6413.app.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mssql.upgradestep.6301.to.6310.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mssql.upgradestep.6301.to.6310.app.sql
new file mode 100644
index 00000000000..60c3d9abe81
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mssql.upgradestep.6301.to.6310.app.sql
@@ -0,0 +1,13 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ varchar(255) NOT NULL, NAME_ varchar(255), CATEGORY_ varchar(255), KEY_ varchar(255), DEPLOY_TIME_ datetime, TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_APP_DEPLOYMENT_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ varchar(255) NOT NULL, NAME_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_BYTES_ varbinary(MAX), CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, NAME_ varchar(255), KEY_ varchar(255) NOT NULL, VERSION_ int NOT NULL, CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_NAME_ varchar(4000), DESCRIPTION_ varchar(4000), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_APP_APPDEF_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.app.sql
new file mode 100644
index 00000000000..4528bad72fc
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.app.sql
@@ -0,0 +1 @@
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6301.to.6310.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6301.to.6310.app.sql
new file mode 100644
index 00000000000..4a271e06f98
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6301.to.6310.app.sql
@@ -0,0 +1,13 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_APP_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(4000) NULL, DESCRIPTION_ VARCHAR(4000) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6320.to.6400.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6320.to.6400.app.sql
new file mode 100644
index 00000000000..12c23a4c5bb
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6320.to.6400.app.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_APP_DEPLOYMENT MODIFY DEPLOY_TIME_ datetime(3);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.app.sql
new file mode 100644
index 00000000000..7e274a76f87
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.app.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.oracle.upgradestep.6301.to.6310.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.oracle.upgradestep.6301.to.6310.app.sql
new file mode 100644
index 00000000000..fce61aec53b
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.oracle.upgradestep.6301.to.6310.app.sql
@@ -0,0 +1,13 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), KEY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_APP_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255), KEY_ VARCHAR2(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(4000), DESCRIPTION_ VARCHAR2(4000), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_APP_APPDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.app.sql
new file mode 100644
index 00000000000..7e274a76f87
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.app.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.postgres.upgradestep.6301.to.6310.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.postgres.upgradestep.6301.to.6310.app.sql
new file mode 100644
index 00000000000..6b5f6f3854d
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.postgres.upgradestep.6301.to.6310.app.sql
@@ -0,0 +1,13 @@
+CREATE TABLE ACT_APP_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP WITHOUT TIME ZONE, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_APP_DEPLOYMENT_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_APP_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT PK_APP_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_APP_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_RSRC_DPL ON ACT_APP_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_APP_APPDEF (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_APP_APPDEF_pkey" PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_APP_APPDEF ADD CONSTRAINT ACT_FK_APP_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_APP_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_APP_DEF_DPLY ON ACT_APP_APPDEF(DEPLOYMENT_ID_);
diff --git a/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.app.sql b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.app.sql
new file mode 100644
index 00000000000..7e274a76f87
--- /dev/null
+++ b/modules/flowable-app-engine/src/main/resources/org/flowable/app/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.app.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_APP_DEF_UNIQ ON ACT_APP_APPDEF(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationTest.java b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationTest.java
index 4a192f4444a..b505890bbc7 100644
--- a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationTest.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationTest.java
@@ -57,7 +57,6 @@ public void contextShouldLoadPropertiesInACorrectOrder() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
-                "flowable-liquibase-override",
                 "Management Server"
             );
 
diff --git a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsKafkaAndRabbitTest.java b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsKafkaAndRabbitTest.java
index 0887ced4261..4ad4e0b0e28 100644
--- a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsKafkaAndRabbitTest.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsKafkaAndRabbitTest.java
@@ -62,7 +62,6 @@ public void contextShouldLoad() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
-                "flowable-liquibase-override",
                 "Management Server"
             );
 
diff --git a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsTest.java b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsTest.java
index 6d36542a3db..df08201532c 100644
--- a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsTest.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledJmsTest.java
@@ -58,7 +58,6 @@ public void contextShouldLoad() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
-                "flowable-liquibase-override",
                 "Management Server"
             );
 
diff --git a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledKafkaTest.java b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledKafkaTest.java
index ccea1c1e8d3..ae042e40c5c 100644
--- a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledKafkaTest.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledKafkaTest.java
@@ -58,7 +58,6 @@ public void contextShouldLoad() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
-                "flowable-liquibase-override",
                 "Management Server"
             );
 
diff --git a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledRabbitTest.java b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledRabbitTest.java
index 92450d97a8f..bd8df236b27 100644
--- a/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledRabbitTest.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/rest/app/FlowableRestApplicationWithEnabledRabbitTest.java
@@ -58,7 +58,6 @@ public void contextShouldLoad() {
                 "class path resource [engine.properties]",
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
-                "flowable-liquibase-override",
                 "Management Server"
             );
 
diff --git a/modules/flowable-batch-service/src/main/java/org/flowable/batch/service/impl/db/BatchDbSchemaManager.java b/modules/flowable-batch-service/src/main/java/org/flowable/batch/service/impl/db/BatchDbSchemaManager.java
deleted file mode 100644
index 06a3195afca..00000000000
--- a/modules/flowable-batch-service/src/main/java/org/flowable/batch/service/impl/db/BatchDbSchemaManager.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.batch.service.impl.db;
-
-import org.flowable.common.engine.impl.db.ServiceSqlScriptBasedDbSchemaManager;
-
-/**
- * @author Tijs Rademakers
- */
-public class BatchDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
-    
-    private static final String TABLE = "FLW_RU_BATCH";
-    private static final String VERSION_PROPERTY = "batch.schema.version";
-    private static final String SCHEMA_COMPONENT = "batch";
-    
-    public BatchDbSchemaManager() {
-        super(TABLE, SCHEMA_COMPONENT, null, VERSION_PROPERTY);
-    }
-
-    @Override
-    protected String getResourcesRootDirectory() {
-        return "org/flowable/batch/service/db/";
-    }
-
-}
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.cockroachdb.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.cockroachdb.create.batch.sql
deleted file mode 100644
index bd0be2a75c8..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.cockroachdb.create.batch.sql
+++ /dev/null
@@ -1,42 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.db2.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.db2.create.batch.sql
deleted file mode 100644
index 9dd57b7d73f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.db2.create.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.h2.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.h2.create.batch.sql
deleted file mode 100644
index 9dd57b7d73f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.h2.create.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.hsql.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.hsql.create.batch.sql
deleted file mode 100644
index 9dd57b7d73f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.hsql.create.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mssql.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mssql.create.batch.sql
deleted file mode 100644
index c17d50cab44..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mssql.create.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ nvarchar(64) not null,
-    REV_ int,
-    TYPE_ nvarchar(64) not null,
-    SEARCH_KEY_ nvarchar(255),
-    SEARCH_KEY2_ nvarchar(255),
-    CREATE_TIME_ datetime not null,
-    COMPLETE_TIME_ datetime,
-    STATUS_ nvarchar(255),
-    BATCH_DOC_ID_ nvarchar(64),
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ nvarchar(64) not null,
-    REV_ int,
-    BATCH_ID_ nvarchar(64),
-    TYPE_ nvarchar(64) not null,
-    SCOPE_ID_ nvarchar(64),
-    SUB_SCOPE_ID_ nvarchar(64),
-    SCOPE_TYPE_ nvarchar(64),
-    SEARCH_KEY_ nvarchar(255),
-    SEARCH_KEY2_ nvarchar(255),
-    CREATE_TIME_ datetime not null,
-    COMPLETE_TIME_ datetime,
-    STATUS_ nvarchar(255),
-    RESULT_DOC_ID_ nvarchar(64),
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mysql.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mysql.create.batch.sql
deleted file mode 100644
index d0d65d77073..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mysql.create.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ datetime(3) not null,
-    COMPLETE_TIME_ datetime(3),
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ datetime(3) not null,
-    COMPLETE_TIME_ datetime(3),
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mysql55.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mysql55.create.batch.sql
deleted file mode 100644
index 82104a0e750..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.mysql55.create.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ datetime not null,
-    COMPLETE_TIME_ datetime,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ datetime not null,
-    COMPLETE_TIME_ datetime,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.oracle.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.oracle.create.batch.sql
deleted file mode 100644
index 61979b31580..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.oracle.create.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ NVARCHAR2(64) not null,
-    REV_ INTEGER,
-    TYPE_ NVARCHAR2(64) not null,
-    SEARCH_KEY_ NVARCHAR2(255),
-    SEARCH_KEY2_ NVARCHAR2(255),
-    CREATE_TIME_ TIMESTAMP(6) not null,
-    COMPLETE_TIME_ TIMESTAMP(6),
-    STATUS_ NVARCHAR2(255),
-    BATCH_DOC_ID_ NVARCHAR2(64),
-    TENANT_ID_ NVARCHAR2(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ NVARCHAR2(64) not null,
-    REV_ INTEGER,
-    BATCH_ID_ NVARCHAR2(64),
-    TYPE_ NVARCHAR2(64) not null,
-    SCOPE_ID_ NVARCHAR2(64),
-    SUB_SCOPE_ID_ NVARCHAR2(64),
-    SCOPE_TYPE_ NVARCHAR2(64),
-    SEARCH_KEY_ NVARCHAR2(255),
-    SEARCH_KEY2_ NVARCHAR2(255),
-    CREATE_TIME_ TIMESTAMP(6) not null,
-    COMPLETE_TIME_ TIMESTAMP(6),
-    STATUS_ NVARCHAR2(255),
-    RESULT_DOC_ID_ NVARCHAR2(64),
-    TENANT_ID_ NVARCHAR2(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.postgres.create.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.postgres.create.batch.sql
deleted file mode 100644
index 9dd57b7d73f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/create/flowable.postgres.create.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.cockroachdb.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.cockroachdb.drop.batch.sql
deleted file mode 100644
index 7ef35633e9e..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.cockroachdb.drop.batch.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists flw_ru_batch_part cascade;
-drop table if exists flw_ru_batch cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.db2.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.db2.drop.batch.sql
deleted file mode 100644
index 52f5777152f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.db2.drop.batch.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index FLW_IDX_BATCH_PART;
-
-drop table FLW_RU_BATCH_PART;
-drop table FLW_RU_BATCH;
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.h2.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.h2.drop.batch.sql
deleted file mode 100644
index 10c7f7a32a5..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.h2.drop.batch.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists FLW_RU_BATCH_PART cascade constraints;
-drop table if exists FLW_RU_BATCH cascade constraints;
-
-drop index if exists FLW_IDX_BATCH_PART;
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.hsql.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.hsql.drop.batch.sql
deleted file mode 100644
index 10c7f7a32a5..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.hsql.drop.batch.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists FLW_RU_BATCH_PART cascade constraints;
-drop table if exists FLW_RU_BATCH cascade constraints;
-
-drop index if exists FLW_IDX_BATCH_PART;
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.mssql.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.mssql.drop.batch.sql
deleted file mode 100644
index ff0d60881df..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.mssql.drop.batch.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'FLW_IDX_BATCH_PART') drop index FLW_RU_BATCH_PART.FLW_IDX_BATCH_PART;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_RU_BATCH_PART') drop table FLW_RU_BATCH_PART;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_RU_BATCH') drop table FLW_RU_BATCH;
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.mysql.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.mysql.drop.batch.sql
deleted file mode 100644
index 14e8e22dcdf..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.mysql.drop.batch.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART;
-
-drop table if exists FLW_RU_BATCH_PART;
-drop table if exists FLW_RU_BATCH;
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.oracle.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.oracle.drop.batch.sql
deleted file mode 100644
index 52f5777152f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.oracle.drop.batch.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index FLW_IDX_BATCH_PART;
-
-drop table FLW_RU_BATCH_PART;
-drop table FLW_RU_BATCH;
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.postgres.drop.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.postgres.drop.batch.sql
deleted file mode 100644
index 9424b70e474..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/drop/flowable.postgres.drop.batch.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-drop table if exists FLW_RU_BATCH_PART cascade;
-drop table if exists FLW_RU_BATCH cascade;
\ No newline at end of file
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.batch.sql
deleted file mode 100644
index 6d3a49c7647..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.batch.sql
deleted file mode 100644
index 9a5b3dfb074..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.4' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.batch.sql
deleted file mode 100644
index 0e5e73ea1ad..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.batch.sql
deleted file mode 100644
index 97d69d430ca..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.6' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.batch.sql
deleted file mode 100644
index 076c40d9dfe..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.batch.sql
deleted file mode 100644
index 341d24ddd41..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.batch.sql
deleted file mode 100644
index 09aa935d50f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.batch.sql
deleted file mode 100644
index dd41663c4fe..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.batch.sql
deleted file mode 100644
index cdb07c37d8f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.batch.sql
deleted file mode 100644
index 504719191fc..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.5' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.batch.sql
deleted file mode 100644
index c2346637fda..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.batch.sql
deleted file mode 100644
index 837e02088d0..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.batch.sql
deleted file mode 100644
index da8fde93de4..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.batch.sql
deleted file mode 100644
index 4e00e00bee5..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.batch.sql
deleted file mode 100644
index 7a8365a802f..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.batch.sql
deleted file mode 100644
index b9cdb2becc3..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.1' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.batch.sql
deleted file mode 100644
index 3f815e8f5d1..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.batch.sql
deleted file mode 100644
index d4e6b3e2090..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.1' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.batch.sql
deleted file mode 100644
index 0de68c02e2a..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.1.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.batch.sql
deleted file mode 100644
index f17787f4654..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.batch.sql
deleted file mode 100644
index 5f515678da5..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.batch.sql
deleted file mode 100644
index 705d49909e8..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.batch.sql
deleted file mode 100644
index 2453667ba45..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.3' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.batch.sql
deleted file mode 100644
index ae11356130b..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.0.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.batch.sql
deleted file mode 100644
index a1fb019cbd1..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.batch.sql
deleted file mode 100644
index cd69c861ba9..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.0.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.batch.sql
deleted file mode 100644
index 4aed409f55b..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.batch.sql
deleted file mode 100644
index c5e88d32d92..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.batch.sql
deleted file mode 100644
index f1581a24866..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.batch.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'batch.schema.version';
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.db2.upgradestep.6501.to.6502.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.db2.upgradestep.6501.to.6502.batch.sql
deleted file mode 100644
index edaa99467f1..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.db2.upgradestep.6501.to.6502.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '6.5.0.2', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.h2.upgradestep.6501.to.6502.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.h2.upgradestep.6501.to.6502.batch.sql
deleted file mode 100644
index edaa99467f1..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.h2.upgradestep.6501.to.6502.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '6.5.0.2', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.hsql.upgradestep.6501.to.6502.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.hsql.upgradestep.6501.to.6502.batch.sql
deleted file mode 100644
index edaa99467f1..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.hsql.upgradestep.6501.to.6502.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '6.5.0.2', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.batch.sql
deleted file mode 100644
index 262e50e817a..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ nvarchar(64) not null,
-    REV_ int,
-    TYPE_ nvarchar(64) not null,
-    SEARCH_KEY_ nvarchar(255),
-    SEARCH_KEY2_ nvarchar(255),
-    CREATE_TIME_ datetime not null,
-    COMPLETE_TIME_ datetime,
-    STATUS_ nvarchar(255),
-    BATCH_DOC_ID_ nvarchar(64),
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ nvarchar(64) not null,
-    REV_ int,
-    BATCH_ID_ nvarchar(64),
-    TYPE_ nvarchar(64) not null,
-    SCOPE_ID_ nvarchar(64),
-    SUB_SCOPE_ID_ nvarchar(64),
-    SCOPE_TYPE_ nvarchar(64),
-    SEARCH_KEY_ nvarchar(255),
-    SEARCH_KEY2_ nvarchar(255),
-    CREATE_TIME_ datetime not null,
-    COMPLETE_TIME_ datetime,
-    STATUS_ nvarchar(255),
-    RESULT_DOC_ID_ nvarchar(64),
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '6.5.0.2', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.batch.sql
deleted file mode 100644
index afa523a0789..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ datetime(3) not null,
-    COMPLETE_TIME_ datetime(3),
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ datetime(3) not null,
-    COMPLETE_TIME_ datetime(3),
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '6.5.0.2', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mysql55.upgradestep.6501.to.6502.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mysql55.upgradestep.6501.to.6502.batch.sql
deleted file mode 100644
index 4505546588e..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.mysql55.upgradestep.6501.to.6502.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ datetime not null,
-    COMPLETE_TIME_ datetime,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ datetime not null,
-    COMPLETE_TIME_ datetime,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '6.5.0.2', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.batch.sql
deleted file mode 100644
index 816e585b847..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ NVARCHAR2(64) not null,
-    REV_ INTEGER,
-    TYPE_ NVARCHAR2(64) not null,
-    SEARCH_KEY_ NVARCHAR2(255),
-    SEARCH_KEY2_ NVARCHAR2(255),
-    CREATE_TIME_ TIMESTAMP(6) not null,
-    COMPLETE_TIME_ TIMESTAMP(6),
-    STATUS_ NVARCHAR2(255),
-    BATCH_DOC_ID_ NVARCHAR2(64),
-    TENANT_ID_ NVARCHAR2(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ NVARCHAR2(64) not null,
-    REV_ INTEGER,
-    BATCH_ID_ NVARCHAR2(64),
-    TYPE_ NVARCHAR2(64) not null,
-    SCOPE_ID_ NVARCHAR2(64),
-    SUB_SCOPE_ID_ NVARCHAR2(64),
-    SCOPE_TYPE_ NVARCHAR2(64),
-    SEARCH_KEY_ NVARCHAR2(255),
-    SEARCH_KEY2_ NVARCHAR2(255),
-    CREATE_TIME_ TIMESTAMP(6) not null,
-    COMPLETE_TIME_ TIMESTAMP(6),
-    STATUS_ NVARCHAR2(255),
-    RESULT_DOC_ID_ NVARCHAR2(64),
-    TENANT_ID_ NVARCHAR2(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '6.5.0.2', 1);
diff --git a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.batch.sql b/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.batch.sql
deleted file mode 100644
index edaa99467f1..00000000000
--- a/modules/flowable-batch-service/src/main/resources/org/flowable/batch/service/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.batch.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-create table FLW_RU_BATCH (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(64) not null,
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    BATCH_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table FLW_RU_BATCH_PART (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    BATCH_ID_ varchar(64),
-    TYPE_ varchar(64) not null,
-    SCOPE_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_TYPE_ varchar(64),
-    SEARCH_KEY_ varchar(255),
-    SEARCH_KEY2_ varchar(255),
-    CREATE_TIME_ timestamp not null,
-    COMPLETE_TIME_ timestamp,
-    STATUS_ varchar(255),
-    RESULT_DOC_ID_ varchar(64),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
-
-alter table FLW_RU_BATCH_PART
-    add constraint FLW_FK_BATCH_PART_PARENT
-    foreign key (BATCH_ID_)
-    references FLW_RU_BATCH (ID_);
-
-insert into ACT_GE_PROPERTY values ('batch.schema.version', '6.5.0.2', 1);
diff --git a/modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/CmmnManagementService.java b/modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/CmmnManagementService.java
index 00cf9ef98f5..2eadc362151 100644
--- a/modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/CmmnManagementService.java
+++ b/modules/flowable-cmmn-api/src/main/java/org/flowable/cmmn/api/CmmnManagementService.java
@@ -23,6 +23,7 @@
 import org.flowable.batch.api.BatchQuery;
 import org.flowable.cmmn.api.runtime.CmmnExternalWorkerTransitionBuilder;
 import org.flowable.common.engine.api.FlowableObjectNotFoundException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.tenant.ChangeTenantIdBuilder;
 import org.flowable.job.api.DeadLetterJobQuery;
 import org.flowable.job.api.ExternalWorkerJobAcquireBuilder;
@@ -424,4 +425,16 @@ public interface CmmnManagementService {
      * will be changed to the target tenant id.
      */
     ChangeTenantIdBuilder createChangeTenantIdBuilder(String fromTenantId, String toTenantId);
+    
+    /**
+     * Acquire a lock manager for the requested lock.
+     * This is a stateless call, this means that every time a lock manager
+     * is requested a new one would be created. Make sure that you release the lock
+     * once you are done.
+     *
+     * @param lockName the name of the lock that is being requested
+     *
+     * @return the lock manager for the given lock
+     */
+    LockManager getLockManager(String lockName);
 }
diff --git a/modules/flowable-cmmn-engine-configurator/src/main/java/org/flowable/cmmn/engine/configurator/CmmnEngineConfigurator.java b/modules/flowable-cmmn-engine-configurator/src/main/java/org/flowable/cmmn/engine/configurator/CmmnEngineConfigurator.java
index d20cebafa4c..e9f8c26c5e1 100644
--- a/modules/flowable-cmmn-engine-configurator/src/main/java/org/flowable/cmmn/engine/configurator/CmmnEngineConfigurator.java
+++ b/modules/flowable-cmmn-engine-configurator/src/main/java/org/flowable/cmmn/engine/configurator/CmmnEngineConfigurator.java
@@ -41,7 +41,7 @@
 /**
  * @author Joram Barrez
  */
-public class CmmnEngineConfigurator extends AbstractEngineConfigurator {
+public class CmmnEngineConfigurator extends AbstractEngineConfigurator<CmmnEngine> {
 
     protected CmmnEngineConfiguration cmmnEngineConfiguration;
 
@@ -89,9 +89,7 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
             
         }
 
-        cmmnEngineConfiguration.setExecuteServiceSchemaManagers(false);
-
-        initCmmnEngine();
+        initEngine();
 
         if (processEngineConfiguration != null) {
             cmmnEngineConfiguration.getJobServiceConfiguration().getInternalJobManager()
@@ -178,7 +176,8 @@ protected List<Class<? extends Entity>> getEntityDeletionOrder() {
         return EntityDependencyOrder.DELETE_ORDER;
     }
 
-    protected synchronized CmmnEngine initCmmnEngine() {
+    @Override
+    protected CmmnEngine buildEngine() {
         if (cmmnEngineConfiguration == null) {
             throw new FlowableException("CmmnEngineConfiguration is required");
         }
diff --git a/modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/DbSchemaDrop.java b/modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/DbSchemaDrop.java
index 4fbc90c6a5e..d60044bfd64 100644
--- a/modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/DbSchemaDrop.java
+++ b/modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/DbSchemaDrop.java
@@ -12,13 +12,11 @@
  */
 package org.flowable.cmmn.test;
 
-import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.common.engine.impl.interceptor.CommandExecutor;
 import org.flowable.engine.ProcessEngines;
 import org.flowable.engine.impl.ProcessEngineImpl;
-import org.flowable.engine.impl.util.CommandContextUtil;
 
 /**
  * @author Filip Hrisafov
@@ -29,14 +27,7 @@ public static void main(String[] args) {
         ProcessEngineImpl processEngine = (ProcessEngineImpl) ProcessEngines.getDefaultProcessEngine();
         CommandExecutor commandExecutor = processEngine.getProcessEngineConfiguration().getCommandExecutor();
         CommandConfig config = new CommandConfig().transactionNotSupported();
-        commandExecutor.execute(config, new Command<>() {
-            @Override
-            public Object execute(CommandContext commandContext) {
-                CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager().schemaDrop();
-                org.flowable.cmmn.engine.impl.util.CommandContextUtil.getCmmnEngineConfiguration(commandContext).getSchemaManager().schemaDrop();
-                return null;
-            }
-        });
+        commandExecutor.execute(config, new SchemaOperationsEngineDropDbCmd(processEngine.getProcessEngineConfiguration().getEngineScopeType()));
     }
 
 }
diff --git a/modules/flowable-cmmn-engine/pom.xml b/modules/flowable-cmmn-engine/pom.xml
index 25f3148bbae..38c504810f7 100644
--- a/modules/flowable-cmmn-engine/pom.xml
+++ b/modules/flowable-cmmn-engine/pom.xml
@@ -103,10 +103,6 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-case-validation</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
@@ -216,6 +212,8 @@
             org.flowable.cmmn.engine
         </flowable.artifact>
         <flowable.osgi.export.additional>
+            org.flowable.cmmn.db.create,
+            org.flowable.cmmn.db.upgrade,
             org.flowable.cmmn.db.mapping.entity
         </flowable.osgi.export.additional>
         <flowable.osgi.import.additional>
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java
index 1700f48eb62..4733422fee3 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -34,7 +35,6 @@
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.JdbcType;
 import org.flowable.batch.service.BatchServiceConfiguration;
-import org.flowable.batch.service.impl.db.BatchDbSchemaManager;
 import org.flowable.cmmn.api.CallbackTypes;
 import org.flowable.cmmn.api.CandidateManager;
 import org.flowable.cmmn.api.CmmnChangeTenantIdEntityTypes;
@@ -53,6 +53,7 @@
 import org.flowable.cmmn.api.listener.PlanItemInstanceLifecycleListener;
 import org.flowable.cmmn.api.migration.CaseInstanceMigrationCallback;
 import org.flowable.cmmn.engine.impl.CmmnEngineImpl;
+import org.flowable.cmmn.engine.impl.CmmnEnginePostEngineBuildConsumer;
 import org.flowable.cmmn.engine.impl.CmmnHistoryServiceImpl;
 import org.flowable.cmmn.engine.impl.CmmnManagementServiceImpl;
 import org.flowable.cmmn.engine.impl.CmmnRepositoryServiceImpl;
@@ -68,7 +69,6 @@
 import org.flowable.cmmn.engine.impl.cfg.DelegateExpressionFieldInjectionMode;
 import org.flowable.cmmn.engine.impl.cfg.StandaloneInMemCmmnEngineConfiguration;
 import org.flowable.cmmn.engine.impl.cmd.JobRetryCmd;
-import org.flowable.cmmn.engine.impl.cmd.SchemaOperationsCmmnEngineBuild;
 import org.flowable.cmmn.engine.impl.db.CmmnDbSchemaManager;
 import org.flowable.cmmn.engine.impl.db.EntityDependencyOrder;
 import org.flowable.cmmn.engine.impl.delegate.CmmnClassDelegateFactory;
@@ -206,6 +206,7 @@
 import org.flowable.common.engine.api.async.AsyncTaskInvoker;
 import org.flowable.common.engine.api.delegate.FlowableFunctionDelegate;
 import org.flowable.common.engine.api.scope.ScopeTypes;
+import org.flowable.common.engine.impl.AbstractBuildableEngineConfiguration;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.EngineConfigurator;
 import org.flowable.common.engine.impl.EngineDeployer;
@@ -262,15 +263,12 @@
 import org.flowable.common.engine.impl.variablelistener.VariableListenerSession;
 import org.flowable.common.engine.impl.variablelistener.VariableListenerSessionFactory;
 import org.flowable.entitylink.service.EntityLinkServiceConfiguration;
-import org.flowable.entitylink.service.impl.db.EntityLinkDbSchemaManager;
 import org.flowable.eventregistry.api.EventRegistryEventConsumer;
 import org.flowable.eventregistry.impl.configurator.EventRegistryEngineConfigurator;
 import org.flowable.eventsubscription.service.EventSubscriptionServiceConfiguration;
-import org.flowable.eventsubscription.service.impl.db.EventSubscriptionDbSchemaManager;
 import org.flowable.form.api.FormFieldHandler;
 import org.flowable.identitylink.service.IdentityLinkEventHandler;
 import org.flowable.identitylink.service.IdentityLinkServiceConfiguration;
-import org.flowable.identitylink.service.impl.db.IdentityLinkDbSchemaManager;
 import org.flowable.idm.api.IdmEngineConfigurationApi;
 import org.flowable.idm.api.IdmIdentityService;
 import org.flowable.idm.engine.configurator.IdmEngineConfigurator;
@@ -288,7 +286,6 @@
 import org.flowable.job.service.impl.asyncexecutor.ExecuteAsyncRunnableFactory;
 import org.flowable.job.service.impl.asyncexecutor.FailedJobCommandFactory;
 import org.flowable.job.service.impl.asyncexecutor.JobManager;
-import org.flowable.job.service.impl.db.JobDbSchemaManager;
 import org.flowable.mail.common.api.client.FlowableMailClient;
 import org.flowable.task.service.InternalTaskAssignmentManager;
 import org.flowable.task.service.InternalTaskVariableScopeResolver;
@@ -296,14 +293,12 @@
 import org.flowable.task.service.TaskServiceConfiguration;
 import org.flowable.task.service.history.InternalHistoryTaskManager;
 import org.flowable.task.service.impl.DefaultTaskPostProcessor;
-import org.flowable.task.service.impl.db.TaskDbSchemaManager;
 import org.flowable.task.service.impl.persistence.entity.HistoricTaskLogEntryEntityImpl;
 import org.flowable.variable.api.types.VariableType;
 import org.flowable.variable.api.types.VariableTypes;
 import org.flowable.variable.service.VariableServiceConfiguration;
 import org.flowable.variable.service.history.InternalHistoryVariableManager;
 import org.flowable.variable.service.impl.db.IbatisVariableTypeHandler;
-import org.flowable.variable.service.impl.db.VariableDbSchemaManager;
 import org.flowable.variable.service.impl.types.BooleanType;
 import org.flowable.variable.service.impl.types.ByteArrayType;
 import org.flowable.variable.service.impl.types.DateType;
@@ -325,12 +320,11 @@
 import org.flowable.variable.service.impl.types.StringType;
 import org.flowable.variable.service.impl.types.UUIDType;
 
-public class CmmnEngineConfiguration extends AbstractEngineConfiguration implements CmmnEngineConfigurationApi,
+public class CmmnEngineConfiguration extends AbstractBuildableEngineConfiguration<CmmnEngine> implements CmmnEngineConfigurationApi,
         ScriptingEngineAwareEngineConfiguration, HasExpressionManagerEngineConfiguration, HasVariableTypes, 
         HasVariableServiceConfiguration {
 
     public static final String DEFAULT_MYBATIS_MAPPING_FILE = "org/flowable/cmmn/db/mapping/mappings.xml";
-    public static final String LIQUIBASE_CHANGELOG_PREFIX = "ACT_CMMN_";
 
     protected String cmmnEngineName = CmmnEngines.NAME_DEFAULT;
 
@@ -396,8 +390,6 @@ public class CmmnEngineConfiguration extends AbstractEngineConfiguration impleme
     protected ChangeTenantIdManager changeTenantIdManager;
     protected Set<String> changeTenantEntityTypes;
 
-    protected boolean executeServiceSchemaManagers = true;
-
     protected boolean enableSafeCmmnXml;
     protected boolean disableCmmnXmlValidation;
     protected CmmnActivityBehaviorFactory activityBehaviorFactory;
@@ -449,14 +441,6 @@ public class CmmnEngineConfiguration extends AbstractEngineConfiguration impleme
      */
     protected DelegateExpressionFieldInjectionMode delegateExpressionFieldInjectionMode = DelegateExpressionFieldInjectionMode.MIXED;
 
-    protected SchemaManager identityLinkSchemaManager;
-    protected SchemaManager entityLinkSchemaManager;
-    protected SchemaManager eventSubscriptionSchemaManager;
-    protected SchemaManager variableSchemaManager;
-    protected SchemaManager taskSchemaManager;
-    protected SchemaManager jobSchemaManager;
-    protected SchemaManager batchSchemaManager;
-
     /**
      * Case diagram generator. Default value is DefaultCaseDiagramGenerator
      */
@@ -710,16 +694,20 @@ public static CmmnEngineConfiguration createStandaloneInMemCmmnEngineConfigurati
     }
 
     public CmmnEngine buildCmmnEngine() {
-        init();
-        CmmnEngineImpl cmmnEngine = new CmmnEngineImpl(this);
+        return buildEngine();
+    }
 
-        if (handleCmmnEngineExecutorsAfterEngineCreate) {
-            cmmnEngine.startExecutors();
-        }
+    @Override
+    protected CmmnEngine createEngine() {
+        return new CmmnEngineImpl(this);
+    }
 
-        return cmmnEngine;
+    @Override
+    protected Consumer<CmmnEngine> createPostEngineBuildConsumer() {
+        return new CmmnEnginePostEngineBuildConsumer();
     }
 
+    @Override
     protected void init() {
         initEngineConfigurations();
         initConfigurators();
@@ -810,79 +798,8 @@ public void initCaseDiagramGenerator() {
     }
 
     @Override
-    public void initSchemaManager() {
-        super.initSchemaManager();
-        initCmmnSchemaManager();
-
-        if (executeServiceSchemaManagers) {
-            initIdentityLinkSchemaManager();
-            initEntityLinkSchemaManager();
-            initEventSubscriptionSchemaManager();
-            initVariableSchemaManager();
-            initTaskSchemaManager();
-            initJobSchemaManager();
-            initBatchSchemaManager();
-        }
-    }
-    
-    public void initSchemaManagementCommand() {
-        if (schemaManagementCmd == null) {
-            if (usingRelationalDatabase && databaseSchemaUpdate != null) {
-                this.schemaManagementCmd = new SchemaOperationsCmmnEngineBuild();
-            }
-        }
-    }
-
-    protected void initCmmnSchemaManager() {
-        if (this.schemaManager == null) {
-            if (DATABASE_TYPE_COCKROACHDB.equals(databaseType)) {
-                this.schemaManager = new CmmnDbSchemaManager(CmmnDbSchemaManager.LIQUIBASE_CHANGELOG_CRDB);
-            } else {
-                this.schemaManager = new CmmnDbSchemaManager(CmmnDbSchemaManager.LIQUIBASE_CHANGELOG);
-            }
-        }
-    }
-
-    protected void initVariableSchemaManager() {
-        if (this.variableSchemaManager == null) {
-            this.variableSchemaManager = new VariableDbSchemaManager();
-        }
-    }
-
-    protected void initTaskSchemaManager() {
-        if (this.taskSchemaManager == null) {
-            this.taskSchemaManager = new TaskDbSchemaManager();
-        }
-    }
-
-    protected void initIdentityLinkSchemaManager() {
-        if (this.identityLinkSchemaManager == null) {
-            this.identityLinkSchemaManager = new IdentityLinkDbSchemaManager();
-        }
-    }
-    
-    protected void initEntityLinkSchemaManager() {
-        if (this.entityLinkSchemaManager == null) {
-            this.entityLinkSchemaManager = new EntityLinkDbSchemaManager();
-        }
-    }
-    
-    protected void initEventSubscriptionSchemaManager() {
-        if (this.eventSubscriptionSchemaManager == null) {
-            this.eventSubscriptionSchemaManager = new EventSubscriptionDbSchemaManager();
-        }
-    }
-
-    protected void initJobSchemaManager() {
-        if (this.jobSchemaManager == null) {
-            this.jobSchemaManager = new JobDbSchemaManager();
-        }
-    }
-
-    protected void initBatchSchemaManager() {
-        if (this.batchSchemaManager == null) {
-            this.batchSchemaManager = new BatchDbSchemaManager();
-        }
+    protected SchemaManager createEngineSchemaManager() {
+        return new CmmnDbSchemaManager();
     }
 
     @Override
@@ -2635,14 +2552,6 @@ public CmmnEngineConfiguration setDataSource(DataSource dataSource) {
         return this;
     }
 
-    public boolean isExecuteServiceSchemaManagers() {
-        return executeServiceSchemaManagers;
-    }
-
-    public void setExecuteServiceSchemaManagers(boolean executeServiceSchemaManagers) {
-        this.executeServiceSchemaManagers = executeServiceSchemaManagers;
-    }
-
     public HistoryLevel getHistoryLevel() {
         return historyLevel;
     }
@@ -2801,69 +2710,6 @@ public CmmnEngineConfiguration addPostDefaultELResolver(ELResolver elResolver) {
         return this;
     }
 
-    public SchemaManager getIdentityLinkSchemaManager() {
-        return identityLinkSchemaManager;
-    }
-
-    public CmmnEngineConfiguration setIdentityLinkSchemaManager(SchemaManager identityLinkSchemaManager) {
-        this.identityLinkSchemaManager = identityLinkSchemaManager;
-        return this;
-    }
-    
-    public SchemaManager getEntityLinkSchemaManager() {
-        return entityLinkSchemaManager;
-    }
-
-    public CmmnEngineConfiguration setEntityLinkSchemaManager(SchemaManager entityLinkSchemaManager) {
-        this.entityLinkSchemaManager = entityLinkSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getEventSubscriptionSchemaManager() {
-        return eventSubscriptionSchemaManager;
-    }
-
-    public CmmnEngineConfiguration setEventSubscriptionSchemaManager(SchemaManager eventSubscriptionSchemaManager) {
-        this.eventSubscriptionSchemaManager = eventSubscriptionSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getVariableSchemaManager() {
-        return variableSchemaManager;
-    }
-
-    public CmmnEngineConfiguration setVariableSchemaManager(SchemaManager variableSchemaManager) {
-        this.variableSchemaManager = variableSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getTaskSchemaManager() {
-        return taskSchemaManager;
-    }
-
-    public CmmnEngineConfiguration setTaskSchemaManager(SchemaManager taskSchemaManager) {
-        this.taskSchemaManager = taskSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getJobSchemaManager() {
-        return jobSchemaManager;
-    }
-
-    public CmmnEngineConfiguration setJobSchemaManager(SchemaManager jobSchemaManager) {
-        this.jobSchemaManager = jobSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getBatchSchemaManager() {
-        return batchSchemaManager;
-    }
-
-    public CmmnEngineConfiguration setBatchSchemaManager(SchemaManager batchSchemaManager) {
-        this.batchSchemaManager = batchSchemaManager;
-        return this;
-    }
-
     @Override
     public VariableTypes getVariableTypes() {
         return variableTypes;
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnEngineImpl.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnEngineImpl.java
index e277e171f66..5b21f353d40 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnEngineImpl.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnEngineImpl.java
@@ -72,12 +72,6 @@ public CmmnEngineImpl(CmmnEngineConfiguration cmmnEngineConfiguration) {
         LOGGER.info("CmmnEngine {} created", name);
         
         CmmnEngines.registerCmmnEngine(this);
-
-        if (cmmnEngineConfiguration.getEngineLifecycleListeners() != null) {
-            for (EngineLifecycleListener engineLifecycleListener : cmmnEngineConfiguration.getEngineLifecycleListeners()) {
-                engineLifecycleListener.onEngineBuilt(this);
-            }
-        }
     }
     
     @Override
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnEnginePostEngineBuildConsumer.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnEnginePostEngineBuildConsumer.java
new file mode 100644
index 00000000000..55662c2b56a
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnEnginePostEngineBuildConsumer.java
@@ -0,0 +1,39 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.cmmn.engine.impl;
+
+import java.util.function.Consumer;
+
+import org.flowable.cmmn.engine.CmmnEngine;
+import org.flowable.cmmn.engine.CmmnEngineConfiguration;
+import org.flowable.common.engine.api.engine.EngineLifecycleListener;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class CmmnEnginePostEngineBuildConsumer implements Consumer<CmmnEngine> {
+
+    @Override
+    public void accept(CmmnEngine cmmnEngine) {
+        CmmnEngineConfiguration engineConfiguration = cmmnEngine.getCmmnEngineConfiguration();
+        if (engineConfiguration.getEngineLifecycleListeners() != null) {
+            for (EngineLifecycleListener engineLifecycleListener : engineConfiguration.getEngineLifecycleListeners()) {
+                engineLifecycleListener.onEngineBuilt(cmmnEngine);
+            }
+        }
+
+        if (engineConfiguration.isHandleCmmnEngineExecutorsAfterEngineCreate()) {
+            cmmnEngine.startExecutors();
+        }
+    }
+}
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnManagementServiceImpl.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnManagementServiceImpl.java
index 9037010e76c..758fe8e555b 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnManagementServiceImpl.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/CmmnManagementServiceImpl.java
@@ -35,11 +35,13 @@
 import org.flowable.cmmn.engine.impl.runtime.CmmnExternalWorkerTransitionBuilderImpl;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableIllegalArgumentException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.tenant.ChangeTenantIdBuilder;
 import org.flowable.common.engine.impl.cmd.GetTableCountCmd;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
 import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
+import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.common.engine.impl.service.CommonEngineServiceImpl;
 import org.flowable.common.engine.impl.tenant.ChangeTenantIdBuilderImpl;
 import org.flowable.job.api.DeadLetterJobQuery;
@@ -354,5 +356,10 @@ public <T> T executeCommand(CommandConfig config, Command<T> command) {
         }
         return commandExecutor.execute(config, command);
     }
+    
+    @Override
+    public LockManager getLockManager(String lockName) {
+        return new LockManagerImpl(commandExecutor, lockName, getConfiguration().getLockPollRate(), configuration.getEngineCfgKey());
+    }
 
 }
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/aot/FlowableCmmnRuntimeHints.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/aot/FlowableCmmnRuntimeHints.java
index 60821021edd..e0641134e42 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/aot/FlowableCmmnRuntimeHints.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/aot/FlowableCmmnRuntimeHints.java
@@ -28,8 +28,6 @@ public class FlowableCmmnRuntimeHints implements RuntimeHintsRegistrar {
     public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
         ResourceHints resourceHints = hints.resources();
         FlowableMyBatisResourceHintsRegistrar.registerMappingResources("org/flowable/cmmn/db/mapping", hints, classLoader);
-        resourceHints.registerPattern("org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml");
-        resourceHints.registerPattern("org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog-crdb.xml");
         resourceHints.registerPattern("org/flowable/impl/cmmn/parser/*.xsd");
 
         hints.reflection()
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/cmd/SchemaOperationsCmmnEngineBuild.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/cmd/SchemaOperationsCmmnEngineBuild.java
deleted file mode 100644
index ebae5c34674..00000000000
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/cmd/SchemaOperationsCmmnEngineBuild.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.cmmn.engine.impl.cmd;
-
-import org.flowable.cmmn.engine.impl.db.CmmnDbSchemaManager;
-import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.common.engine.impl.interceptor.Command;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
-
-/**
- * @author Joram Barrez
- */
-public class SchemaOperationsCmmnEngineBuild implements Command<Void> {
-
-    @Override
-    public Void execute(CommandContext commandContext) {
-        ((CmmnDbSchemaManager) CommandContextUtil.getCmmnEngineConfiguration(commandContext).getSchemaManager()).initSchema();
-        return null;
-    }
-
-}
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/CmmnDbSchemaManager.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/CmmnDbSchemaManager.java
index 6bc256440e5..d5c31604bdf 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/CmmnDbSchemaManager.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/CmmnDbSchemaManager.java
@@ -12,181 +12,90 @@
  */
 package org.flowable.cmmn.engine.impl.db;
 
-import org.flowable.cmmn.engine.CmmnEngineConfiguration;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.cmmn.engine.CmmnEngine;
 import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
-import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
-import org.flowable.common.engine.impl.db.EngineDatabaseConfiguration;
-import org.flowable.common.engine.impl.db.LiquibaseBasedSchemaManager;
-import org.flowable.common.engine.impl.db.LiquibaseDatabaseConfiguration;
-import org.flowable.common.engine.impl.db.SchemaManager;
-import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
-import org.flowable.idm.engine.IdmEngineConfiguration;
-
-public class CmmnDbSchemaManager extends LiquibaseBasedSchemaManager {
-
-    public static final String LIQUIBASE_CHANGELOG = "org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml";
-
-    public static final String LIQUIBASE_CHANGELOG_CRDB = "org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog-crdb.xml";
-
-    public CmmnDbSchemaManager(String changelogFile) {
-        super("cmmn", changelogFile, CmmnEngineConfiguration.LIQUIBASE_CHANGELOG_PREFIX);
+import org.flowable.common.engine.impl.db.EngineSqlScriptBasedDbSchemaManager;
+
+public class CmmnDbSchemaManager extends EngineSqlScriptBasedDbSchemaManager {
+
+    protected static final String CMMN_DB_SCHEMA_LOCK_NAME = "cmmnDbSchemaLock";
+
+    protected static final Map<String, String> changeLogVersionMap = Map.ofEntries(
+            Map.entry("1", "6.2.0.0"),
+            Map.entry("2", "6.2.1.0"),
+            Map.entry("3", "6.3.0.0"),
+            Map.entry("4", "6.3.1.0"),
+            Map.entry("5", "6.4.0.0"),
+            Map.entry("6", "6.4.1.3"),
+            Map.entry("7", "6.4.1.3"),
+            Map.entry("8", "6.5.0.6"),
+            Map.entry("9", "6.5.0.6"),
+            Map.entry("10", "6.5.0.6"),
+            Map.entry("11", "6.5.0.6"),
+            Map.entry("12", "6.6.0.0"),
+            Map.entry("13", "6.6.0.0"),
+            Map.entry("14", "6.7.0.0"),
+            Map.entry("15", "6.7.1.0"),
+            Map.entry("16", "6.7.1.0"),
+            Map.entry("17", "6.8.0.0"),
+            Map.entry("18", "7.0.1.1"),
+            Map.entry("19", "7.1.0.0"),
+            Map.entry("20", "7.1.0.0")
+    );
+
+    public CmmnDbSchemaManager() {
+        super("cmmn");
     }
 
     @Override
-    protected LiquibaseDatabaseConfiguration getDatabaseConfiguration() {
-        return new EngineDatabaseConfiguration(CommandContextUtil.getCmmnEngineConfiguration());
-    }
-
-    public void initSchema() {
-        initSchema(CommandContextUtil.getCmmnEngineConfiguration().getDatabaseSchemaUpdate());
+    protected String getEngineVersion() {
+        return CmmnEngine.VERSION;
     }
 
     @Override
-    public void initSchema(String databaseSchemaUpdate) {
-        super.initSchema(databaseSchemaUpdate);
-
-        // When the databaseSchemaUpdate is drop-create:
-        // the IDM engine will have done a drop-create due to the configurator running first
-        // The CmmnDbSchemaManager will go next, but it will do a dropAll, dropping the idm tables too.
-        if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE.equals(databaseSchemaUpdate)) {
-            AbstractEngineConfiguration abstractEngineConfiguration = CommandContextUtil.getCmmnEngineConfiguration().getEngineConfigurations()
-                .get(EngineConfigurationConstants.KEY_IDM_ENGINE_CONFIG);
-            if (abstractEngineConfiguration != null) {
-                IdmEngineConfiguration idmEngineConfiguration = (IdmEngineConfiguration) abstractEngineConfiguration;
-                idmEngineConfiguration.getSchemaManager().schemaCreate();
-            }
-        }
+    protected String getSchemaVersionPropertyName() {
+        return "cmmn.schema.version";
     }
 
     @Override
-    public void schemaCreate() {
-        try {
-            getCommonSchemaManager().schemaCreate();
-            getIdentityLinkSchemaManager().schemaCreate();
-            getEntityLinkSchemaManager().schemaCreate();
-            getEventSubscriptionSchemaManager().schemaCreate();
-            getTaskSchemaManager().schemaCreate();
-            getVariableSchemaManager().schemaCreate();
-            getJobSchemaManager().schemaCreate();
-            getBatchSchemaManager().schemaCreate();
-
-            super.schemaCreate();
-        } catch (Exception e) {
-            throw new FlowableException("Error creating CMMN engine tables", e);
-        }
+    protected String getDbSchemaLockName() {
+        return CMMN_DB_SCHEMA_LOCK_NAME;
     }
 
     @Override
-    public void schemaDrop() {
-        try {
-            super.schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping CMMN engine tables", e);
-        }
-
-        try {
-            getBatchSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping batch tables", e);
-        }
-        
-        try {
-            getJobSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping job tables", e);
-        }
-          
-        try {
-            getVariableSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping variable tables", e);
-        }
-        
-        try {
-            getTaskSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping task tables", e);
-        }
-        
-        try {
-            getEventSubscriptionSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping event subscription tables", e);
-        }
-        
-        try {
-            getEntityLinkSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping entity link tables", e);
-        }
-        
-        try {
-            getIdentityLinkSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping identity link tables", e);
-        }
-        
-        try {
-            getCommonSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping common tables", e);
-        }
+    protected String getEngineTableName() {
+        return "ACT_CMMN_RU_CASE_INST";
     }
 
     @Override
-    public String schemaUpdate() {
-        try {
-            
-            getCommonSchemaManager().schemaUpdate();
-            
-            if (CommandContextUtil.getCmmnEngineConfiguration().isExecuteServiceSchemaManagers()) {
-                getIdentityLinkSchemaManager().schemaUpdate();
-                getEntityLinkSchemaManager().schemaUpdate();
-                getEventSubscriptionSchemaManager().schemaUpdate();
-                getTaskSchemaManager().schemaUpdate();
-                getVariableSchemaManager().schemaUpdate();
-                getJobSchemaManager().schemaUpdate();
-                getBatchSchemaManager().schemaUpdate();
-            }
-
-            super.schemaUpdate();
-
-        } catch (Exception e) {
-            throw new FlowableException("Error updating CMMN engine tables", e);
-        }
-        return null;
-    }
-    
-    protected SchemaManager getCommonSchemaManager() {
-        return CommandContextUtil.getCmmnEngineConfiguration().getCommonSchemaManager();
-    }
-    
-    protected SchemaManager getIdentityLinkSchemaManager() {
-        return CommandContextUtil.getCmmnEngineConfiguration().getIdentityLinkSchemaManager();
-    }
-    
-    protected SchemaManager getEntityLinkSchemaManager() {
-        return CommandContextUtil.getCmmnEngineConfiguration().getEntityLinkSchemaManager();
-    }
-    
-    protected SchemaManager getEventSubscriptionSchemaManager() {
-        return CommandContextUtil.getCmmnEngineConfiguration().getEventSubscriptionSchemaManager();
+    protected String getChangeLogTableName() {
+        return "ACT_CMMN_DATABASECHANGELOG";
     }
     
-    protected SchemaManager getVariableSchemaManager() {
-        return CommandContextUtil.getCmmnEngineConfiguration().getVariableSchemaManager();
+    @Override
+    protected String getChangeLogTablePrefixName() {
+        return "ACT_CMMN";
     }
-    
-    protected SchemaManager getTaskSchemaManager() {
-        return CommandContextUtil.getCmmnEngineConfiguration().getTaskSchemaManager();
+
+    @Override
+    protected String getDbVersionForChangelogVersion(String changeLogVersion) {
+        if (StringUtils.isNotEmpty(changeLogVersion) && changeLogVersionMap.containsKey(changeLogVersion)) {
+            return changeLogVersionMap.get(changeLogVersion);
+        }
+        return "6.1.2.0";
     }
-    
-    protected SchemaManager getJobSchemaManager() {
-        return CommandContextUtil.getCmmnEngineConfiguration().getJobSchemaManager();
+
+    @Override
+    protected AbstractEngineConfiguration getEngineConfiguration() {
+        return CommandContextUtil.getCmmnEngineConfiguration();
     }
 
-    protected SchemaManager getBatchSchemaManager() {
-        return CommandContextUtil.getCmmnEngineConfiguration().getBatchSchemaManager();
+    @Override
+    protected String getResourcesRootDirectory() {
+        return "org/flowable/cmmn/db/";
     }
 }
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/DbSchemaDrop.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/DbSchemaDrop.java
index 24423dd5f0e..998fec90c7d 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/DbSchemaDrop.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/DbSchemaDrop.java
@@ -18,11 +18,9 @@
 
 import org.flowable.cmmn.engine.CmmnEngine;
 import org.flowable.cmmn.engine.CmmnEngineConfiguration;
-import org.flowable.cmmn.engine.impl.util.CommandContextUtil;
 import org.flowable.cmmn.engine.test.FlowableCmmnTestCase;
-import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.common.engine.impl.interceptor.CommandExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,13 +37,7 @@ public static void main(String[] args) {
             CmmnEngine cmmnEngine = CmmnEngineConfiguration.createCmmnEngineConfigurationFromInputStream(inputStream).buildCmmnEngine();
             CommandExecutor commandExecutor = cmmnEngine.getCmmnEngineConfiguration().getCommandExecutor();
             CommandConfig config = new CommandConfig().transactionNotSupported();
-            commandExecutor.execute(config, new Command<>() {
-                @Override
-                public Object execute(CommandContext commandContext) {
-                    CommandContextUtil.getCmmnEngineConfiguration(commandContext).getSchemaManager().schemaDrop();
-                    return null;
-                }
-            });
+            commandExecutor.execute(config, new SchemaOperationsEngineDropDbCmd(cmmnEngine.getCmmnEngineConfiguration().getEngineScopeType()));
             
         } catch (IOException e) {
             LOGGER.error("Could not create CMMN engine", e);
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/eventregistry/CmmnEventRegistryEventConsumer.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/eventregistry/CmmnEventRegistryEventConsumer.java
index e86cc08400e..9ce59f10e1e 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/eventregistry/CmmnEventRegistryEventConsumer.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/eventregistry/CmmnEventRegistryEventConsumer.java
@@ -31,8 +31,8 @@
 import org.flowable.cmmn.model.ExtensionElement;
 import org.flowable.cmmn.model.PlanItem;
 import org.flowable.common.engine.api.constant.ReferenceTypes;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.scope.ScopeTypes;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.eventregistry.api.EventConsumerInfo;
 import org.flowable.eventregistry.api.EventRegistryProcessingInfo;
 import org.flowable.eventregistry.api.runtime.EventInstance;
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/test/impl/CmmnTestRunner.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/test/impl/CmmnTestRunner.java
index 4fbd60eb3bf..8fba68646e0 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/test/impl/CmmnTestRunner.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/test/impl/CmmnTestRunner.java
@@ -207,17 +207,7 @@ protected void assertDatabaseEmpty(FrameworkMethod method) {
             cmmnEngineConfiguration,
             TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK,
             true,
-            new Command<>() {
-
-                @Override
-                public Void execute(CommandContext commandContext) {
-                    SchemaManager schemaManager = CommandContextUtil.getCmmnEngineConfiguration(commandContext).getSchemaManager();
-                    schemaManager.schemaDrop();
-                    schemaManager.schemaCreate();
-                    return null;
-                }
-            }
-
+            cmmnEngineConfiguration.getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.db2.cmmn.create.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.db2.cmmn.create.sql
deleted file mode 100644
index af05239d57f..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.db2.cmmn.create.sql
+++ /dev/null
@@ -1,65 +0,0 @@
-
-CREATE TABLE DATABASECHANGELOG (ID VARCHAR(255) NOT NULL, AUTHOR VARCHAR(255) NOT NULL, FILENAME VARCHAR(255) NOT NULL, DATEEXECUTED TIMESTAMP NOT NULL, ORDEREXECUTED INTEGER NOT NULL, EXECTYPE VARCHAR(10) NOT NULL, MD5SUM VARCHAR(35), DESCRIPTION VARCHAR(255), COMMENTS VARCHAR(255), TAG VARCHAR(255), LIQUIBASE VARCHAR(20), CONTEXTS VARCHAR(255), LABELS VARCHAR(255), DEPLOYMENT_ID VARCHAR(10));
-
-CREATE TABLE ACT_CMMN_RE_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_CMMN_RE_DE PRIMARY KEY (ID_));
-
-CREATE TABLE ACT_CMMN_RE_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_CMMN_RE_DE PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RE_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_RE_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
-
-CREATE TABLE ACT_CMMN_RE_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ VARCHAR(255) NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ SMALLINT, TENANT_ID_ VARCHAR(255) DEFAULT '' NOT NULL, CONSTRAINT PK_ACT_CMMN_RE_CA PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RE_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_RE_CASEDEF(DEPLOYMENT_ID_);
-
-CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CA PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
-
-CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
-
-CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ SMALLINT, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_PL PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
-
-CREATE TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_ACT_CMMN_RU_SE PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_INST_ID_);
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_ON_PART_INST(PLAN_ITEM_INST_ID_);
-
-CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MI PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
-
-CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CA PRIMARY KEY (ID_));
-
-CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MI PRIMARY KEY (ID_));
-
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('1', 'flowable', 'org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml', CURRENT TIMESTAMP, 1, '7:28e5931d36abab0185c189c584a7c2d0', 'createTable tableName=ACT_CMMN_RE_DEPLOYMENT; createTable tableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE; addForeignKeyConstraint baseTableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE, constraintName=ACT_FK_CMMN_RSRC_DPL, referencedTableName=ACT_CMMN_RE_DEPLOY...', '', 'EXECUTED', NULL, NULL, '3.5.3', '4471204965');
-
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.db2.create.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.db2.create.cmmn.sql
new file mode 100644
index 00000000000..715d0892d3e
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.db2.create.cmmn.sql
@@ -0,0 +1,226 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLO PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASED PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CA PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), IF_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MI PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CA PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MI PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_CASEDEF');
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_DEPLOYMENT_RESOURCE');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INTEGER;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INTEGER;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), STATE_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), ITEM_DEFINITION_ID_ VARCHAR(255), ITEM_DEFINITION_TYPE_ VARCHAR(255), CREATED_TIME_ TIMESTAMP, LAST_AVAILABLE_TIME_ TIMESTAMP, LAST_ENABLED_TIME_ TIMESTAMP, LAST_DISABLED_TIME_ TIMESTAMP, LAST_STARTED_TIME_ TIMESTAMP, LAST_SUSPENDED_TIME_ TIMESTAMP, COMPLETED_TIME_ TIMESTAMP, OCCURRED_TIME_ TIMESTAMP, TERMINATED_TIME_ TIMESTAMP, EXIT_TIME_ TIMESTAMP, ENDED_TIME_ TIMESTAMP, LAST_UPDATED_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PL PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_MIL_INST');
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_MIL_INST');
+
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST RENAME COLUMN START_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST RENAME COLUMN CREATED_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_CASE_INST');
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_CASE_INST');
+
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
+
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('cmmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.h2.cmmn.create.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.h2.cmmn.create.sql
deleted file mode 100644
index 927876f96bb..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.h2.cmmn.create.sql
+++ /dev/null
@@ -1,65 +0,0 @@
-
-CREATE TABLE PUBLIC.DATABASECHANGELOG (ID VARCHAR(255) NOT NULL, AUTHOR VARCHAR(255) NOT NULL, FILENAME VARCHAR(255) NOT NULL, DATEEXECUTED TIMESTAMP NOT NULL, ORDEREXECUTED INT NOT NULL, EXECTYPE VARCHAR(10) NOT NULL, MD5SUM VARCHAR(35), DESCRIPTION VARCHAR(255), COMMENTS VARCHAR(255), TAG VARCHAR(255), LIQUIBASE VARCHAR(20), CONTEXTS VARCHAR(255), LABELS VARCHAR(255), DEPLOYMENT_ID VARCHAR(10));
-
-CREATE TABLE PUBLIC.ACT_CMMN_RE_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT PRIMARY KEY (ID_));
-
-CREATE TABLE PUBLIC.ACT_CMMN_RE_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RE_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_CMMN_RSRC_DPL ON PUBLIC.ACT_CMMN_RE_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RE_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ VARCHAR(255) NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '' NOT NULL, CONSTRAINT PK_ACT_CMMN_RE_CASEDEF PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RE_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_CASE_DEF_DPLY ON PUBLIC.ACT_CMMN_RE_CASEDEF(DEPLOYMENT_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_CASE_INST_CASE_DEF ON PUBLIC.ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_CASE_INST_PARENT ON PUBLIC.ACT_CMMN_RU_CASE_INST(PARENT_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_PLAN_ITEM_INST PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_PLAN_ITEM_CASE_DEF ON PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES PUBLIC.ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_PLAN_ITEM_CASE_INST ON PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_ACT_CMMN_RU_SENTRY_ON_PART_INST PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_SENTRY_CASE_DEF ON PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_DEF_ID_);
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES PUBLIC.ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_SENTRY_CASE_INST ON PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_INST_ID_);
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_SENTRY_PLAN_ITEM ON PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST(PLAN_ITEM_INST_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_MIL_CASE_DEF ON PUBLIC.ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES PUBLIC.ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_MIL_CASE_INST ON PUBLIC.ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
-
-CREATE TABLE PUBLIC.ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
-
-INSERT INTO PUBLIC.DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('1', 'flowable', 'org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml', NOW(), 1, '7:28e5931d36abab0185c189c584a7c2d0', 'createTable tableName=ACT_CMMN_RE_DEPLOYMENT; createTable tableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE; addForeignKeyConstraint baseTableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE, constraintName=ACT_FK_CMMN_RSRC_DPL, referencedTableName=ACT_CMMN_RE_DEPLOY...', '', 'EXECUTED', NULL, NULL, '3.5.3', '4471205191');
-
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.h2.create.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.h2.create.cmmn.sql
new file mode 100644
index 00000000000..6b210343969
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.h2.create.cmmn.sql
@@ -0,0 +1,168 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), IF_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INT;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INT;
+
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), STATE_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), ITEM_DEFINITION_ID_ VARCHAR(255), ITEM_DEFINITION_TYPE_ VARCHAR(255), CREATED_TIME_ TIMESTAMP, LAST_AVAILABLE_TIME_ TIMESTAMP, LAST_ENABLED_TIME_ TIMESTAMP, LAST_DISABLED_TIME_ TIMESTAMP, LAST_STARTED_TIME_ TIMESTAMP, LAST_SUSPENDED_TIME_ TIMESTAMP, COMPLETED_TIME_ TIMESTAMP, OCCURRED_TIME_ TIMESTAMP, TERMINATED_TIME_ TIMESTAMP, EXIT_TIME_ TIMESTAMP, ENDED_TIME_ TIMESTAMP, LAST_UPDATED_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ALTER COLUMN START_TIME_ RENAME TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ALTER COLUMN CREATED_TIME_ RENAME TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
+
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('cmmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.hsql.cmmn.create.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.hsql.cmmn.create.sql
deleted file mode 100644
index 1f0fd553cd4..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.hsql.cmmn.create.sql
+++ /dev/null
@@ -1,65 +0,0 @@
-
-CREATE TABLE PUBLIC.DATABASECHANGELOG (ID VARCHAR(255) NOT NULL, AUTHOR VARCHAR(255) NOT NULL, FILENAME VARCHAR(255) NOT NULL, DATEEXECUTED TIMESTAMP NOT NULL, ORDEREXECUTED INT NOT NULL, EXECTYPE VARCHAR(10) NOT NULL, MD5SUM VARCHAR(35), DESCRIPTION VARCHAR(255), COMMENTS VARCHAR(255), TAG VARCHAR(255), LIQUIBASE VARCHAR(20), CONTEXTS VARCHAR(255), LABELS VARCHAR(255), DEPLOYMENT_ID VARCHAR(10));
-
-CREATE TABLE PUBLIC.ACT_CMMN_RE_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT PRIMARY KEY (ID_));
-
-CREATE TABLE PUBLIC.ACT_CMMN_RE_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RE_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_CMMN_RSRC_DPL ON PUBLIC.ACT_CMMN_RE_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RE_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ VARCHAR(255) NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '' NOT NULL, CONSTRAINT PK_ACT_CMMN_RE_CASEDEF PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RE_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_CASE_DEF_DPLY ON PUBLIC.ACT_CMMN_RE_CASEDEF(DEPLOYMENT_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_CASE_INST_CASE_DEF ON PUBLIC.ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_CASE_INST_PARENT ON PUBLIC.ACT_CMMN_RU_CASE_INST(PARENT_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_PLAN_ITEM_INST PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_PLAN_ITEM_CASE_DEF ON PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES PUBLIC.ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_PLAN_ITEM_CASE_INST ON PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_ACT_CMMN_RU_SENTRY_ON_PART_INST PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_SENTRY_CASE_DEF ON PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_DEF_ID_);
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES PUBLIC.ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_SENTRY_CASE_INST ON PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_INST_ID_);
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES PUBLIC.ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_SENTRY_PLAN_ITEM ON PUBLIC.ACT_CMMN_RU_SENTRY_ON_PART_INST(PLAN_ITEM_INST_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES PUBLIC.ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_MIL_CASE_DEF ON PUBLIC.ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
-
-ALTER TABLE PUBLIC.ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES PUBLIC.ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX PUBLIC.ACT_IDX_MIL_CASE_INST ON PUBLIC.ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
-
-CREATE TABLE PUBLIC.ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
-
-CREATE TABLE PUBLIC.ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
-
-INSERT INTO PUBLIC.DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('1', 'flowable', 'org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml', NOW, 1, '7:28e5931d36abab0185c189c584a7c2d0', 'createTable tableName=ACT_CMMN_RE_DEPLOYMENT; createTable tableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE; addForeignKeyConstraint baseTableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE, constraintName=ACT_FK_CMMN_RSRC_DPL, referencedTableName=ACT_CMMN_RE_DEPLOY...', '', 'EXECUTED', NULL, NULL, '3.5.3', '4471205090');
-
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.hsql.create.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.hsql.create.cmmn.sql
new file mode 100644
index 00000000000..6b210343969
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.hsql.create.cmmn.sql
@@ -0,0 +1,168 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), IF_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INT;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INT;
+
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), STATE_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), ITEM_DEFINITION_ID_ VARCHAR(255), ITEM_DEFINITION_TYPE_ VARCHAR(255), CREATED_TIME_ TIMESTAMP, LAST_AVAILABLE_TIME_ TIMESTAMP, LAST_ENABLED_TIME_ TIMESTAMP, LAST_DISABLED_TIME_ TIMESTAMP, LAST_STARTED_TIME_ TIMESTAMP, LAST_SUSPENDED_TIME_ TIMESTAMP, COMPLETED_TIME_ TIMESTAMP, OCCURRED_TIME_ TIMESTAMP, TERMINATED_TIME_ TIMESTAMP, EXIT_TIME_ TIMESTAMP, ENDED_TIME_ TIMESTAMP, LAST_UPDATED_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ALTER COLUMN START_TIME_ RENAME TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ALTER COLUMN CREATED_TIME_ RENAME TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
+
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('cmmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mssql.cmmn.create.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mssql.cmmn.create.sql
deleted file mode 100644
index 78b824fd5f9..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mssql.cmmn.create.sql
+++ /dev/null
@@ -1,97 +0,0 @@
-
-CREATE TABLE [DATABASECHANGELOG] ([ID] [nvarchar](255) NOT NULL, [AUTHOR] [nvarchar](255) NOT NULL, [FILENAME] [nvarchar](255) NOT NULL, [DATEEXECUTED] [datetime2](3) NOT NULL, [ORDEREXECUTED] [int] NOT NULL, [EXECTYPE] [nvarchar](10) NOT NULL, [MD5SUM] [nvarchar](35), [DESCRIPTION] [nvarchar](255), [COMMENTS] [nvarchar](255), [TAG] [nvarchar](255), [LIQUIBASE] [nvarchar](20), [CONTEXTS] [nvarchar](255), [LABELS] [nvarchar](255), [DEPLOYMENT_ID] [nvarchar](10))
-GO
-
-CREATE TABLE [ACT_CMMN_RE_DEPLOYMENT] ([ID_] [varchar](255) NOT NULL, [NAME_] [varchar](255), [CATEGORY_] [varchar](255), [DEPLOY_TIME_] [datetime], [PARENT_DEPLOYMENT_ID_] [varchar](255), [TENANT_ID_] [varchar](255), CONSTRAINT [PK_ACT_CMMN_RE_DEPLOYMENT] PRIMARY KEY ([ID_]))
-GO
-
-CREATE TABLE [ACT_CMMN_RE_DEPLOYMENT_RESOURCE] ([ID_] [varchar](255) NOT NULL, [NAME_] [varchar](255), [DEPLOYMENT_ID_] [varchar](255), [RESOURCE_BYTES_] [varbinary](MAX), CONSTRAINT [PK_ACT_CMMN_RE_DEPLOYMENT_RESOURCE] PRIMARY KEY ([ID_]))
-GO
-
-ALTER TABLE [ACT_CMMN_RE_DEPLOYMENT_RESOURCE] ADD CONSTRAINT [ACT_FK_CMMN_RSRC_DPL] FOREIGN KEY ([DEPLOYMENT_ID_]) REFERENCES [ACT_CMMN_RE_DEPLOYMENT] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_CMMN_RSRC_DPL ON [ACT_CMMN_RE_DEPLOYMENT_RESOURCE]([DEPLOYMENT_ID_])
-GO
-
-CREATE TABLE [ACT_CMMN_RE_CASEDEF] ([ID_] [varchar](255) NOT NULL, [REV_] [int] NOT NULL, [NAME_] [varchar](255), [KEY_] [varchar](255) NOT NULL, [VERSION_] [varchar](255) NOT NULL, [CATEGORY_] [varchar](255), [DEPLOYMENT_ID_] [varchar](255), [RESOURCE_NAME_] [varchar](4000), [DESCRIPTION_] [varchar](4000), [HAS_GRAPHICAL_NOTATION_] [bit], [TENANT_ID_] [varchar](255) CONSTRAINT [DF_ACT_CMMN_RE_CASEDEF_TENANT_ID_] DEFAULT '' NOT NULL, CONSTRAINT [PK_ACT_CMMN_RE_CASEDEF] PRIMARY KEY ([ID_]))
-GO
-
-ALTER TABLE [ACT_CMMN_RE_CASEDEF] ADD CONSTRAINT [ACT_FK_CASE_DEF_DPLY] FOREIGN KEY ([DEPLOYMENT_ID_]) REFERENCES [ACT_CMMN_RE_DEPLOYMENT] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_CASE_DEF_DPLY ON [ACT_CMMN_RE_CASEDEF]([DEPLOYMENT_ID_])
-GO
-
-CREATE TABLE [ACT_CMMN_RU_CASE_INST] ([ID_] [varchar](255) NOT NULL, [REV_] [int] NOT NULL, [BUSINESS_KEY_] [varchar](255), [NAME_] [varchar](255), [PARENT_ID_] [varchar](255), [CASE_DEF_ID_] [varchar](255), [STATE_] [varchar](255), [START_TIME_] [datetime], [START_USER_ID_] [varchar](255), [CALLBACK_ID_] [varchar](255), [CALLBACK_TYPE_] [varchar](255), [TENANT_ID_] [varchar](255) CONSTRAINT [DF_ACT_CMMN_RU_CASE_INST_TENANT_ID_] DEFAULT '', CONSTRAINT [PK_ACT_CMMN_RU_CASE_INST] PRIMARY KEY ([ID_]))
-GO
-
-ALTER TABLE [ACT_CMMN_RU_CASE_INST] ADD CONSTRAINT [ACT_FK_CASE_INST_CASE_DEF] FOREIGN KEY ([CASE_DEF_ID_]) REFERENCES [ACT_CMMN_RE_CASEDEF] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_CASE_INST_CASE_DEF ON [ACT_CMMN_RU_CASE_INST]([CASE_DEF_ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_CASE_INST_PARENT ON [ACT_CMMN_RU_CASE_INST]([PARENT_ID_])
-GO
-
-CREATE TABLE [ACT_CMMN_RU_PLAN_ITEM_INST] ([ID_] [varchar](255) NOT NULL, [REV_] [int] NOT NULL, [CASE_DEF_ID_] [varchar](255), [CASE_INST_ID_] [varchar](255), [STAGE_INST_ID_] [varchar](255), [IS_STAGE_] [bit], [ELEMENT_ID_] [varchar](255), [NAME_] [varchar](255), [STATE_] [varchar](255), [START_TIME_] [datetime], [START_USER_ID_] [varchar](255), [REFERENCE_ID_] [varchar](255), [REFERENCE_TYPE_] [varchar](255), [TENANT_ID_] [varchar](255) CONSTRAINT [DF_ACT_CMMN_RU_PLAN_ITEM_INST_TENANT_ID_] DEFAULT '', CONSTRAINT [PK_ACT_CMMN_RU_PLAN_ITEM_INST] PRIMARY KEY ([ID_]))
-GO
-
-ALTER TABLE [ACT_CMMN_RU_PLAN_ITEM_INST] ADD CONSTRAINT [ACT_FK_PLAN_ITEM_CASE_DEF] FOREIGN KEY ([CASE_DEF_ID_]) REFERENCES [ACT_CMMN_RE_CASEDEF] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON [ACT_CMMN_RU_PLAN_ITEM_INST]([CASE_DEF_ID_])
-GO
-
-ALTER TABLE [ACT_CMMN_RU_PLAN_ITEM_INST] ADD CONSTRAINT [ACT_FK_PLAN_ITEM_CASE_INST] FOREIGN KEY ([CASE_INST_ID_]) REFERENCES [ACT_CMMN_RU_CASE_INST] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON [ACT_CMMN_RU_PLAN_ITEM_INST]([CASE_INST_ID_])
-GO
-
-CREATE TABLE [ACT_CMMN_RU_SENTRY_ON_PART_INST] ([ID_] [varchar](255) NOT NULL, [REV_] [int] NOT NULL, [CASE_DEF_ID_] [varchar](255), [CASE_INST_ID_] [varchar](255), [PLAN_ITEM_INST_ID_] [varchar](255), [ON_PART_ID_] [varchar](255), [TIME_STAMP_] [datetime], CONSTRAINT [PK_ACT_CMMN_RU_SENTRY_ON_PART_INST] PRIMARY KEY ([ID_]))
-GO
-
-ALTER TABLE [ACT_CMMN_RU_SENTRY_ON_PART_INST] ADD CONSTRAINT [ACT_FK_SENTRY_CASE_DEF] FOREIGN KEY ([CASE_DEF_ID_]) REFERENCES [ACT_CMMN_RE_CASEDEF] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_CASE_DEF ON [ACT_CMMN_RU_SENTRY_ON_PART_INST]([CASE_DEF_ID_])
-GO
-
-ALTER TABLE [ACT_CMMN_RU_SENTRY_ON_PART_INST] ADD CONSTRAINT [ACT_FK_SENTRY_CASE_INST] FOREIGN KEY ([CASE_INST_ID_]) REFERENCES [ACT_CMMN_RU_CASE_INST] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_CASE_INST ON [ACT_CMMN_RU_SENTRY_ON_PART_INST]([CASE_INST_ID_])
-GO
-
-ALTER TABLE [ACT_CMMN_RU_SENTRY_ON_PART_INST] ADD CONSTRAINT [ACT_FK_SENTRY_PLAN_ITEM] FOREIGN KEY ([PLAN_ITEM_INST_ID_]) REFERENCES [ACT_CMMN_RU_PLAN_ITEM_INST] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_PLAN_ITEM ON [ACT_CMMN_RU_SENTRY_ON_PART_INST]([PLAN_ITEM_INST_ID_])
-GO
-
-CREATE TABLE [ACT_CMMN_RU_MIL_INST] ([ID_] [varchar](255) NOT NULL, [NAME_] [varchar](255) NOT NULL, [TIME_STAMP_] [datetime] NOT NULL, [CASE_INST_ID_] [varchar](255) NOT NULL, [CASE_DEF_ID_] [varchar](255) NOT NULL, [ELEMENT_ID_] [varchar](255) NOT NULL, CONSTRAINT [PK_ACT_CMMN_RU_MIL_INST] PRIMARY KEY ([ID_]))
-GO
-
-ALTER TABLE [ACT_CMMN_RU_MIL_INST] ADD CONSTRAINT [ACT_FK_MIL_CASE_DEF] FOREIGN KEY ([CASE_DEF_ID_]) REFERENCES [ACT_CMMN_RE_CASEDEF] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_MIL_CASE_DEF ON [ACT_CMMN_RU_MIL_INST]([CASE_DEF_ID_])
-GO
-
-ALTER TABLE [ACT_CMMN_RU_MIL_INST] ADD CONSTRAINT [ACT_FK_MIL_CASE_INST] FOREIGN KEY ([CASE_INST_ID_]) REFERENCES [ACT_CMMN_RU_CASE_INST] ([ID_])
-GO
-
-CREATE NONCLUSTERED INDEX ACT_IDX_MIL_CASE_INST ON [ACT_CMMN_RU_MIL_INST]([CASE_INST_ID_])
-GO
-
-CREATE TABLE [ACT_CMMN_HI_CASE_INST] ([ID_] [varchar](255) NOT NULL, [REV_] [int] NOT NULL, [BUSINESS_KEY_] [varchar](255), [NAME_] [varchar](255), [PARENT_ID_] [varchar](255), [CASE_DEF_ID_] [varchar](255), [STATE_] [varchar](255), [START_TIME_] [datetime], [END_TIME_] [datetime], [START_USER_ID_] [varchar](255), [CALLBACK_ID_] [varchar](255), [CALLBACK_TYPE_] [varchar](255), [TENANT_ID_] [varchar](255) CONSTRAINT [DF_ACT_CMMN_HI_CASE_INST_TENANT_ID_] DEFAULT '', CONSTRAINT [PK_ACT_CMMN_HI_CASE_INST] PRIMARY KEY ([ID_]))
-GO
-
-CREATE TABLE [ACT_CMMN_HI_MIL_INST] ([ID_] [varchar](255) NOT NULL, [REV_] [int] NOT NULL, [NAME_] [varchar](255) NOT NULL, [TIME_STAMP_] [datetime] NOT NULL, [CASE_INST_ID_] [varchar](255) NOT NULL, [CASE_DEF_ID_] [varchar](255) NOT NULL, [ELEMENT_ID_] [varchar](255) NOT NULL, CONSTRAINT [PK_ACT_CMMN_HI_MIL_INST] PRIMARY KEY ([ID_]))
-GO
-
-INSERT INTO [DATABASECHANGELOG] ([ID], [AUTHOR], [FILENAME], [DATEEXECUTED], [ORDEREXECUTED], [MD5SUM], [DESCRIPTION], [COMMENTS], [EXECTYPE], [CONTEXTS], [LABELS], [LIQUIBASE], [DEPLOYMENT_ID]) VALUES ('1', 'flowable', 'org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml', GETDATE(), 1, '7:28e5931d36abab0185c189c584a7c2d0', 'createTable tableName=ACT_CMMN_RE_DEPLOYMENT; createTable tableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE; addForeignKeyConstraint baseTableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE, constraintName=ACT_FK_CMMN_RSRC_DPL, referencedTableName=ACT_CMMN_RE_DEPLOY...', '', 'EXECUTED', NULL, NULL, '3.5.3', '4471205429')
-GO
-
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mssql.create.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mssql.create.cmmn.sql
new file mode 100644
index 00000000000..c11feb348d3
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mssql.create.cmmn.sql
@@ -0,0 +1,200 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ varchar(255) NOT NULL, NAME_ varchar(255), CATEGORY_ varchar(255), KEY_ varchar(255), DEPLOY_TIME_ datetime, PARENT_DEPLOYMENT_ID_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_DEPLOYMENT_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ varchar(255) NOT NULL, NAME_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_BYTES_ varbinary(MAX), CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, NAME_ varchar(255), KEY_ varchar(255) NOT NULL, VERSION_ int NOT NULL, CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_NAME_ varchar(4000), DESCRIPTION_ varchar(4000), HAS_GRAPHICAL_NOTATION_ bit, TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_CASEDEF_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, BUSINESS_KEY_ varchar(255), NAME_ varchar(255), PARENT_ID_ varchar(255), CASE_DEF_ID_ varchar(255), STATE_ varchar(255), START_TIME_ datetime, START_USER_ID_ varchar(255), CALLBACK_ID_ varchar(255), CALLBACK_TYPE_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_RU_CASE_INST_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, CASE_DEF_ID_ varchar(255), CASE_INST_ID_ varchar(255), STAGE_INST_ID_ varchar(255), IS_STAGE_ bit, ELEMENT_ID_ varchar(255), NAME_ varchar(255), STATE_ varchar(255), START_TIME_ datetime, START_USER_ID_ varchar(255), REFERENCE_ID_ varchar(255), REFERENCE_TYPE_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_RU_PLAN_ITEM_INST_TENANT_ID_ DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, CASE_DEF_ID_ varchar(255), CASE_INST_ID_ varchar(255), PLAN_ITEM_INST_ID_ varchar(255), ON_PART_ID_ varchar(255), IF_PART_ID_ varchar(255), TIME_STAMP_ datetime, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ varchar(255) NOT NULL, NAME_ varchar(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ varchar(255) NOT NULL, CASE_DEF_ID_ varchar(255) NOT NULL, ELEMENT_ID_ varchar(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, BUSINESS_KEY_ varchar(255), NAME_ varchar(255), PARENT_ID_ varchar(255), CASE_DEF_ID_ varchar(255), STATE_ varchar(255), START_TIME_ datetime, END_TIME_ datetime, START_USER_ID_ varchar(255), CALLBACK_ID_ varchar(255), CALLBACK_TYPE_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_HI_CASE_INST_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, NAME_ varchar(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ varchar(255) NOT NULL, CASE_DEF_ID_ varchar(255) NOT NULL, ELEMENT_ID_ varchar(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ varchar(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ bit;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ bit;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ bit;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ bit;
+
+CREATE NONCLUSTERED INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ bit;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ int;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ int;
+
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, NAME_ varchar(255), STATE_ varchar(255), CASE_DEF_ID_ varchar(255), CASE_INST_ID_ varchar(255), STAGE_INST_ID_ varchar(255), IS_STAGE_ bit, ELEMENT_ID_ varchar(255), ITEM_DEFINITION_ID_ varchar(255), ITEM_DEFINITION_TYPE_ varchar(255), CREATED_TIME_ datetime, LAST_AVAILABLE_TIME_ datetime, LAST_ENABLED_TIME_ datetime, LAST_DISABLED_TIME_ datetime, LAST_STARTED_TIME_ datetime, LAST_SUSPENDED_TIME_ datetime, COMPLETED_TIME_ datetime, OCCURRED_TIME_ datetime, TERMINATED_TIME_ datetime, EXIT_TIME_ datetime, ENDED_TIME_ datetime, LAST_UPDATED_TIME_ datetime, START_USER_ID_ varchar(255), REFERENCE_ID_ varchar(255), REFERENCE_TYPE_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_HI_PLAN_ITEM_INST_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_RU_MIL_INST_TENANT_ID_ DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_HI_MIL_INST_TENANT_ID_ DEFAULT '';
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+exec sp_rename 'ACT_CMMN_RU_PLAN_ITEM_INST.START_TIME_', 'CREATE_TIME_', 'COLUMN';
+
+exec sp_rename 'ACT_CMMN_HI_PLAN_ITEM_INST.CREATED_TIME_', 'CREATE_TIME_', 'COLUMN';
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ bit;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ varchar(255);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ varchar(255);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_CASEDEF ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_CASEDEF ALTER COLUMN RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_CASEDEF ALTER COLUMN DGRM_RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ALTER COLUMN BUSINESS_KEY_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ALTER COLUMN BUSINESS_STATUS_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ALTER COLUMN BUSINESS_KEY_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ALTER COLUMN BUSINESS_STATUS_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_CASEDEF ALTER COLUMN DESCRIPTION_ nvarchar(4000);
+
+insert into ACT_GE_PROPERTY
+values ('cmmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mysql.cmmn.create.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mysql.cmmn.create.sql
deleted file mode 100644
index eeeb2fbec41..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mysql.cmmn.create.sql
+++ /dev/null
@@ -1,65 +0,0 @@
-
-CREATE TABLE DATABASECHANGELOG (ID VARCHAR(255) NOT NULL, AUTHOR VARCHAR(255) NOT NULL, FILENAME VARCHAR(255) NOT NULL, DATEEXECUTED datetime NOT NULL, ORDEREXECUTED INT NOT NULL, EXECTYPE VARCHAR(10) NOT NULL, MD5SUM VARCHAR(35) NULL, DESCRIPTION VARCHAR(255) NULL, COMMENTS VARCHAR(255) NULL, TAG VARCHAR(255) NULL, LIQUIBASE VARCHAR(20) NULL, CONTEXTS VARCHAR(255) NULL, LABELS VARCHAR(255) NULL, DEPLOYMENT_ID VARCHAR(10) NULL);
-
-CREATE TABLE ACT_CMMN_RE_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) NULL, CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT PRIMARY KEY (ID_));
-
-CREATE TABLE ACT_CMMN_RE_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RE_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_RE_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
-
-CREATE TABLE ACT_CMMN_RE_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NOT NULL, VERSION_ VARCHAR(255) NOT NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(4000) NULL, DESCRIPTION_ VARCHAR(4000) NULL, HAS_GRAPHICAL_NOTATION_ BIT(1) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NOT NULL, CONSTRAINT PK_ACT_CMMN_RE_CASEDEF PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RE_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_RE_CASEDEF(DEPLOYMENT_ID_);
-
-CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, PARENT_ID_ VARCHAR(255) NULL, CASE_DEF_ID_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, CALLBACK_ID_ VARCHAR(255) NULL, CALLBACK_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
-
-CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
-
-CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255) NULL, CASE_INST_ID_ VARCHAR(255) NULL, STAGE_INST_ID_ VARCHAR(255) NULL, IS_STAGE_ BIT(1) NULL, ELEMENT_ID_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, REFERENCE_ID_ VARCHAR(255) NULL, REFERENCE_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_RU_PLAN_ITEM_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
-
-CREATE TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255) NULL, CASE_INST_ID_ VARCHAR(255) NULL, PLAN_ITEM_INST_ID_ VARCHAR(255) NULL, ON_PART_ID_ VARCHAR(255) NULL, TIME_STAMP_ datetime NULL, CONSTRAINT PK_ACT_CMMN_RU_SENTRY_ON_PART_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_INST_ID_);
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_ON_PART_INST(PLAN_ITEM_INST_ID_);
-
-CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
-
-CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, PARENT_ID_ VARCHAR(255) NULL, CASE_DEF_ID_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, END_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, CALLBACK_ID_ VARCHAR(255) NULL, CALLBACK_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
-
-CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
-
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('1', 'flowable', 'org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml', NOW(), 1, '7:28e5931d36abab0185c189c584a7c2d0', 'createTable tableName=ACT_CMMN_RE_DEPLOYMENT; createTable tableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE; addForeignKeyConstraint baseTableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE, constraintName=ACT_FK_CMMN_RSRC_DPL, referencedTableName=ACT_CMMN_RE_DEPLOY...', '', 'EXECUTED', NULL, NULL, '3.5.3', '4471205295');
-
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mysql.create.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mysql.create.cmmn.sql
new file mode 100644
index 00000000000..2200d2bcf07
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.mysql.create.cmmn.sql
@@ -0,0 +1,178 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(4000) NULL, DESCRIPTION_ VARCHAR(4000) NULL, HAS_GRAPHICAL_NOTATION_ TINYINT NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, PARENT_ID_ VARCHAR(255) NULL, CASE_DEF_ID_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, CALLBACK_ID_ VARCHAR(255) NULL, CALLBACK_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255) NULL, CASE_INST_ID_ VARCHAR(255) NULL, STAGE_INST_ID_ VARCHAR(255) NULL, IS_STAGE_ TINYINT NULL, ELEMENT_ID_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, REFERENCE_ID_ VARCHAR(255) NULL, REFERENCE_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255) NULL, CASE_INST_ID_ VARCHAR(255) NULL, PLAN_ITEM_INST_ID_ VARCHAR(255) NULL, ON_PART_ID_ VARCHAR(255) NULL, IF_PART_ID_ VARCHAR(255) NULL, TIME_STAMP_ datetime NULL, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, PARENT_ID_ VARCHAR(255) NULL, CASE_DEF_ID_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, END_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, CALLBACK_ID_ VARCHAR(255) NULL, CALLBACK_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000) NULL, ADD HAS_START_FORM_KEY_ TINYINT NULL;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ TINYINT NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ datetime NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255) NULL, ADD ITEM_DEFINITION_TYPE_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ TINYINT NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ TINYINT NULL;
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ TINYINT NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INT NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INT NULL;
+
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, CASE_DEF_ID_ VARCHAR(255) NULL, CASE_INST_ID_ VARCHAR(255) NULL, STAGE_INST_ID_ VARCHAR(255) NULL, IS_STAGE_ TINYINT NULL, ELEMENT_ID_ VARCHAR(255) NULL, ITEM_DEFINITION_ID_ VARCHAR(255) NULL, ITEM_DEFINITION_TYPE_ VARCHAR(255) NULL, CREATED_TIME_ datetime NULL, LAST_AVAILABLE_TIME_ datetime NULL, LAST_ENABLED_TIME_ datetime NULL, LAST_DISABLED_TIME_ datetime NULL, LAST_STARTED_TIME_ datetime NULL, LAST_SUSPENDED_TIME_ datetime NULL, COMPLETED_TIME_ datetime NULL, OCCURRED_TIME_ datetime NULL, TERMINATED_TIME_ datetime NULL, EXIT_TIME_ datetime NULL, ENDED_TIME_ datetime NULL, LAST_UPDATED_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, REFERENCE_ID_ VARCHAR(255) NULL, REFERENCE_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '' NULL;
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '' NULL;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT MODIFY DEPLOY_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST MODIFY START_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST MODIFY START_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST MODIFY TIME_STAMP_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST MODIFY TIME_STAMP_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST MODIFY START_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST MODIFY END_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST MODIFY TIME_STAMP_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST MODIFY LOCK_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY CREATED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_AVAILABLE_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_ENABLED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_DISABLED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_STARTED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_SUSPENDED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY COMPLETED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY OCCURRED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY TERMINATED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY EXIT_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY ENDED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_UPDATED_TIME_ datetime(3);
+
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST CHANGE START_TIME_ CREATE_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST CHANGE CREATED_TIME_ CREATE_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ datetime(3) NULL, ADD LAST_ENABLED_TIME_ datetime(3) NULL, ADD LAST_DISABLED_TIME_ datetime(3) NULL, ADD LAST_STARTED_TIME_ datetime(3) NULL, ADD LAST_SUSPENDED_TIME_ datetime(3) NULL, ADD COMPLETED_TIME_ datetime(3) NULL, ADD OCCURRED_TIME_ datetime(3) NULL, ADD TERMINATED_TIME_ datetime(3) NULL, ADD EXIT_TIME_ datetime(3) NULL, ADD ENDED_TIME_ datetime(3) NULL, ADD ENTRY_CRITERION_ID_ VARCHAR(255) NULL, ADD EXIT_CRITERION_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255) NULL, ADD EXIT_CRITERION_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ TINYINT NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255) NULL;
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ datetime(3) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ datetime(3) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ datetime(3) NULL, ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ datetime(3) NULL, ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255) NULL;
+
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
+
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('cmmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.oracle.cmmn.create.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.oracle.cmmn.create.sql
deleted file mode 100644
index 5869471358d..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.oracle.cmmn.create.sql
+++ /dev/null
@@ -1,67 +0,0 @@
-
-SET DEFINE OFF;
-
-CREATE TABLE DATABASECHANGELOG (ID VARCHAR2(255) NOT NULL, AUTHOR VARCHAR2(255) NOT NULL, FILENAME VARCHAR2(255) NOT NULL, DATEEXECUTED TIMESTAMP NOT NULL, ORDEREXECUTED INTEGER NOT NULL, EXECTYPE VARCHAR2(10) NOT NULL, MD5SUM VARCHAR2(35), DESCRIPTION VARCHAR2(255), COMMENTS VARCHAR2(255), TAG VARCHAR2(255), LIQUIBASE VARCHAR2(20), CONTEXTS VARCHAR2(255), LABELS VARCHAR2(255), DEPLOYMENT_ID VARCHAR2(10));
-
-CREATE TABLE ACT_CMMN_RE_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255), CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT PRIMARY KEY (ID_));
-
-CREATE TABLE ACT_CMMN_RE_DEPLOYMENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT_RESO PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RE_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_RE_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
-
-CREATE TABLE ACT_CMMN_RE_CASEDEF (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255), KEY_ VARCHAR2(255) NOT NULL, VERSION_ VARCHAR2(255) NOT NULL, CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(4000), DESCRIPTION_ VARCHAR2(4000), HAS_GRAPHICAL_NOTATION_ NUMBER(1), TENANT_ID_ VARCHAR2(255) DEFAULT '' NOT NULL, CONSTRAINT PK_ACT_CMMN_RE_CASEDEF PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RE_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_RE_CASEDEF(DEPLOYMENT_ID_);
-
-CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR2(255), NAME_ VARCHAR2(255), PARENT_ID_ VARCHAR2(255), CASE_DEF_ID_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), CALLBACK_ID_ VARCHAR2(255), CALLBACK_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
-
-CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
-
-CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR2(255), CASE_INST_ID_ VARCHAR2(255), STAGE_INST_ID_ VARCHAR2(255), IS_STAGE_ NUMBER(1), ELEMENT_ID_ VARCHAR2(255), NAME_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), REFERENCE_ID_ VARCHAR2(255), REFERENCE_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_PLAN_ITEM_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
-
-CREATE TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR2(255), CASE_INST_ID_ VARCHAR2(255), PLAN_ITEM_INST_ID_ VARCHAR2(255), ON_PART_ID_ VARCHAR2(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_ACT_CMMN_RU_SENTRY_ON_PART_ PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_INST_ID_);
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_ON_PART_INST(PLAN_ITEM_INST_ID_);
-
-CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR2(255) NOT NULL, CASE_DEF_ID_ VARCHAR2(255) NOT NULL, ELEMENT_ID_ VARCHAR2(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
-
-CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR2(255), NAME_ VARCHAR2(255), PARENT_ID_ VARCHAR2(255), CASE_DEF_ID_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), CALLBACK_ID_ VARCHAR2(255), CALLBACK_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
-
-CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR2(255) NOT NULL, CASE_DEF_ID_ VARCHAR2(255) NOT NULL, ELEMENT_ID_ VARCHAR2(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
-
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('1', 'flowable', 'org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml', SYSTIMESTAMP, 1, '7:28e5931d36abab0185c189c584a7c2d0', 'createTable tableName=ACT_CMMN_RE_DEPLOYMENT; createTable tableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE; addForeignKeyConstraint baseTableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE, constraintName=ACT_FK_CMMN_RSRC_DPL, referencedTableName=ACT_CMMN_RE_DEPLOY...', '', 'EXECUTED', NULL, NULL, '3.5.3', '4471204819');
-
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.oracle.create.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.oracle.create.cmmn.sql
new file mode 100644
index 00000000000..a9bfedb5f70
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.oracle.create.cmmn.sql
@@ -0,0 +1,168 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), KEY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255), KEY_ VARCHAR2(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(4000), DESCRIPTION_ VARCHAR2(4000), HAS_GRAPHICAL_NOTATION_ NUMBER(1), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR2(255), NAME_ VARCHAR2(255), PARENT_ID_ VARCHAR2(255), CASE_DEF_ID_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), CALLBACK_ID_ VARCHAR2(255), CALLBACK_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR2(255), CASE_INST_ID_ VARCHAR2(255), STAGE_INST_ID_ VARCHAR2(255), IS_STAGE_ NUMBER(1), ELEMENT_ID_ VARCHAR2(255), NAME_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), REFERENCE_ID_ VARCHAR2(255), REFERENCE_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR2(255), CASE_INST_ID_ VARCHAR2(255), PLAN_ITEM_INST_ID_ VARCHAR2(255), ON_PART_ID_ VARCHAR2(255), IF_PART_ID_ VARCHAR2(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR2(255) NOT NULL, CASE_DEF_ID_ VARCHAR2(255) NOT NULL, ELEMENT_ID_ VARCHAR2(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR2(255), NAME_ VARCHAR2(255), PARENT_ID_ VARCHAR2(255), CASE_DEF_ID_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), CALLBACK_ID_ VARCHAR2(255), CALLBACK_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR2(255) NOT NULL, CASE_DEF_ID_ VARCHAR2(255) NOT NULL, ELEMENT_ID_ VARCHAR2(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR2(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ NUMBER(1);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INTEGER;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INTEGER;
+
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255), STATE_ VARCHAR2(255), CASE_DEF_ID_ VARCHAR2(255), CASE_INST_ID_ VARCHAR2(255), STAGE_INST_ID_ VARCHAR2(255), IS_STAGE_ NUMBER(1), ELEMENT_ID_ VARCHAR2(255), ITEM_DEFINITION_ID_ VARCHAR2(255), ITEM_DEFINITION_TYPE_ VARCHAR2(255), CREATED_TIME_ TIMESTAMP, LAST_AVAILABLE_TIME_ TIMESTAMP, LAST_ENABLED_TIME_ TIMESTAMP, LAST_DISABLED_TIME_ TIMESTAMP, LAST_STARTED_TIME_ TIMESTAMP, LAST_SUSPENDED_TIME_ TIMESTAMP, COMPLETED_TIME_ TIMESTAMP, OCCURRED_TIME_ TIMESTAMP, TERMINATED_TIME_ TIMESTAMP, EXIT_TIME_ TIMESTAMP, ENDED_TIME_ TIMESTAMP, LAST_UPDATED_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), REFERENCE_ID_ VARCHAR2(255), REFERENCE_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR2(255) DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR2(255) DEFAULT '';
+
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST RENAME COLUMN START_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST RENAME COLUMN CREATED_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR2(255);
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR2(255);
+
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
+
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('cmmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.postgres.cmmn.create.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.postgres.cmmn.create.sql
deleted file mode 100644
index 92a21b2e091..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.postgres.cmmn.create.sql
+++ /dev/null
@@ -1,65 +0,0 @@
-
-CREATE TABLE databasechangelog (ID VARCHAR(255) NOT NULL, AUTHOR VARCHAR(255) NOT NULL, FILENAME VARCHAR(255) NOT NULL, DATEEXECUTED TIMESTAMP WITHOUT TIME ZONE NOT NULL, ORDEREXECUTED INT NOT NULL, EXECTYPE VARCHAR(10) NOT NULL, MD5SUM VARCHAR(35), DESCRIPTION VARCHAR(255), COMMENTS VARCHAR(255), TAG VARCHAR(255), LIQUIBASE VARCHAR(20), CONTEXTS VARCHAR(255), LABELS VARCHAR(255), DEPLOYMENT_ID VARCHAR(10));
-
-CREATE TABLE ACT_CMMN_RE_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP WITHOUT TIME ZONE, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT PRIMARY KEY (ID_));
-
-CREATE TABLE ACT_CMMN_RE_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT PK_ACT_CMMN_RE_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RE_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_RE_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
-
-CREATE TABLE ACT_CMMN_RE_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ VARCHAR(255) NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '' NOT NULL, CONSTRAINT PK_ACT_CMMN_RE_CASEDEF PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RE_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_RE_DEPLOYMENT (ID_);
-
-CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_RE_CASEDEF(DEPLOYMENT_ID_);
-
-CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
-
-CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
-
-CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_PLAN_ITEM_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
-
-CREATE TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE, CONSTRAINT PK_ACT_CMMN_RU_SENTRY_ON_PART_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_ON_PART_INST(CASE_INST_ID_);
-
-ALTER TABLE ACT_CMMN_RU_SENTRY_ON_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
-
-CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_ON_PART_INST(PLAN_ITEM_INST_ID_);
-
-CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
-
-ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_RE_CASEDEF (ID_);
-
-CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
-
-ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
-
-CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
-
-CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, END_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
-
-CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
-
-INSERT INTO databasechangelog (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('1', 'flowable', 'org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml', NOW(), 1, '7:28e5931d36abab0185c189c584a7c2d0', 'createTable tableName=ACT_CMMN_RE_DEPLOYMENT; createTable tableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE; addForeignKeyConstraint baseTableName=ACT_CMMN_RE_DEPLOYMENT_RESOURCE, constraintName=ACT_FK_CMMN_RSRC_DPL, referencedTableName=ACT_CMMN_RE_DEPLOY...', '', 'EXECUTED', NULL, NULL, '3.5.3', '4471205537');
-
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.postgres.create.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.postgres.create.cmmn.sql
new file mode 100644
index 00000000000..2b94aacc93f
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/create/flowable.postgres.create.cmmn.sql
@@ -0,0 +1,168 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP WITHOUT TIME ZONE, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_CMMN_DEPLOYMENT_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_CMMN_CASEDEF_pkey" PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_CMMN_RU_CASE_INST_pkey" PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), IF_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT "ACT_CMMN_RU_MIL_INST_pkey" PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, END_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_CMMN_HI_CASE_INST_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT "ACT_CMMN_HI_MIL_INST_pkey" PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INTEGER;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INTEGER;
+
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), STATE_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), ITEM_DEFINITION_ID_ VARCHAR(255), ITEM_DEFINITION_TYPE_ VARCHAR(255), CREATED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_AVAILABLE_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_ENABLED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_DISABLED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_STARTED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_SUSPENDED_TIME_ TIMESTAMP WITHOUT TIME ZONE, COMPLETED_TIME_ TIMESTAMP WITHOUT TIME ZONE, OCCURRED_TIME_ TIMESTAMP WITHOUT TIME ZONE, TERMINATED_TIME_ TIMESTAMP WITHOUT TIME ZONE, EXIT_TIME_ TIMESTAMP WITHOUT TIME ZONE, ENDED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_UPDATED_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT "ACT_CMMN_HI_PLAN_ITEM_INST_pkey" PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST RENAME COLUMN START_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST RENAME COLUMN CREATED_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
+
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('cmmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog-crdb.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog-crdb.xml
deleted file mode 100644
index 8be6ebbb9fe..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog-crdb.xml
+++ /dev/null
@@ -1,579 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-                        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
-                        http://www.liquibase.org/xml/ns/dbchangelog-ext 
-                        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
-    <changeSet id="1" author="flowable">
-
-        <createTable tableName="ACT_CMMN_DEPLOYMENT">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="CATEGORY_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="KEY_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="DEPLOY_TIME_" type="datetime">
-                <constraints nullable="true" />
-            </column>
-            <column name="PARENT_DEPLOYMENT_ID_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <createTable tableName="ACT_CMMN_DEPLOYMENT_RESOURCE">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" primaryKeyName="PK_CMMN_DEPLOYMENT_RESOURCE" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="RESOURCE_BYTES_" type="longblob">
-                <constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <addForeignKeyConstraint constraintName="ACT_FK_CMMN_RSRC_DPL" 
-            referencedTableName="ACT_CMMN_DEPLOYMENT"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_DEPLOYMENT_RESOURCE" 
-            baseColumnNames="DEPLOYMENT_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_DEPLOYMENT_RESOURCE" indexName="ACT_IDX_CMMN_RSRC_DPL">
-            <column name="DEPLOYMENT_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_CMMN_CASEDEF">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="KEY_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="VERSION_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="CATEGORY_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="RESOURCE_NAME_" type="varchar(4000)" />
-            <column name="DESCRIPTION_" type="varchar(4000)" />
-            <column name="HAS_GRAPHICAL_NOTATION_" type="boolean" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-        
-        <addForeignKeyConstraint constraintName="ACT_FK_CASE_DEF_DPLY" 
-            referencedTableName="ACT_CMMN_DEPLOYMENT"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_CASEDEF" 
-            baseColumnNames="DEPLOYMENT_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_CASEDEF" indexName="ACT_IDX_CASE_DEF_DPLY">
-            <column name="DEPLOYMENT_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="BUSINESS_KEY_" type="varchar(255)" />
-            <column name="NAME_" type="varchar(255)" />
-            <column name="PARENT_ID_" type="varchar(255)" />
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="STATE_" type="varchar(255)" />
-            <column name="START_TIME_" type="datetime" />
-            <column name="START_USER_ID_" type="varchar(255)" />
-            <column name="CALLBACK_ID_" type="varchar(255)" />
-            <column name="CALLBACK_TYPE_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <addForeignKeyConstraint constraintName="ACT_FK_CASE_INST_CASE_DEF" 
-            referencedTableName="ACT_CMMN_CASEDEF"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_CASE_INST" 
-            baseColumnNames="CASE_DEF_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_CASE_INST" indexName="ACT_IDX_CASE_INST_CASE_DEF">
-            <column name="CASE_DEF_ID_" />
-        </createIndex>
-        
-        <!-- Note: no foreign key for parent id, as this won't work for non-blocking subcases -->
-                
-        <createIndex tableName="ACT_CMMN_RU_CASE_INST" indexName="ACT_IDX_CASE_INST_PARENT">
-            <column name="PARENT_ID_" />
-        </createIndex>           
-
-        <createTable tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" primaryKeyName="PK_CMMN_PLAN_ITEM_INST" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="CASE_INST_ID_" type="varchar(255)" />
-            <column name="STAGE_INST_ID_" type="varchar(255)" />
-            <column name="IS_STAGE_" type="boolean" />
-            <column name="ELEMENT_ID_" type="varchar(255)" />
-            <column name="NAME_" type="varchar(255)" />
-            <column name="STATE_" type="varchar(255)" />
-            <column name="START_TIME_" type="datetime" />
-            <column name="START_USER_ID_" type="varchar(255)" />
-            <column name="REFERENCE_ID_" type="varchar(255)" />
-            <column name="REFERENCE_TYPE_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <addForeignKeyConstraint constraintName="ACT_FK_PLAN_ITEM_CASE_DEF" 
-            referencedTableName="ACT_CMMN_CASEDEF"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_PLAN_ITEM_INST" 
-            baseColumnNames="CASE_DEF_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_PLAN_ITEM_INST" indexName="ACT_IDX_PLAN_ITEM_CASE_DEF">
-            <column name="CASE_DEF_ID_" />
-        </createIndex>                
-
-        <addForeignKeyConstraint constraintName="ACT_FK_PLAN_ITEM_CASE_INST" 
-            referencedTableName="ACT_CMMN_RU_CASE_INST"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_PLAN_ITEM_INST" 
-            baseColumnNames="CASE_INST_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_PLAN_ITEM_INST" indexName="ACT_IDX_PLAN_ITEM_CASE_INST">
-            <column name="CASE_INST_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_CMMN_RU_SENTRY_PART_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" primaryKeyName="PK_CMMN_SENTRY_PART_INST"/>
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="CASE_INST_ID_" type="varchar(255)" />
-            <column name="PLAN_ITEM_INST_ID_" type="varchar(255)" />
-            <column name="ON_PART_ID_" type="varchar(255)" />
-            <column name="IF_PART_ID_" type="varchar(255)" />
-            <column name="TIME_STAMP_" type="datetime" />
-        </createTable>
-
-        <addForeignKeyConstraint constraintName="ACT_FK_SENTRY_CASE_DEF" 
-            referencedTableName="ACT_CMMN_CASEDEF"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_SENTRY_PART_INST" 
-            baseColumnNames="CASE_DEF_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_SENTRY_PART_INST" indexName="ACT_IDX_SENTRY_CASE_DEF">
-            <column name="CASE_DEF_ID_" />
-        </createIndex>            
-
-        <addForeignKeyConstraint constraintName="ACT_FK_SENTRY_CASE_INST" 
-            referencedTableName="ACT_CMMN_RU_CASE_INST"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_SENTRY_PART_INST" 
-            baseColumnNames="CASE_INST_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_SENTRY_PART_INST" indexName="ACT_IDX_SENTRY_CASE_INST">
-            <column name="CASE_INST_ID_" />
-        </createIndex>               
-
-        <addForeignKeyConstraint constraintName="ACT_FK_SENTRY_PLAN_ITEM" 
-            referencedTableName="ACT_CMMN_RU_PLAN_ITEM_INST"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_SENTRY_PART_INST" 
-            baseColumnNames="PLAN_ITEM_INST_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_SENTRY_PART_INST" indexName="ACT_IDX_SENTRY_PLAN_ITEM">
-            <column name="PLAN_ITEM_INST_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_CMMN_RU_MIL_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="TIME_STAMP_" type="datetime">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_INST_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_DEF_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="ELEMENT_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-        </createTable>
-
-        <addForeignKeyConstraint constraintName="ACT_FK_MIL_CASE_DEF" 
-            referencedTableName="ACT_CMMN_CASEDEF" 
-            referencedColumnNames="ID_"
-            baseTableName="ACT_CMMN_RU_MIL_INST" 
-            baseColumnNames="CASE_DEF_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_MIL_INST" indexName="ACT_IDX_MIL_CASE_DEF">
-            <column name="CASE_DEF_ID_" />
-        </createIndex>  
-
-        <addForeignKeyConstraint constraintName="ACT_FK_MIL_CASE_INST" 
-            referencedTableName="ACT_CMMN_RU_CASE_INST"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_MIL_INST" 
-            baseColumnNames="CASE_INST_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_MIL_INST" indexName="ACT_IDX_MIL_CASE_INST">
-            <column name="CASE_INST_ID_" />
-        </createIndex>                   
-
-        <createTable tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="BUSINESS_KEY_" type="varchar(255)" />
-            <column name="NAME_" type="varchar(255)" />
-            <column name="PARENT_ID_" type="varchar(255)" />
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="STATE_" type="varchar(255)" />
-            <column name="START_TIME_" type="datetime" />
-            <column name="END_TIME_" type="datetime" />
-            <column name="START_USER_ID_" type="varchar(255)" />
-            <column name="CALLBACK_ID_" type="varchar(255)" />
-            <column name="CALLBACK_TYPE_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <createTable tableName="ACT_CMMN_HI_MIL_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="TIME_STAMP_" type="datetime">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_INST_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_DEF_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="ELEMENT_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-        </createTable>
-
-    </changeSet>
-
-    <changeSet id="2" author="flowable">
-    
-        <addColumn tableName="ACT_CMMN_CASEDEF">
-            <column name="DGRM_RESOURCE_NAME_" type="varchar(4000)"/>
-            <column name="HAS_START_FORM_KEY_" type="boolean"/>
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_DEPLOYMENT_RESOURCE">
-            <column name="GENERATED_" type="boolean"/>
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="LOCK_TIME_" type="datetime" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="ITEM_DEFINITION_ID_" type="varchar(255)" />
-            <column name="ITEM_DEFINITION_TYPE_" type="varchar(255)" />
-        </addColumn>        
-    
-    </changeSet>
-    
-    <changeSet id="3" author="flowable">
-    
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="IS_COMPLETEABLE_" type="boolean" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="IS_COMPLETEABLE_" type="boolean" />
-        </addColumn>
-        
-        <createIndex tableName="ACT_CMMN_RU_PLAN_ITEM_INST" indexName="ACT_IDX_PLAN_ITEM_STAGE_INST">
-            <column name="STAGE_INST_ID_" />
-        </createIndex>  
-        
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="IS_COUNT_ENABLED_" type="boolean" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="VAR_COUNT_" type="integer" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="SENTRY_PART_INST_COUNT_" type="integer" />
-        </addColumn>
-    </changeSet>
-
-    <changeSet id="4" author="flowable">
-
-        <createTable tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="STATE_" type="varchar(255)" />
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="CASE_INST_ID_" type="varchar(255)" />
-            <column name="STAGE_INST_ID_" type="varchar(255)" />
-            <column name="IS_STAGE_" type="boolean" />
-            <column name="ELEMENT_ID_" type="varchar(255)" />
-            <column name="ITEM_DEFINITION_ID_" type="varchar(255)" />
-            <column name="ITEM_DEFINITION_TYPE_" type="varchar(255)" />
-            <column name="CREATED_TIME_" type="datetime" />
-            <column name="LAST_AVAILABLE_TIME_" type="datetime" />
-            <column name="LAST_ENABLED_TIME_" type="datetime" />
-            <column name="LAST_DISABLED_TIME_" type="datetime" />
-            <column name="LAST_STARTED_TIME_" type="datetime" />
-            <column name="LAST_SUSPENDED_TIME_" type="datetime" />
-            <column name="COMPLETED_TIME_" type="datetime" />
-            <column name="OCCURRED_TIME_" type="datetime" />
-            <column name="TERMINATED_TIME_" type="datetime" />
-            <column name="EXIT_TIME_" type="datetime" />
-            <column name="ENDED_TIME_" type="datetime" />
-            <column name="LAST_UPDATED_TIME_" type="datetime" />
-            <column name="START_USER_ID_" type="varchar(255)" />
-            <column name="REFERENCE_ID_" type="varchar(255)" />
-            <column name="REFERENCE_TYPE_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-        
-        <addColumn tableName="ACT_CMMN_RU_MIL_INST">
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_HI_MIL_INST">
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="5" author="flowable" dbms="mysql">
-
-        <modifyDataType tableName="ACT_CMMN_DEPLOYMENT" columnName="DEPLOY_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_PLAN_ITEM_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_SENTRY_PART_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_MIL_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="END_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_MIL_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="LOCK_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="CREATED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_AVAILABLE_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_ENABLED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_DISABLED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_STARTED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_SUSPENDED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="COMPLETED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="OCCURRED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="TERMINATED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="EXIT_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="ENDED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_UPDATED_TIME_" newDataType="datetime(3)" />
-
-    </changeSet>
-    
-    <changeSet id="6" author="flowable">
-        
-        <createIndex tableName="ACT_CMMN_CASEDEF" indexName="ACT_IDX_CASE_DEF_UNIQ" unique="true">
-            <column name="KEY_" />
-            <column name="VERSION_" />
-            <column name="TENANT_ID_" />
-        </createIndex>
-        
-    </changeSet>
-
-    <!--
-        CRDB cannot alter a table and add a colum with datetime(3):
-        Caused by: org.postgresql.util.PSQLException: ERROR: unimplemented at or near "zone"
-        Detail: source SQL: ALTER TABLE public.ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE
-        -->
-    <changeSet id="7" author="flowable">
-
-        <!-- rename CREATE_TIME to CREATE_TIME to avoid confusion with the start event of CMMN -->
-        <renameColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST" oldColumnName="START_TIME_" newColumnName="CREATE_TIME_" />
-        <renameColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST" oldColumnName="CREATED_TIME_" newColumnName="CREATE_TIME_" />
-
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-
-            <column name="LAST_AVAILABLE_TIME_" type="datetime" />
-            <column name="LAST_ENABLED_TIME_" type="datetime" />
-            <column name="LAST_DISABLED_TIME_" type="datetime" />
-            <column name="LAST_STARTED_TIME_" type="datetime" />
-            <column name="LAST_SUSPENDED_TIME_" type="datetime" />
-            <column name="COMPLETED_TIME_" type="datetime" />
-            <column name="OCCURRED_TIME_" type="datetime" />
-            <column name="TERMINATED_TIME_" type="datetime" />
-            <column name="EXIT_TIME_" type="datetime" />
-            <column name="ENDED_TIME_" type="datetime" />
-
-            <column name="ENTRY_CRITERION_ID_" type="varchar(255)" />
-            <column name="EXIT_CRITERION_ID_" type="varchar(255)" />
-
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-
-            <column name="ENTRY_CRITERION_ID_" type="varchar(255)" />
-            <column name="EXIT_CRITERION_ID_" type="varchar(255)" />
-
-        </addColumn>
-
-
-    </changeSet>
-    
-    <changeSet id="8" author="flowable">
-    
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="SHOW_IN_OVERVIEW_" type="boolean" />
-        </addColumn>
-    
-    </changeSet>
-
-    <changeSet id="9" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="DERIVED_CASE_DEF_ID_" type="varchar(255)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="DERIVED_CASE_DEF_ID_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="10" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="LOCK_OWNER_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="11" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="LAST_UNAVAILABLE_TIME_" type="datetime" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="LAST_UNAVAILABLE_TIME_" type="datetime" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="12" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="LAST_REACTIVATION_TIME_" type="datetime" />
-            <column name="LAST_REACTIVATION_USER_ID_" type="varchar(255)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="LAST_REACTIVATION_TIME_" type="datetime" />
-            <column name="LAST_REACTIVATION_USER_ID_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="13" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="LAST_UNAVAILABLE_TIME_" type="datetime(3)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="LAST_UNAVAILABLE_TIME_" type="datetime(3)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="14" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="LAST_REACTIVATION_TIME_" type="datetime(3)" />
-            <column name="LAST_REACTIVATION_USER_ID_" type="varchar(255)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="LAST_REACTIVATION_TIME_" type="datetime(3)" />
-            <column name="LAST_REACTIVATION_USER_ID_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="15" author="flowable" dbms="mariadb">
-
-        <modifyDataType tableName="ACT_CMMN_DEPLOYMENT" columnName="DEPLOY_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_PLAN_ITEM_INST" columnName="CREATE_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_SENTRY_PART_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_MIL_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="END_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_MIL_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="LOCK_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="CREATE_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_AVAILABLE_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_ENABLED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_DISABLED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_STARTED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_SUSPENDED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="COMPLETED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="OCCURRED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="TERMINATED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="EXIT_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="ENDED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_UPDATED_TIME_" newDataType="datetime(3)" />
-
-    </changeSet>
-    
-    <changeSet id="16" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="BUSINESS_STATUS_" type="varchar(255)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="BUSINESS_STATUS_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-</databaseChangeLog>
\ No newline at end of file
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml
deleted file mode 100644
index aefd19d300f..00000000000
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/liquibase/flowable-cmmn-db-changelog.xml
+++ /dev/null
@@ -1,616 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-                        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
-                        http://www.liquibase.org/xml/ns/dbchangelog-ext
-                        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
-    <changeSet id="1" author="flowable">
-
-        <createTable tableName="ACT_CMMN_DEPLOYMENT">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="CATEGORY_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="KEY_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="DEPLOY_TIME_" type="datetime">
-                <constraints nullable="true" />
-            </column>
-            <column name="PARENT_DEPLOYMENT_ID_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <createTable tableName="ACT_CMMN_DEPLOYMENT_RESOURCE">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" primaryKeyName="PK_CMMN_DEPLOYMENT_RESOURCE" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="RESOURCE_BYTES_" type="longblob">
-                <constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <addForeignKeyConstraint constraintName="ACT_FK_CMMN_RSRC_DPL" 
-            referencedTableName="ACT_CMMN_DEPLOYMENT"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_DEPLOYMENT_RESOURCE" 
-            baseColumnNames="DEPLOYMENT_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_DEPLOYMENT_RESOURCE" indexName="ACT_IDX_CMMN_RSRC_DPL">
-            <column name="DEPLOYMENT_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_CMMN_CASEDEF">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="KEY_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="VERSION_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="CATEGORY_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="RESOURCE_NAME_" type="varchar(4000)" />
-            <column name="DESCRIPTION_" type="varchar(4000)" />
-            <column name="HAS_GRAPHICAL_NOTATION_" type="boolean" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-        
-        <addForeignKeyConstraint constraintName="ACT_FK_CASE_DEF_DPLY" 
-            referencedTableName="ACT_CMMN_DEPLOYMENT"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_CASEDEF" 
-            baseColumnNames="DEPLOYMENT_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_CASEDEF" indexName="ACT_IDX_CASE_DEF_DPLY">
-            <column name="DEPLOYMENT_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="BUSINESS_KEY_" type="varchar(255)" />
-            <column name="NAME_" type="varchar(255)" />
-            <column name="PARENT_ID_" type="varchar(255)" />
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="STATE_" type="varchar(255)" />
-            <column name="START_TIME_" type="datetime" />
-            <column name="START_USER_ID_" type="varchar(255)" />
-            <column name="CALLBACK_ID_" type="varchar(255)" />
-            <column name="CALLBACK_TYPE_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <addForeignKeyConstraint constraintName="ACT_FK_CASE_INST_CASE_DEF" 
-            referencedTableName="ACT_CMMN_CASEDEF"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_CASE_INST" 
-            baseColumnNames="CASE_DEF_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_CASE_INST" indexName="ACT_IDX_CASE_INST_CASE_DEF">
-            <column name="CASE_DEF_ID_" />
-        </createIndex>
-        
-        <!-- Note: no foreign key for parent id, as this won't work for non-blocking subcases -->
-                
-        <createIndex tableName="ACT_CMMN_RU_CASE_INST" indexName="ACT_IDX_CASE_INST_PARENT">
-            <column name="PARENT_ID_" />
-        </createIndex>           
-
-        <createTable tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" primaryKeyName="PK_CMMN_PLAN_ITEM_INST" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="CASE_INST_ID_" type="varchar(255)" />
-            <column name="STAGE_INST_ID_" type="varchar(255)" />
-            <column name="IS_STAGE_" type="boolean" />
-            <column name="ELEMENT_ID_" type="varchar(255)" />
-            <column name="NAME_" type="varchar(255)" />
-            <column name="STATE_" type="varchar(255)" />
-            <column name="START_TIME_" type="datetime" />
-            <column name="START_USER_ID_" type="varchar(255)" />
-            <column name="REFERENCE_ID_" type="varchar(255)" />
-            <column name="REFERENCE_TYPE_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <addForeignKeyConstraint constraintName="ACT_FK_PLAN_ITEM_CASE_DEF" 
-            referencedTableName="ACT_CMMN_CASEDEF"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_PLAN_ITEM_INST" 
-            baseColumnNames="CASE_DEF_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_PLAN_ITEM_INST" indexName="ACT_IDX_PLAN_ITEM_CASE_DEF">
-            <column name="CASE_DEF_ID_" />
-        </createIndex>                
-
-        <addForeignKeyConstraint constraintName="ACT_FK_PLAN_ITEM_CASE_INST" 
-            referencedTableName="ACT_CMMN_RU_CASE_INST"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_PLAN_ITEM_INST" 
-            baseColumnNames="CASE_INST_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_PLAN_ITEM_INST" indexName="ACT_IDX_PLAN_ITEM_CASE_INST">
-            <column name="CASE_INST_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_CMMN_RU_SENTRY_PART_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" primaryKeyName="PK_CMMN_SENTRY_PART_INST"/>
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="CASE_INST_ID_" type="varchar(255)" />
-            <column name="PLAN_ITEM_INST_ID_" type="varchar(255)" />
-            <column name="ON_PART_ID_" type="varchar(255)" />
-            <column name="IF_PART_ID_" type="varchar(255)" />
-            <column name="TIME_STAMP_" type="datetime" />
-        </createTable>
-
-        <addForeignKeyConstraint constraintName="ACT_FK_SENTRY_CASE_DEF" 
-            referencedTableName="ACT_CMMN_CASEDEF"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_SENTRY_PART_INST" 
-            baseColumnNames="CASE_DEF_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_SENTRY_PART_INST" indexName="ACT_IDX_SENTRY_CASE_DEF">
-            <column name="CASE_DEF_ID_" />
-        </createIndex>            
-
-        <addForeignKeyConstraint constraintName="ACT_FK_SENTRY_CASE_INST" 
-            referencedTableName="ACT_CMMN_RU_CASE_INST"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_SENTRY_PART_INST" 
-            baseColumnNames="CASE_INST_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_SENTRY_PART_INST" indexName="ACT_IDX_SENTRY_CASE_INST">
-            <column name="CASE_INST_ID_" />
-        </createIndex>               
-
-        <addForeignKeyConstraint constraintName="ACT_FK_SENTRY_PLAN_ITEM" 
-            referencedTableName="ACT_CMMN_RU_PLAN_ITEM_INST"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_SENTRY_PART_INST" 
-            baseColumnNames="PLAN_ITEM_INST_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_SENTRY_PART_INST" indexName="ACT_IDX_SENTRY_PLAN_ITEM">
-            <column name="PLAN_ITEM_INST_ID_" />
-        </createIndex>            
-
-        <createTable tableName="ACT_CMMN_RU_MIL_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="TIME_STAMP_" type="datetime">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_INST_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_DEF_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="ELEMENT_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-        </createTable>
-
-        <addForeignKeyConstraint constraintName="ACT_FK_MIL_CASE_DEF" 
-            referencedTableName="ACT_CMMN_CASEDEF" 
-            referencedColumnNames="ID_"
-            baseTableName="ACT_CMMN_RU_MIL_INST" 
-            baseColumnNames="CASE_DEF_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_MIL_INST" indexName="ACT_IDX_MIL_CASE_DEF">
-            <column name="CASE_DEF_ID_" />
-        </createIndex>  
-
-        <addForeignKeyConstraint constraintName="ACT_FK_MIL_CASE_INST" 
-            referencedTableName="ACT_CMMN_RU_CASE_INST"
-            referencedColumnNames="ID_" 
-            baseTableName="ACT_CMMN_RU_MIL_INST" 
-            baseColumnNames="CASE_INST_ID_" />
-            
-        <createIndex tableName="ACT_CMMN_RU_MIL_INST" indexName="ACT_IDX_MIL_CASE_INST">
-            <column name="CASE_INST_ID_" />
-        </createIndex>                   
-
-        <createTable tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="BUSINESS_KEY_" type="varchar(255)" />
-            <column name="NAME_" type="varchar(255)" />
-            <column name="PARENT_ID_" type="varchar(255)" />
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="STATE_" type="varchar(255)" />
-            <column name="START_TIME_" type="datetime" />
-            <column name="END_TIME_" type="datetime" />
-            <column name="START_USER_ID_" type="varchar(255)" />
-            <column name="CALLBACK_ID_" type="varchar(255)" />
-            <column name="CALLBACK_TYPE_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-
-        <createTable tableName="ACT_CMMN_HI_MIL_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="TIME_STAMP_" type="datetime">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_INST_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="CASE_DEF_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-            <column name="ELEMENT_ID_" type="varchar(255)">
-                <constraints nullable="false" />
-            </column>
-        </createTable>
-
-    </changeSet>
-
-    <changeSet id="2" author="flowable">
-    
-        <addColumn tableName="ACT_CMMN_CASEDEF">
-            <column name="DGRM_RESOURCE_NAME_" type="varchar(4000)"/>
-            <column name="HAS_START_FORM_KEY_" type="boolean"/>
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_DEPLOYMENT_RESOURCE">
-            <column name="GENERATED_" type="boolean"/>
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="LOCK_TIME_" type="datetime" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="ITEM_DEFINITION_ID_" type="varchar(255)" />
-            <column name="ITEM_DEFINITION_TYPE_" type="varchar(255)" />
-        </addColumn>        
-    
-    </changeSet>
-    
-    <changeSet id="3" author="flowable">
-    
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="IS_COMPLETEABLE_" type="boolean" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="IS_COMPLETEABLE_" type="boolean" />
-        </addColumn>
-        
-        <createIndex tableName="ACT_CMMN_RU_PLAN_ITEM_INST" indexName="ACT_IDX_PLAN_ITEM_STAGE_INST">
-            <column name="STAGE_INST_ID_" />
-        </createIndex>  
-        
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="IS_COUNT_ENABLED_" type="boolean" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="VAR_COUNT_" type="integer" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="SENTRY_PART_INST_COUNT_" type="integer" />
-        </addColumn>
-    </changeSet>
-
-    <changeSet id="4" author="flowable">
-
-        <createTable tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="REV_" type="integer">
-                <constraints nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="STATE_" type="varchar(255)" />
-            <column name="CASE_DEF_ID_" type="varchar(255)" />
-            <column name="CASE_INST_ID_" type="varchar(255)" />
-            <column name="STAGE_INST_ID_" type="varchar(255)" />
-            <column name="IS_STAGE_" type="boolean" />
-            <column name="ELEMENT_ID_" type="varchar(255)" />
-            <column name="ITEM_DEFINITION_ID_" type="varchar(255)" />
-            <column name="ITEM_DEFINITION_TYPE_" type="varchar(255)" />
-            <column name="CREATED_TIME_" type="datetime" />
-            <column name="LAST_AVAILABLE_TIME_" type="datetime" />
-            <column name="LAST_ENABLED_TIME_" type="datetime" />
-            <column name="LAST_DISABLED_TIME_" type="datetime" />
-            <column name="LAST_STARTED_TIME_" type="datetime" />
-            <column name="LAST_SUSPENDED_TIME_" type="datetime" />
-            <column name="COMPLETED_TIME_" type="datetime" />
-            <column name="OCCURRED_TIME_" type="datetime" />
-            <column name="TERMINATED_TIME_" type="datetime" />
-            <column name="EXIT_TIME_" type="datetime" />
-            <column name="ENDED_TIME_" type="datetime" />
-            <column name="LAST_UPDATED_TIME_" type="datetime" />
-            <column name="START_USER_ID_" type="varchar(255)" />
-            <column name="REFERENCE_ID_" type="varchar(255)" />
-            <column name="REFERENCE_TYPE_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </createTable>
-        
-        <addColumn tableName="ACT_CMMN_RU_MIL_INST">
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_HI_MIL_INST">
-            <column name="TENANT_ID_" type="varchar(255)" defaultValue="" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="5" author="flowable" dbms="mysql">
-
-        <modifyDataType tableName="ACT_CMMN_DEPLOYMENT" columnName="DEPLOY_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_PLAN_ITEM_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_SENTRY_PART_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_MIL_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="END_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_MIL_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="LOCK_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="CREATED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_AVAILABLE_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_ENABLED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_DISABLED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_STARTED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_SUSPENDED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="COMPLETED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="OCCURRED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="TERMINATED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="EXIT_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="ENDED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_UPDATED_TIME_" newDataType="datetime(3)" />
-
-    </changeSet>
-    
-    <changeSet id="6" author="flowable">
-        
-        <createIndex tableName="ACT_CMMN_CASEDEF" indexName="ACT_IDX_CASE_DEF_UNIQ" unique="true">
-            <column name="KEY_" />
-            <column name="VERSION_" />
-            <column name="TENANT_ID_" />
-        </createIndex>
-        
-    </changeSet>
-
-    <changeSet id="7" author="flowable">
-
-        <!-- rename CREATE_TIME to CREATE_TIME to avoid confusion with the start event of CMMN -->
-        <renameColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST" oldColumnName="START_TIME_" newColumnName="CREATE_TIME_" columnDataType="datetime(3)" />
-        <renameColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST" oldColumnName="CREATED_TIME_" newColumnName="CREATE_TIME_" columnDataType="datetime(3)" />
-
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-
-            <column name="LAST_AVAILABLE_TIME_" type="datetime(3)" />
-            <column name="LAST_ENABLED_TIME_" type="datetime(3)" />
-            <column name="LAST_DISABLED_TIME_" type="datetime(3)" />
-            <column name="LAST_STARTED_TIME_" type="datetime(3)" />
-            <column name="LAST_SUSPENDED_TIME_" type="datetime(3)" />
-            <column name="COMPLETED_TIME_" type="datetime(3)" />
-            <column name="OCCURRED_TIME_" type="datetime(3)" />
-            <column name="TERMINATED_TIME_" type="datetime(3)" />
-            <column name="EXIT_TIME_" type="datetime(3)" />
-            <column name="ENDED_TIME_" type="datetime(3)" />
-
-            <column name="ENTRY_CRITERION_ID_" type="varchar(255)" />
-            <column name="EXIT_CRITERION_ID_" type="varchar(255)" />
-
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-
-            <column name="ENTRY_CRITERION_ID_" type="varchar(255)" />
-            <column name="EXIT_CRITERION_ID_" type="varchar(255)" />
-
-        </addColumn>
-
-
-    </changeSet>
-    
-    <changeSet id="8" author="flowable">
-    
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="SHOW_IN_OVERVIEW_" type="boolean" />
-        </addColumn>
-    
-    </changeSet>
-    
-    <changeSet id="9" author="flowable">
-    
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="EXTRA_VALUE_" type="varchar(255)" />
-        </addColumn>
-        
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="EXTRA_VALUE_" type="varchar(255)" />
-        </addColumn>
-    
-    </changeSet>
-
-    <changeSet id="10" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="REFERENCE_ID_" type="varchar(255)" />
-        </addColumn>
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="REFERENCE_TYPE_" type="varchar(255)" />
-        </addColumn>
-        <createIndex tableName="ACT_CMMN_RU_CASE_INST" indexName="ACT_IDX_CASE_INST_REF_ID_">
-            <column name="REFERENCE_ID_" />
-        </createIndex>
-
-        <addColumn tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="REFERENCE_ID_" type="varchar(255)" />
-        </addColumn>
-        <addColumn tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="REFERENCE_TYPE_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="11" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="DERIVED_CASE_DEF_ID_" type="varchar(255)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="DERIVED_CASE_DEF_ID_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="12" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="LOCK_OWNER_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="13" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_PLAN_ITEM_INST">
-            <column name="LAST_UNAVAILABLE_TIME_" type="datetime(3)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_PLAN_ITEM_INST">
-            <column name="LAST_UNAVAILABLE_TIME_" type="datetime(3)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="14" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="LAST_REACTIVATION_TIME_" type="datetime(3)" />
-            <column name="LAST_REACTIVATION_USER_ID_" type="varchar(255)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="LAST_REACTIVATION_TIME_" type="datetime(3)" />
-            <column name="LAST_REACTIVATION_USER_ID_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <!-- We cannot just change the dbms in changeSet 5 to mysql,mariadb because if someone has already run on MariaDB it will execute and will fail because a column was renamed -->
-    <changeSet id="15" author="flowable" dbms="mariadb">
-
-        <modifyDataType tableName="ACT_CMMN_DEPLOYMENT" columnName="DEPLOY_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_PLAN_ITEM_INST" columnName="CREATE_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_SENTRY_PART_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_MIL_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="END_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_MIL_INST" columnName="TIME_STAMP_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="LOCK_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="CREATE_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_AVAILABLE_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_ENABLED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_DISABLED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_STARTED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_SUSPENDED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="COMPLETED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="OCCURRED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="TERMINATED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="EXIT_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="ENDED_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="LAST_UPDATED_TIME_" newDataType="datetime(3)" />
-
-    </changeSet>
-    
-    <changeSet id="16" author="flowable">
-
-        <addColumn tableName="ACT_CMMN_RU_CASE_INST">
-            <column name="BUSINESS_STATUS_" type="varchar(255)" />
-        </addColumn>
-
-        <addColumn tableName="ACT_CMMN_HI_CASE_INST">
-            <column name="BUSINESS_STATUS_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-
-    <changeSet id="17" author="flowable">
-        <createIndex tableName="ACT_CMMN_HI_CASE_INST" indexName="ACT_IDX_HI_CASE_INST_END">
-            <column name="END_TIME_"/>
-        </createIndex>
-    </changeSet>
-
-    <changeSet id="18" author="flowable">
-        <createIndex tableName="ACT_CMMN_HI_PLAN_ITEM_INST" indexName="ACT_IDX_HI_PLAN_ITEM_INST_CASE">
-            <column name="CASE_INST_ID_"/>
-        </createIndex>
-    </changeSet>
-
-    <changeSet id="19" author="flowable" dbms="mssql">
-        <modifyDataType tableName="ACT_CMMN_DEPLOYMENT" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_DEPLOYMENT_RESOURCE" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_CASEDEF" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_CASEDEF" columnName="RESOURCE_NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_CASEDEF" columnName="DGRM_RESOURCE_NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="BUSINESS_KEY_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_RU_CASE_INST" columnName="BUSINESS_STATUS_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_RU_MIL_INST" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_RU_PLAN_ITEM_INST" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_HI_MIL_INST" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_HI_PLAN_ITEM_INST" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="BUSINESS_KEY_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_CMMN_HI_CASE_INST" columnName="BUSINESS_STATUS_" newDataType="nvarchar(255)" />
-    </changeSet>
-    
-    <changeSet id="20" author="flowable" dbms="mssql">
-        <modifyDataType tableName="ACT_CMMN_CASEDEF" columnName="DESCRIPTION_" newDataType="nvarchar(4000)" />
-    </changeSet>
-
-</databaseChangeLog>
\ No newline at end of file
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml
index 44767de5b23..8563d1edf21 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/mappings.xml
@@ -27,6 +27,7 @@
     <mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
     <mapper resource="org/flowable/common/db/mapping/entity/ByteArray.xml" />
     <mapper resource="org/flowable/common/db/mapping/entity/TableData.xml" />
+    <mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
     <mapper resource="org/flowable/common/db/mapping/common.xml" />
 
     <mapper resource="org/flowable/cmmn/db/mapping/ChangeTenantCmmn.xml" />
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.all.upgradestep.7100.to.7101.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.all.upgradestep.7100.to.7101.cmmn.sql
new file mode 100644
index 00000000000..04f88fb1aa8
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.all.upgradestep.7100.to.7101.cmmn.sql
@@ -0,0 +1,5 @@
+insert into ACT_GE_PROPERTY
+values ('cmmn.schema.version', '7.1.0.1', 1);
+
+drop table ACT_CMMN_DATABASECHANGELOG;
+drop table ACT_CMMN_DATABASECHANGELOGLOCK;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6120.to.6200.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6120.to.6200.cmmn.sql
new file mode 100644
index 00000000000..2a9f418fc19
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6120.to.6200.cmmn.sql
@@ -0,0 +1,61 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLO PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASED PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CA PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), IF_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MI PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CA PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MI PRIMARY KEY (ID_));
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6200.to.6210.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6200.to.6210.cmmn.sql
new file mode 100644
index 00000000000..6bac3251e33
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6200.to.6210.cmmn.sql
@@ -0,0 +1,21 @@
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_CASEDEF');
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_DEPLOYMENT_RESOURCE');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6210.to.6300.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6210.to.6300.cmmn.sql
new file mode 100644
index 00000000000..f99166e0367
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6210.to.6300.cmmn.sql
@@ -0,0 +1,23 @@
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INTEGER;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INTEGER;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6300.to.6301.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6300.to.6301.cmmn.sql
new file mode 100644
index 00000000000..4900419a462
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6300.to.6301.cmmn.sql
@@ -0,0 +1,11 @@
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR(255), STATE_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), ITEM_DEFINITION_ID_ VARCHAR(255), ITEM_DEFINITION_TYPE_ VARCHAR(255), CREATED_TIME_ TIMESTAMP, LAST_AVAILABLE_TIME_ TIMESTAMP, LAST_ENABLED_TIME_ TIMESTAMP, LAST_DISABLED_TIME_ TIMESTAMP, LAST_STARTED_TIME_ TIMESTAMP, LAST_SUSPENDED_TIME_ TIMESTAMP, COMPLETED_TIME_ TIMESTAMP, OCCURRED_TIME_ TIMESTAMP, TERMINATED_TIME_ TIMESTAMP, EXIT_TIME_ TIMESTAMP, ENDED_TIME_ TIMESTAMP, LAST_UPDATED_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PL PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_MIL_INST');
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_MIL_INST');
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6400.to.6410.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6400.to.6410.cmmn.sql
new file mode 100644
index 00000000000..6be842d6c07
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6400.to.6410.cmmn.sql
@@ -0,0 +1,37 @@
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST RENAME COLUMN START_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST RENAME COLUMN CREATED_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6501.to.6502.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6501.to.6502.cmmn.sql
new file mode 100644
index 00000000000..98bf75198bb
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6501.to.6502.cmmn.sql
@@ -0,0 +1,39 @@
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ BOOLEAN;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_CASE_INST');
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6511.to.6512.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6511.to.6512.cmmn.sql
new file mode 100644
index 00000000000..7aec452acb7
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6511.to.6512.cmmn.sql
@@ -0,0 +1,13 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_PLAN_ITEM_INST');
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_PLAN_ITEM_INST');
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6601.to.6610.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6601.to.6610.cmmn.sql
new file mode 100644
index 00000000000..27791c9cab3
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6601.to.6610.cmmn.sql
@@ -0,0 +1,13 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_CASE_INST');
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6701.to.6710.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6701.to.6710.cmmn.sql
new file mode 100644
index 00000000000..3f2d3d4242b
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6701.to.6710.cmmn.sql
@@ -0,0 +1,9 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_RU_CASE_INST');
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_CMMN_HI_CASE_INST');
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6723.to.6800.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6723.to.6800.cmmn.sql
new file mode 100644
index 00000000000..4aac6aebcdd
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.6723.to.6800.cmmn.sql
@@ -0,0 +1,3 @@
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.7000.to.7010.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.7000.to.7010.cmmn.sql
new file mode 100644
index 00000000000..caa1f35eae5
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.db2.upgradestep.7000.to.7010.cmmn.sql
@@ -0,0 +1,3 @@
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6120.to.6200.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6120.to.6200.cmmn.sql
new file mode 100644
index 00000000000..b2a4b129af1
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6120.to.6200.cmmn.sql
@@ -0,0 +1,59 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), IF_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6200.to.6210.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6200.to.6210.cmmn.sql
new file mode 100644
index 00000000000..b517bacb76d
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6200.to.6210.cmmn.sql
@@ -0,0 +1,11 @@
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6210.to.6300.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6210.to.6300.cmmn.sql
new file mode 100644
index 00000000000..4402d66f34c
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6210.to.6300.cmmn.sql
@@ -0,0 +1,11 @@
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INT;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INT;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6300.to.6301.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6300.to.6301.cmmn.sql
new file mode 100644
index 00000000000..82af67c2997
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6300.to.6301.cmmn.sql
@@ -0,0 +1,5 @@
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), STATE_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), ITEM_DEFINITION_ID_ VARCHAR(255), ITEM_DEFINITION_TYPE_ VARCHAR(255), CREATED_TIME_ TIMESTAMP, LAST_AVAILABLE_TIME_ TIMESTAMP, LAST_ENABLED_TIME_ TIMESTAMP, LAST_DISABLED_TIME_ TIMESTAMP, LAST_STARTED_TIME_ TIMESTAMP, LAST_SUSPENDED_TIME_ TIMESTAMP, COMPLETED_TIME_ TIMESTAMP, OCCURRED_TIME_ TIMESTAMP, TERMINATED_TIME_ TIMESTAMP, EXIT_TIME_ TIMESTAMP, ENDED_TIME_ TIMESTAMP, LAST_UPDATED_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6400.to.6410.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6400.to.6410.cmmn.sql
new file mode 100644
index 00000000000..f6b7bd45267
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6400.to.6410.cmmn.sql
@@ -0,0 +1,33 @@
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ALTER COLUMN START_TIME_ RENAME TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ALTER COLUMN CREATED_TIME_ RENAME TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6501.to.6502.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6501.to.6502.cmmn.sql
new file mode 100644
index 00000000000..2fc19f4c58b
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6501.to.6502.cmmn.sql
@@ -0,0 +1,19 @@
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6511.to.6512.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6511.to.6512.cmmn.sql
new file mode 100644
index 00000000000..cfd8003f8a9
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6511.to.6512.cmmn.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6601.to.6610.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6601.to.6610.cmmn.sql
new file mode 100644
index 00000000000..70d8c8ec871
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6601.to.6610.cmmn.sql
@@ -0,0 +1,7 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6701.to.6710.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6701.to.6710.cmmn.sql
new file mode 100644
index 00000000000..548bb70cc5c
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6701.to.6710.cmmn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6723.to.6800.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6723.to.6800.cmmn.sql
new file mode 100644
index 00000000000..31273e933a5
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.6723.to.6800.cmmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.7000.to.7010.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.7000.to.7010.cmmn.sql
new file mode 100644
index 00000000000..7854c48581d
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.h2.upgradestep.7000.to.7010.cmmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.cmmn.sql
new file mode 100644
index 00000000000..31a07bdc992
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.cmmn.sql
@@ -0,0 +1,59 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ varchar(255) NOT NULL, NAME_ varchar(255), CATEGORY_ varchar(255), KEY_ varchar(255), DEPLOY_TIME_ datetime, PARENT_DEPLOYMENT_ID_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_DEPLOYMENT_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ varchar(255) NOT NULL, NAME_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_BYTES_ varbinary(MAX), CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, NAME_ varchar(255), KEY_ varchar(255) NOT NULL, VERSION_ int NOT NULL, CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_NAME_ varchar(4000), DESCRIPTION_ varchar(4000), HAS_GRAPHICAL_NOTATION_ bit, TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_CASEDEF_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, BUSINESS_KEY_ varchar(255), NAME_ varchar(255), PARENT_ID_ varchar(255), CASE_DEF_ID_ varchar(255), STATE_ varchar(255), START_TIME_ datetime, START_USER_ID_ varchar(255), CALLBACK_ID_ varchar(255), CALLBACK_TYPE_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_RU_CASE_INST_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, CASE_DEF_ID_ varchar(255), CASE_INST_ID_ varchar(255), STAGE_INST_ID_ varchar(255), IS_STAGE_ bit, ELEMENT_ID_ varchar(255), NAME_ varchar(255), STATE_ varchar(255), START_TIME_ datetime, START_USER_ID_ varchar(255), REFERENCE_ID_ varchar(255), REFERENCE_TYPE_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_RU_PLAN_ITEM_INST_TENANT_ID_ DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, CASE_DEF_ID_ varchar(255), CASE_INST_ID_ varchar(255), PLAN_ITEM_INST_ID_ varchar(255), ON_PART_ID_ varchar(255), IF_PART_ID_ varchar(255), TIME_STAMP_ datetime, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ varchar(255) NOT NULL, NAME_ varchar(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ varchar(255) NOT NULL, CASE_DEF_ID_ varchar(255) NOT NULL, ELEMENT_ID_ varchar(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, BUSINESS_KEY_ varchar(255), NAME_ varchar(255), PARENT_ID_ varchar(255), CASE_DEF_ID_ varchar(255), STATE_ varchar(255), START_TIME_ datetime, END_TIME_ datetime, START_USER_ID_ varchar(255), CALLBACK_ID_ varchar(255), CALLBACK_TYPE_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_HI_CASE_INST_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, NAME_ varchar(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ varchar(255) NOT NULL, CASE_DEF_ID_ varchar(255) NOT NULL, ELEMENT_ID_ varchar(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.cmmn.sql
new file mode 100644
index 00000000000..7d71b6fbace
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.cmmn.sql
@@ -0,0 +1,11 @@
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ varchar(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ bit;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ bit;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ varchar(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.cmmn.sql
new file mode 100644
index 00000000000..2ac6942d9b3
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.cmmn.sql
@@ -0,0 +1,11 @@
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ bit;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ bit;
+
+CREATE NONCLUSTERED INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ bit;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ int;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ int;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.cmmn.sql
new file mode 100644
index 00000000000..8bf973e42af
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.cmmn.sql
@@ -0,0 +1,5 @@
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ varchar(255) NOT NULL, REV_ int NOT NULL, NAME_ varchar(255), STATE_ varchar(255), CASE_DEF_ID_ varchar(255), CASE_INST_ID_ varchar(255), STAGE_INST_ID_ varchar(255), IS_STAGE_ bit, ELEMENT_ID_ varchar(255), ITEM_DEFINITION_ID_ varchar(255), ITEM_DEFINITION_TYPE_ varchar(255), CREATED_TIME_ datetime, LAST_AVAILABLE_TIME_ datetime, LAST_ENABLED_TIME_ datetime, LAST_DISABLED_TIME_ datetime, LAST_STARTED_TIME_ datetime, LAST_SUSPENDED_TIME_ datetime, COMPLETED_TIME_ datetime, OCCURRED_TIME_ datetime, TERMINATED_TIME_ datetime, EXIT_TIME_ datetime, ENDED_TIME_ datetime, LAST_UPDATED_TIME_ datetime, START_USER_ID_ varchar(255), REFERENCE_ID_ varchar(255), REFERENCE_TYPE_ varchar(255), TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_HI_PLAN_ITEM_INST_TENANT_ID_ DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_RU_MIL_INST_TENANT_ID_ DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ varchar(255) CONSTRAINT DF_ACT_CMMN_HI_MIL_INST_TENANT_ID_ DEFAULT '';
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.cmmn.sql
new file mode 100644
index 00000000000..99f151b9344
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.cmmn.sql
@@ -0,0 +1,33 @@
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+exec sp_rename 'ACT_CMMN_RU_PLAN_ITEM_INST.START_TIME_', 'CREATE_TIME_', 'COLUMN';
+
+exec sp_rename 'ACT_CMMN_HI_PLAN_ITEM_INST.CREATED_TIME_', 'CREATE_TIME_', 'COLUMN';
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ varchar(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.cmmn.sql
new file mode 100644
index 00000000000..0d288ba0cc8
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.cmmn.sql
@@ -0,0 +1,19 @@
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ bit;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ varchar(255);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ varchar(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.cmmn.sql
new file mode 100644
index 00000000000..19ab1660c8b
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.cmmn.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ varchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ datetime;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.cmmn.sql
new file mode 100644
index 00000000000..f3df9ee3019
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.cmmn.sql
@@ -0,0 +1,7 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ datetime;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ varchar(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6701.to.6710.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6701.to.6710.cmmn.sql
new file mode 100644
index 00000000000..68338a4ee89
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6701.to.6710.cmmn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ varchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ varchar(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6723.to.6800.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6723.to.6800.cmmn.sql
new file mode 100644
index 00000000000..c20047638ba
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.6723.to.6800.cmmn.sql
@@ -0,0 +1 @@
+CREATE NONCLUSTERED INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.cmmn.sql
new file mode 100644
index 00000000000..93543dc7614
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.cmmn.sql
@@ -0,0 +1 @@
+CREATE NONCLUSTERED INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.7010.to.7100.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.7010.to.7100.cmmn.sql
new file mode 100644
index 00000000000..fe452f42156
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mssql.upgradestep.7010.to.7100.cmmn.sql
@@ -0,0 +1,31 @@
+ALTER TABLE ACT_CMMN_DEPLOYMENT ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_CASEDEF ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_CASEDEF ALTER COLUMN RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_CASEDEF ALTER COLUMN DGRM_RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ALTER COLUMN BUSINESS_KEY_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ALTER COLUMN BUSINESS_STATUS_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ALTER COLUMN BUSINESS_KEY_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ALTER COLUMN BUSINESS_STATUS_ nvarchar(255);
+
+ALTER TABLE ACT_CMMN_CASEDEF ALTER COLUMN DESCRIPTION_ nvarchar(4000);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.cmmn.sql
new file mode 100644
index 00000000000..32cb6bc4f91
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.cmmn.sql
@@ -0,0 +1,60 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NULL, KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(4000) NULL, DESCRIPTION_ VARCHAR(4000) NULL, HAS_GRAPHICAL_NOTATION_ BIT(1) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, PARENT_ID_ VARCHAR(255) NULL, CASE_DEF_ID_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, CALLBACK_ID_ VARCHAR(255) NULL, CALLBACK_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255) NULL, CASE_INST_ID_ VARCHAR(255) NULL, STAGE_INST_ID_ VARCHAR(255) NULL, IS_STAGE_ BIT(1) NULL, ELEMENT_ID_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, REFERENCE_ID_ VARCHAR(255) NULL, REFERENCE_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255) NULL, CASE_INST_ID_ VARCHAR(255) NULL, PLAN_ITEM_INST_ID_ VARCHAR(255) NULL, ON_PART_ID_ VARCHAR(255) NULL, IF_PART_ID_ VARCHAR(255) NULL, TIME_STAMP_ datetime NULL, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255) NULL, NAME_ VARCHAR(255) NULL, PARENT_ID_ VARCHAR(255) NULL, CASE_DEF_ID_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, START_TIME_ datetime NULL, END_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, CALLBACK_ID_ VARCHAR(255) NULL, CALLBACK_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ datetime NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.cmmn.sql
new file mode 100644
index 00000000000..0003a559dc5
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.cmmn.sql
@@ -0,0 +1,7 @@
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000) NULL, ADD HAS_START_FORM_KEY_ BIT(1) NULL;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ BIT(1) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ datetime NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255) NULL, ADD ITEM_DEFINITION_TYPE_ VARCHAR(255) NULL;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.cmmn.sql
new file mode 100644
index 00000000000..4d101c17974
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.cmmn.sql
@@ -0,0 +1,11 @@
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ BIT(1) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ BIT(1) NULL;
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ BIT(1) NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INT NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INT NULL;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.cmmn.sql
new file mode 100644
index 00000000000..f4c1851c9f2
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.cmmn.sql
@@ -0,0 +1,5 @@
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NULL, STATE_ VARCHAR(255) NULL, CASE_DEF_ID_ VARCHAR(255) NULL, CASE_INST_ID_ VARCHAR(255) NULL, STAGE_INST_ID_ VARCHAR(255) NULL, IS_STAGE_ BIT(1) NULL, ELEMENT_ID_ VARCHAR(255) NULL, ITEM_DEFINITION_ID_ VARCHAR(255) NULL, ITEM_DEFINITION_TYPE_ VARCHAR(255) NULL, CREATED_TIME_ datetime NULL, LAST_AVAILABLE_TIME_ datetime NULL, LAST_ENABLED_TIME_ datetime NULL, LAST_DISABLED_TIME_ datetime NULL, LAST_STARTED_TIME_ datetime NULL, LAST_SUSPENDED_TIME_ datetime NULL, COMPLETED_TIME_ datetime NULL, OCCURRED_TIME_ datetime NULL, TERMINATED_TIME_ datetime NULL, EXIT_TIME_ datetime NULL, ENDED_TIME_ datetime NULL, LAST_UPDATED_TIME_ datetime NULL, START_USER_ID_ VARCHAR(255) NULL, REFERENCE_ID_ VARCHAR(255) NULL, REFERENCE_TYPE_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) DEFAULT '' NULL, CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '' NULL;
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '' NULL;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6310.to.6320.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6310.to.6320.cmmn.sql
new file mode 100644
index 00000000000..d8768a69e50
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6310.to.6320.cmmn.sql
@@ -0,0 +1,41 @@
+ALTER TABLE ACT_CMMN_DEPLOYMENT MODIFY DEPLOY_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST MODIFY START_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST MODIFY START_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST MODIFY TIME_STAMP_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST MODIFY TIME_STAMP_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST MODIFY START_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST MODIFY END_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST MODIFY TIME_STAMP_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST MODIFY LOCK_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY CREATED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_AVAILABLE_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_ENABLED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_DISABLED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_STARTED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_SUSPENDED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY COMPLETED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY OCCURRED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY TERMINATED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY EXIT_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY ENDED_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST MODIFY LAST_UPDATED_TIME_ datetime(3);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.cmmn.sql
new file mode 100644
index 00000000000..52ec43ec43f
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.cmmn.sql
@@ -0,0 +1,9 @@
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST CHANGE START_TIME_ CREATE_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST CHANGE CREATED_TIME_ CREATE_TIME_ datetime(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ datetime(3) NULL, ADD LAST_ENABLED_TIME_ datetime(3) NULL, ADD LAST_DISABLED_TIME_ datetime(3) NULL, ADD LAST_STARTED_TIME_ datetime(3) NULL, ADD LAST_SUSPENDED_TIME_ datetime(3) NULL, ADD COMPLETED_TIME_ datetime(3) NULL, ADD OCCURRED_TIME_ datetime(3) NULL, ADD TERMINATED_TIME_ datetime(3) NULL, ADD EXIT_TIME_ datetime(3) NULL, ADD ENDED_TIME_ datetime(3) NULL, ADD ENTRY_CRITERION_ID_ VARCHAR(255) NULL, ADD EXIT_CRITERION_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255) NULL, ADD EXIT_CRITERION_ID_ VARCHAR(255) NULL;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.cmmn.sql
new file mode 100644
index 00000000000..c4954e0c95c
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.cmmn.sql
@@ -0,0 +1,19 @@
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ BIT(1) NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255) NULL;
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255) NULL;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.cmmn.sql
new file mode 100644
index 00000000000..67475f98cb1
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.cmmn.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ datetime(3) NULL;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ datetime(3) NULL;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.cmmn.sql
new file mode 100644
index 00000000000..98f8134185b
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.cmmn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ datetime(3) NULL, ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ datetime(3) NULL, ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255) NULL;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6701.to.6710.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6701.to.6710.cmmn.sql
new file mode 100644
index 00000000000..ed09718e4b7
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6701.to.6710.cmmn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255) NULL;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255) NULL;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6723.to.6800.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6723.to.6800.cmmn.sql
new file mode 100644
index 00000000000..31273e933a5
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.6723.to.6800.cmmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.cmmn.sql
new file mode 100644
index 00000000000..7854c48581d
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.cmmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.cmmn.sql
new file mode 100644
index 00000000000..24414939064
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.cmmn.sql
@@ -0,0 +1,61 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), KEY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP, PARENT_DEPLOYMENT_ID_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255), KEY_ VARCHAR2(255) NOT NULL, VERSION_ INTEGER NOT NULL, CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(4000), DESCRIPTION_ VARCHAR2(4000), HAS_GRAPHICAL_NOTATION_ NUMBER(1), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR2(255), NAME_ VARCHAR2(255), PARENT_ID_ VARCHAR2(255), CASE_DEF_ID_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), CALLBACK_ID_ VARCHAR2(255), CALLBACK_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR2(255), CASE_INST_ID_ VARCHAR2(255), STAGE_INST_ID_ VARCHAR2(255), IS_STAGE_ NUMBER(1), ELEMENT_ID_ VARCHAR2(255), NAME_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), REFERENCE_ID_ VARCHAR2(255), REFERENCE_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, CASE_DEF_ID_ VARCHAR2(255), CASE_INST_ID_ VARCHAR2(255), PLAN_ITEM_INST_ID_ VARCHAR2(255), ON_PART_ID_ VARCHAR2(255), IF_PART_ID_ VARCHAR2(255), TIME_STAMP_ TIMESTAMP, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR2(255) NOT NULL, CASE_DEF_ID_ VARCHAR2(255) NOT NULL, ELEMENT_ID_ VARCHAR2(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, BUSINESS_KEY_ VARCHAR2(255), NAME_ VARCHAR2(255), PARENT_ID_ VARCHAR2(255), CASE_DEF_ID_ VARCHAR2(255), STATE_ VARCHAR2(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), CALLBACK_ID_ VARCHAR2(255), CALLBACK_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255) NOT NULL, TIME_STAMP_ TIMESTAMP NOT NULL, CASE_INST_ID_ VARCHAR2(255) NOT NULL, CASE_DEF_ID_ VARCHAR2(255) NOT NULL, ELEMENT_ID_ VARCHAR2(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.cmmn.sql
new file mode 100644
index 00000000000..903f40696b2
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.cmmn.sql
@@ -0,0 +1,13 @@
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR2(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR2(255);
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.cmmn.sql
new file mode 100644
index 00000000000..b7921d64eff
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.cmmn.sql
@@ -0,0 +1,13 @@
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ NUMBER(1);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INTEGER;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INTEGER;
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.cmmn.sql
new file mode 100644
index 00000000000..ded49342f99
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.cmmn.sql
@@ -0,0 +1,7 @@
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR2(255) NOT NULL, REV_ INTEGER NOT NULL, NAME_ VARCHAR2(255), STATE_ VARCHAR2(255), CASE_DEF_ID_ VARCHAR2(255), CASE_INST_ID_ VARCHAR2(255), STAGE_INST_ID_ VARCHAR2(255), IS_STAGE_ NUMBER(1), ELEMENT_ID_ VARCHAR2(255), ITEM_DEFINITION_ID_ VARCHAR2(255), ITEM_DEFINITION_TYPE_ VARCHAR2(255), CREATED_TIME_ TIMESTAMP, LAST_AVAILABLE_TIME_ TIMESTAMP, LAST_ENABLED_TIME_ TIMESTAMP, LAST_DISABLED_TIME_ TIMESTAMP, LAST_STARTED_TIME_ TIMESTAMP, LAST_SUSPENDED_TIME_ TIMESTAMP, COMPLETED_TIME_ TIMESTAMP, OCCURRED_TIME_ TIMESTAMP, TERMINATED_TIME_ TIMESTAMP, EXIT_TIME_ TIMESTAMP, ENDED_TIME_ TIMESTAMP, LAST_UPDATED_TIME_ TIMESTAMP, START_USER_ID_ VARCHAR2(255), REFERENCE_ID_ VARCHAR2(255), REFERENCE_TYPE_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR2(255) DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR2(255) DEFAULT '';
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.cmmn.sql
new file mode 100644
index 00000000000..bffe5037c2a
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.cmmn.sql
@@ -0,0 +1,35 @@
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST RENAME COLUMN START_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST RENAME COLUMN CREATED_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR2(255);
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.cmmn.sql
new file mode 100644
index 00000000000..a939172f88a
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.cmmn.sql
@@ -0,0 +1,21 @@
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ NUMBER(1);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR2(255);
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR2(255);
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.cmmn.sql
new file mode 100644
index 00000000000..c2138469246
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.cmmn.sql
@@ -0,0 +1,7 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3);
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.cmmn.sql
new file mode 100644
index 00000000000..1c160f67f7d
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.cmmn.sql
@@ -0,0 +1,9 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR2(255);
+
+
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6701.to.6710.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6701.to.6710.cmmn.sql
new file mode 100644
index 00000000000..8265519e822
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6701.to.6710.cmmn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR2(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR2(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6723.to.6800.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6723.to.6800.cmmn.sql
new file mode 100644
index 00000000000..31273e933a5
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.6723.to.6800.cmmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.cmmn.sql
new file mode 100644
index 00000000000..7854c48581d
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.cmmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.cmmn.sql
new file mode 100644
index 00000000000..4c0f4039419
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.cmmn.sql
@@ -0,0 +1,59 @@
+CREATE TABLE ACT_CMMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), KEY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP WITHOUT TIME ZONE, PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT PK_CMMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD CONSTRAINT ACT_FK_CMMN_RSRC_DPL FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CMMN_RSRC_DPL ON ACT_CMMN_DEPLOYMENT_RESOURCE(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_CASEDEF (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), KEY_ VARCHAR(255) NOT NULL, VERSION_ INT NOT NULL, CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(4000), DESCRIPTION_ VARCHAR(4000), HAS_GRAPHICAL_NOTATION_ BOOLEAN, TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_CASEDEF PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD CONSTRAINT ACT_FK_CASE_DEF_DPLY FOREIGN KEY (DEPLOYMENT_ID_) REFERENCES ACT_CMMN_DEPLOYMENT (ID_);
+
+CREATE INDEX ACT_IDX_CASE_DEF_DPLY ON ACT_CMMN_CASEDEF(DEPLOYMENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_RU_CASE_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD CONSTRAINT ACT_FK_CASE_INST_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_CASE_DEF ON ACT_CMMN_RU_CASE_INST(CASE_DEF_ID_);
+
+CREATE INDEX ACT_IDX_CASE_INST_PARENT ON ACT_CMMN_RU_CASE_INST(PARENT_ID_);
+
+CREATE TABLE ACT_CMMN_RU_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), NAME_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_CMMN_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_DEF ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD CONSTRAINT ACT_FK_PLAN_ITEM_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_CASE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_SENTRY_PART_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), PLAN_ITEM_INST_ID_ VARCHAR(255), ON_PART_ID_ VARCHAR(255), IF_PART_ID_ VARCHAR(255), TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE, CONSTRAINT PK_CMMN_SENTRY_PART_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_DEF ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_CASE_INST ON ACT_CMMN_RU_SENTRY_PART_INST(CASE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_SENTRY_PART_INST ADD CONSTRAINT ACT_FK_SENTRY_PLAN_ITEM FOREIGN KEY (PLAN_ITEM_INST_ID_) REFERENCES ACT_CMMN_RU_PLAN_ITEM_INST (ID_);
+
+CREATE INDEX ACT_IDX_SENTRY_PLAN_ITEM ON ACT_CMMN_RU_SENTRY_PART_INST(PLAN_ITEM_INST_ID_);
+
+CREATE TABLE ACT_CMMN_RU_MIL_INST (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_RU_MIL_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_DEF FOREIGN KEY (CASE_DEF_ID_) REFERENCES ACT_CMMN_CASEDEF (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_DEF ON ACT_CMMN_RU_MIL_INST(CASE_DEF_ID_);
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD CONSTRAINT ACT_FK_MIL_CASE_INST FOREIGN KEY (CASE_INST_ID_) REFERENCES ACT_CMMN_RU_CASE_INST (ID_);
+
+CREATE INDEX ACT_IDX_MIL_CASE_INST ON ACT_CMMN_RU_MIL_INST(CASE_INST_ID_);
+
+CREATE TABLE ACT_CMMN_HI_CASE_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, BUSINESS_KEY_ VARCHAR(255), NAME_ VARCHAR(255), PARENT_ID_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), STATE_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, END_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), CALLBACK_ID_ VARCHAR(255), CALLBACK_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_CASE_INST PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_CMMN_HI_MIL_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255) NOT NULL, TIME_STAMP_ TIMESTAMP WITHOUT TIME ZONE NOT NULL, CASE_INST_ID_ VARCHAR(255) NOT NULL, CASE_DEF_ID_ VARCHAR(255) NOT NULL, ELEMENT_ID_ VARCHAR(255) NOT NULL, CONSTRAINT PK_ACT_CMMN_HI_MIL_INST PRIMARY KEY (ID_));
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.cmmn.sql
new file mode 100644
index 00000000000..2e70b47d00c
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.cmmn.sql
@@ -0,0 +1,11 @@
+ALTER TABLE ACT_CMMN_CASEDEF ADD DGRM_RESOURCE_NAME_ VARCHAR(4000);
+
+ALTER TABLE ACT_CMMN_CASEDEF ADD HAS_START_FORM_KEY_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_DEPLOYMENT_RESOURCE ADD GENERATED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_TIME_ TIMESTAMP WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ITEM_DEFINITION_TYPE_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.cmmn.sql
new file mode 100644
index 00000000000..18e93f1e8d5
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.cmmn.sql
@@ -0,0 +1,11 @@
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD IS_COMPLETEABLE_ BOOLEAN;
+
+CREATE INDEX ACT_IDX_PLAN_ITEM_STAGE_INST ON ACT_CMMN_RU_PLAN_ITEM_INST(STAGE_INST_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD IS_COUNT_ENABLED_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD VAR_COUNT_ INTEGER;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD SENTRY_PART_INST_COUNT_ INTEGER;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.cmmn.sql
new file mode 100644
index 00000000000..34b16cbca11
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.cmmn.sql
@@ -0,0 +1,5 @@
+CREATE TABLE ACT_CMMN_HI_PLAN_ITEM_INST (ID_ VARCHAR(255) NOT NULL, REV_ INT NOT NULL, NAME_ VARCHAR(255), STATE_ VARCHAR(255), CASE_DEF_ID_ VARCHAR(255), CASE_INST_ID_ VARCHAR(255), STAGE_INST_ID_ VARCHAR(255), IS_STAGE_ BOOLEAN, ELEMENT_ID_ VARCHAR(255), ITEM_DEFINITION_ID_ VARCHAR(255), ITEM_DEFINITION_TYPE_ VARCHAR(255), CREATED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_AVAILABLE_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_ENABLED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_DISABLED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_STARTED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_SUSPENDED_TIME_ TIMESTAMP WITHOUT TIME ZONE, COMPLETED_TIME_ TIMESTAMP WITHOUT TIME ZONE, OCCURRED_TIME_ TIMESTAMP WITHOUT TIME ZONE, TERMINATED_TIME_ TIMESTAMP WITHOUT TIME ZONE, EXIT_TIME_ TIMESTAMP WITHOUT TIME ZONE, ENDED_TIME_ TIMESTAMP WITHOUT TIME ZONE, LAST_UPDATED_TIME_ TIMESTAMP WITHOUT TIME ZONE, START_USER_ID_ VARCHAR(255), REFERENCE_ID_ VARCHAR(255), REFERENCE_TYPE_ VARCHAR(255), TENANT_ID_ VARCHAR(255) DEFAULT '', CONSTRAINT PK_ACT_CMMN_HI_PLAN_ITEM_INST PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_CMMN_RU_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
+
+ALTER TABLE ACT_CMMN_HI_MIL_INST ADD TENANT_ID_ VARCHAR(255) DEFAULT '';
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.cmmn.sql
new file mode 100644
index 00000000000..5c17d76da85
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.cmmn.sql
@@ -0,0 +1,33 @@
+CREATE UNIQUE INDEX ACT_IDX_CASE_DEF_UNIQ ON ACT_CMMN_CASEDEF(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST RENAME COLUMN START_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST RENAME COLUMN CREATED_TIME_ TO CREATE_TIME_;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_AVAILABLE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_ENABLED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_DISABLED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_STARTED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_SUSPENDED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD COMPLETED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD OCCURRED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD TERMINATED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENDED_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD ENTRY_CRITERION_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXIT_CRITERION_ID_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.cmmn.sql
new file mode 100644
index 00000000000..2fc19f4c58b
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.cmmn.sql
@@ -0,0 +1,19 @@
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD SHOW_IN_OVERVIEW_ BOOLEAN;
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD EXTRA_VALUE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_CASE_INST_REF_ID_ ON ACT_CMMN_RU_CASE_INST(REFERENCE_ID_);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD REFERENCE_TYPE_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD DERIVED_CASE_DEF_ID_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.cmmn.sql
new file mode 100644
index 00000000000..6675b30c851
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.cmmn.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LOCK_OWNER_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_RU_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_HI_PLAN_ITEM_INST ADD LAST_UNAVAILABLE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.cmmn.sql
new file mode 100644
index 00000000000..8e41cec91ca
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.cmmn.sql
@@ -0,0 +1,7 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE;
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD LAST_REACTIVATION_USER_ID_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6701.to.6710.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6701.to.6710.cmmn.sql
new file mode 100644
index 00000000000..548bb70cc5c
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6701.to.6710.cmmn.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ACT_CMMN_RU_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
+
+ALTER TABLE ACT_CMMN_HI_CASE_INST ADD BUSINESS_STATUS_ VARCHAR(255);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6723.to.6800.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6723.to.6800.cmmn.sql
new file mode 100644
index 00000000000..31273e933a5
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.6723.to.6800.cmmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_HI_CASE_INST_END ON ACT_CMMN_HI_CASE_INST(END_TIME_);
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.cmmn.sql b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.cmmn.sql
new file mode 100644
index 00000000000..7854c48581d
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.cmmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_HI_PLAN_ITEM_INST_CASE ON ACT_CMMN_HI_PLAN_ITEM_INST(CASE_INST_ID_);
diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/initialization/CmmnEngineInitializationTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/initialization/CmmnEngineInitializationTest.java
new file mode 100644
index 00000000000..f5f704ca056
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/initialization/CmmnEngineInitializationTest.java
@@ -0,0 +1,105 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.cmmn.test.initialization;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.flowable.cmmn.engine.CmmnEngine;
+import org.flowable.cmmn.engine.CmmnEngineConfiguration;
+import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.api.FlowableWrongDbException;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.db.DbSqlSession;
+import org.flowable.common.engine.impl.db.DbSqlSessionFactory;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Filip Hrisafov
+ */
+class CmmnEngineInitializationTest {
+
+    @Test
+    void noTables() {
+        CmmnEngineConfiguration engineConfiguration = CmmnEngineConfiguration.createCmmnEngineConfigurationFromResource(
+                "org/flowable/cmmn/test/initialization/notables.flowable.cmmn.cfg.xml");
+
+        assertThatThrownBy(engineConfiguration::buildEngine)
+                .isInstanceOf(FlowableException.class)
+                .hasMessageContaining("No flowable tables in DB");
+    }
+
+    @Test
+    void versionMismatch() {
+        // first create the schema
+        CmmnEngineConfiguration engineConfiguration = CmmnEngineConfiguration.createCmmnEngineConfigurationFromResource(
+                "org/flowable/cmmn/test/initialization/notables.flowable.cmmn.cfg.xml");
+        engineConfiguration.setDatabaseSchemaUpdate(AbstractEngineConfiguration.DB_SCHEMA_UPDATE_CREATE);
+
+        try {
+            CmmnEngine cmmnEngine = engineConfiguration.buildEngine();
+
+            // then update the version to something that is different to the library version
+            DbSqlSessionFactory dbSqlSessionFactory = (DbSqlSessionFactory) cmmnEngine.getCmmnEngineConfiguration()
+                    .getSessionFactories()
+                    .get(DbSqlSession.class);
+            SqlSessionFactory sqlSessionFactory = dbSqlSessionFactory.getSqlSessionFactory();
+            SqlSession sqlSession = sqlSessionFactory.openSession();
+            boolean success = false;
+            try {
+                Map<String, Object> parameters = new HashMap<>();
+                parameters.put("name", "cmmn.schema.version");
+                parameters.put("value", "25.7");
+                parameters.put("revision", 1);
+                parameters.put("newRevision", 2);
+                sqlSession.update("updateProperty", parameters);
+                success = true;
+            } catch (Exception e) {
+                throw new FlowableException("couldn't update db schema version", e);
+            } finally {
+                if (success) {
+                    sqlSession.commit();
+                } else {
+                    sqlSession.rollback();
+                }
+                sqlSession.close();
+            }
+
+            // now we can see what happens if when a cmmn engine is being
+            // build with a version mismatch between library and db tables
+            Consumer<FlowableWrongDbException> flowableWrongDbExceptionRequirements = flowableWrongDbException -> {
+                assertThat(flowableWrongDbException.getDbVersion()).isEqualTo("25.7");
+                assertThat(flowableWrongDbException.getLibraryVersion()).isEqualTo(CmmnEngine.VERSION);
+            };
+            assertThatThrownBy(() -> CmmnEngineConfiguration
+                    .createCmmnEngineConfigurationFromResource("org/flowable/cmmn/test/initialization/notables.flowable.cmmn.cfg.xml")
+                    .buildCmmnEngine())
+                    .isInstanceOfSatisfying(FlowableWrongDbException.class, flowableWrongDbExceptionRequirements)
+                    .hasMessageContaining("version mismatch");
+
+            // closing the original process engine to drop the db tables
+            cmmnEngine.close();
+        } finally {
+            engineConfiguration.getCommandExecutor().execute(new SchemaOperationsEngineDropDbCmd(engineConfiguration.getEngineScopeType()));
+        }
+
+    }
+
+}
diff --git a/modules/flowable-cmmn-engine/src/test/resources/log4j.properties b/modules/flowable-cmmn-engine/src/test/resources/log4j.properties
index af13413e8dc..e7d24815f3a 100644
--- a/modules/flowable-cmmn-engine/src/test/resources/log4j.properties
+++ b/modules/flowable-cmmn-engine/src/test/resources/log4j.properties
@@ -9,7 +9,6 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 log4j.logger.org.apache.ibatis=DEBUG
 log4j.logger.jakarta.activation=INFO
 log4j.logger.org.springframework=INFO
-log4j.logger.liquibase=INFO
 
 log4j.logger.org.flowable.task.service.impl.persistence=DEBUG
 log4j.logger.org.flowable.cmmn.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/initialization/notables.flowable.cmmn.cfg.xml b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/initialization/notables.flowable.cmmn.cfg.xml
new file mode 100644
index 00000000000..7ebea60175d
--- /dev/null
+++ b/modules/flowable-cmmn-engine/src/test/resources/org/flowable/cmmn/test/initialization/notables.flowable.cmmn.cfg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans   http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="cmmnEngineConfiguration" class="org.flowable.cmmn.engine.impl.cfg.StandaloneInMemCmmnEngineConfiguration">
+
+        <property name="databaseSchemaUpdate" value="false" />
+        <property name="jdbcUrl" value="jdbc:h2:mem:ProcessEngineInitializationTest;DB_CLOSE_DELAY=1000" />
+        
+        <property name="asyncExecutorActivate" value="false" />
+    </bean>
+    
+</beans>
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java
index 12313f9a806..0e1cdd0066a 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java
@@ -312,12 +312,7 @@ protected void assertAndEnsureCleanDb() throws Throwable {
                 cmmnEngineConfiguration,
                 TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK,
                 exception == null,
-                commandContext -> {
-                    SchemaManager schemaManager = CommandContextUtil.getCmmnEngineConfiguration(commandContext).getSchemaManager();
-                    schemaManager.schemaDrop();
-                    schemaManager.schemaCreate();
-                    return null;
-                }
+                cmmnEngineConfiguration.getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-cmmn-spring-configurator/src/main/java/org/flowable/cmmn/spring/configurator/SpringCmmnEngineConfigurator.java b/modules/flowable-cmmn-spring-configurator/src/main/java/org/flowable/cmmn/spring/configurator/SpringCmmnEngineConfigurator.java
index 65c59f6c850..9d766e48a66 100644
--- a/modules/flowable-cmmn-spring-configurator/src/main/java/org/flowable/cmmn/spring/configurator/SpringCmmnEngineConfigurator.java
+++ b/modules/flowable-cmmn-spring-configurator/src/main/java/org/flowable/cmmn/spring/configurator/SpringCmmnEngineConfigurator.java
@@ -12,7 +12,6 @@
  */
 package org.flowable.cmmn.spring.configurator;
 
-import org.flowable.cmmn.engine.CmmnEngine;
 import org.flowable.cmmn.engine.configurator.CmmnEngineConfigurator;
 import org.flowable.cmmn.spring.SpringCmmnEngineConfiguration;
 import org.flowable.common.engine.api.FlowableException;
@@ -62,7 +61,7 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
             cmmnEngineConfiguration.setBeans(springEngineConfiguration.getBeans());
         }
 
-        initCmmnEngine();
+        initEngine();
 
         if (springProcessEngineConfiguration != null) {
             cmmnEngineConfiguration.getJobServiceConfiguration().getInternalJobManager()
@@ -81,15 +80,6 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
         initServiceConfigurations(engineConfiguration, cmmnEngineConfiguration);
     }
 
-    @Override
-    protected synchronized CmmnEngine initCmmnEngine() {
-        if (cmmnEngineConfiguration == null) {
-            throw new FlowableException("CmmnEngineConfiguration is required");
-        }
-
-        return cmmnEngineConfiguration.buildCmmnEngine();
-    }
-
     @Override
     public SpringCmmnEngineConfiguration getCmmnEngineConfiguration() {
         return (SpringCmmnEngineConfiguration) cmmnEngineConfiguration;
diff --git a/modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/SpringCmmnEngineConfiguration.java b/modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/SpringCmmnEngineConfiguration.java
index f16ce92a526..82b961680ef 100644
--- a/modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/SpringCmmnEngineConfiguration.java
+++ b/modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/SpringCmmnEngineConfiguration.java
@@ -68,8 +68,8 @@ public SpringCmmnEngineConfiguration() {
     }
 
     @Override
-    public CmmnEngine buildCmmnEngine() {
-        CmmnEngine cmmnEngine = super.buildCmmnEngine();
+    public CmmnEngine buildEngine() {
+        CmmnEngine cmmnEngine = super.buildEngine();
         CmmnEngines.setInitialized(true);
         enginesBuild.add(cmmnEngine.getName());
         return cmmnEngine;
diff --git a/modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/autodeployment/AbstractCmmnAutoDeploymentStrategy.java b/modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/autodeployment/AbstractCmmnAutoDeploymentStrategy.java
index d1ad10149b8..11308ac3e7a 100644
--- a/modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/autodeployment/AbstractCmmnAutoDeploymentStrategy.java
+++ b/modules/flowable-cmmn-spring/src/main/java/org/flowable/cmmn/spring/autodeployment/AbstractCmmnAutoDeploymentStrategy.java
@@ -19,7 +19,7 @@
 
 import org.flowable.cmmn.api.repository.CmmnDeploymentBuilder;
 import org.flowable.cmmn.engine.CmmnEngine;
-import org.flowable.common.engine.impl.lock.LockManager;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.spring.CommonAutoDeploymentProperties;
 import org.flowable.common.spring.CommonAutoDeploymentStrategy;
 import org.springframework.core.io.Resource;
diff --git a/modules/flowable-dmn-api/src/main/java/org/flowable/dmn/api/DmnManagementService.java b/modules/flowable-dmn-api/src/main/java/org/flowable/dmn/api/DmnManagementService.java
index dacd7afac7e..da9679acfaf 100644
--- a/modules/flowable-dmn-api/src/main/java/org/flowable/dmn/api/DmnManagementService.java
+++ b/modules/flowable-dmn-api/src/main/java/org/flowable/dmn/api/DmnManagementService.java
@@ -14,6 +14,7 @@
 
 import java.util.Map;
 
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.management.TableMetaData;
 import org.flowable.common.engine.api.management.TablePageQuery;
 import org.flowable.common.engine.api.tenant.ChangeTenantIdBuilder;
@@ -54,4 +55,15 @@ public interface DmnManagementService {
      */
     ChangeTenantIdBuilder createChangeTenantIdBuilder(String fromTenantId, String toTenantId);
     
+    /**
+     * Acquire a lock manager for the requested lock.
+     * This is a stateless call, this means that every time a lock manager
+     * is requested a new one would be created. Make sure that you release the lock
+     * once you are done.
+     *
+     * @param lockName the name of the lock that is being requested
+     *
+     * @return the lock manager for the given lock
+     */
+    LockManager getLockManager(String lockName);
 }
diff --git a/modules/flowable-dmn-engine-configurator/src/main/java/org/flowable/dmn/engine/configurator/DmnEngineConfigurator.java b/modules/flowable-dmn-engine-configurator/src/main/java/org/flowable/dmn/engine/configurator/DmnEngineConfigurator.java
index 0fa940796e0..39ff7cd0384 100644
--- a/modules/flowable-dmn-engine-configurator/src/main/java/org/flowable/dmn/engine/configurator/DmnEngineConfigurator.java
+++ b/modules/flowable-dmn-engine-configurator/src/main/java/org/flowable/dmn/engine/configurator/DmnEngineConfigurator.java
@@ -31,7 +31,7 @@
  * @author Tijs Rademakers
  * @author Joram Barrez
  */
-public class DmnEngineConfigurator extends AbstractEngineConfigurator {
+public class DmnEngineConfigurator extends AbstractEngineConfigurator<DmnEngine> {
 
     protected DmnEngineConfiguration dmnEngineConfiguration;
     
@@ -60,7 +60,7 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
         
         initialiseCommonProperties(engineConfiguration, dmnEngineConfiguration);
 
-        initDmnEngine();
+        initEngine();
         
         initServiceConfigurations(engineConfiguration, dmnEngineConfiguration);
     }
@@ -75,7 +75,8 @@ protected List<Class<? extends Entity>> getEntityDeletionOrder() {
         return EntityDependencyOrder.DELETE_ORDER;
     }
 
-    protected synchronized DmnEngine initDmnEngine() {
+    @Override
+    protected DmnEngine buildEngine() {
         if (dmnEngineConfiguration == null) {
             throw new FlowableException("DmnEngineConfiguration is required");
         }
diff --git a/modules/flowable-dmn-engine/pom.xml b/modules/flowable-dmn-engine/pom.xml
index 55b63b32a1a..a41d11a5938 100755
--- a/modules/flowable-dmn-engine/pom.xml
+++ b/modules/flowable-dmn-engine/pom.xml
@@ -17,6 +17,12 @@
 		<flowable.artifact>
 			org.flowable.dmn.engine
 		</flowable.artifact>
+		<flowable.osgi.export.additional>
+            org.flowable.dmn.db.create,
+            org.flowable.dmn.db.upgrade,
+            org.flowable.dmn.db.mapping,
+            org.flowable.dmn.db.mapping.entity,
+        </flowable.osgi.export.additional>
 		<flowable.osgi.import.additional>
 			org.springframework*;resolution:=optional,
 		</flowable.osgi.import.additional>
@@ -82,11 +88,6 @@
       	</dependency>
 
         <!-- DATABASE -->
-        <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/DmnEngineConfiguration.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/DmnEngineConfiguration.java
index 7af73cec92f..10a350b0b63 100755
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/DmnEngineConfiguration.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/DmnEngineConfiguration.java
@@ -28,10 +28,12 @@
 import org.apache.ibatis.transaction.TransactionFactory;
 import org.flowable.common.engine.api.delegate.FlowableFunctionDelegate;
 import org.flowable.common.engine.api.scope.ScopeTypes;
+import org.flowable.common.engine.impl.AbstractBuildableEngineConfiguration;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.HasExpressionManagerEngineConfiguration;
 import org.flowable.common.engine.impl.cfg.BeansConfigurationHelper;
 import org.flowable.common.engine.impl.db.DbSqlSessionFactory;
+import org.flowable.common.engine.impl.db.SchemaManager;
 import org.flowable.common.engine.impl.el.DefaultExpressionManager;
 import org.flowable.common.engine.impl.el.ExpressionManager;
 import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
@@ -52,6 +54,7 @@
 import org.flowable.dmn.api.DmnRepositoryService;
 import org.flowable.dmn.engine.impl.DmnDecisionServiceImpl;
 import org.flowable.dmn.engine.impl.DmnEngineImpl;
+import org.flowable.dmn.engine.impl.DmnEnginePostEngineBuildConsumer;
 import org.flowable.dmn.engine.impl.DmnHistoryServiceImpl;
 import org.flowable.dmn.engine.impl.DmnManagementServiceImpl;
 import org.flowable.dmn.engine.impl.DmnRepositoryServiceImpl;
@@ -61,7 +64,6 @@
 import org.flowable.dmn.engine.impl.agenda.DmnEngineAgendaSessionFactory;
 import org.flowable.dmn.engine.impl.cfg.StandaloneDmnEngineConfiguration;
 import org.flowable.dmn.engine.impl.cfg.StandaloneInMemDmnEngineConfiguration;
-import org.flowable.dmn.engine.impl.cmd.SchemaOperationsDmnEngineBuild;
 import org.flowable.dmn.engine.impl.db.DmnDbSchemaManager;
 import org.flowable.dmn.engine.impl.db.EntityDependencyOrder;
 import org.flowable.dmn.engine.impl.deployer.CachingAndArtifactsManager;
@@ -113,13 +115,11 @@
 import org.flowable.dmn.image.DecisionRequirementsDiagramGenerator;
 import org.flowable.dmn.image.impl.DefaultDecisionRequirementsDiagramGenerator;
 
-public class DmnEngineConfiguration extends AbstractEngineConfiguration
+public class DmnEngineConfiguration extends AbstractBuildableEngineConfiguration<DmnEngine>
         implements DmnEngineConfigurationApi, HasExpressionManagerEngineConfiguration {
 
     public static final String DEFAULT_MYBATIS_MAPPING_FILE = "org/flowable/dmn/db/mapping/mappings.xml";
 
-    public static final String LIQUIBASE_CHANGELOG_PREFIX = "ACT_DMN_";
-
     protected String dmnEngineName = DmnEngines.NAME_DEFAULT;
 
     protected DmnEngineAgendaFactory dmnEngineAgendaFactory;
@@ -239,14 +239,24 @@ public static DmnEngineConfiguration createStandaloneInMemDmnEngineConfiguration
     // buildDmnEngine
     // ///////////////////////////////////////////////////////
 
-    public DmnEngine buildDmnEngine() {
-        init();
+    @Override
+    protected DmnEngine createEngine() {
         return new DmnEngineImpl(this);
     }
 
+    @Override
+    protected Consumer<DmnEngine> createPostEngineBuildConsumer() {
+        return new DmnEnginePostEngineBuildConsumer();
+    }
+
+    public DmnEngine buildDmnEngine() {
+        return buildEngine();
+    }
+
     // init
     // /////////////////////////////////////////////////////////////////////
 
+    @Override
     protected void init() {
         initEngineConfigurations();
         initClock();
@@ -337,19 +347,8 @@ public void initEntityManagers() {
     // ///////////////////////////////////////////////////////////////
 
     @Override
-    public void initSchemaManager() {
-        super.initSchemaManager();
-        if (this.schemaManager == null) {
-            this.schemaManager = new DmnDbSchemaManager();
-        }
-    }
-
-    public void initSchemaManagementCommand() {
-        if (schemaManagementCmd == null) {
-            if (usingRelationalDatabase && databaseSchemaUpdate != null) {
-                this.schemaManagementCmd = new SchemaOperationsDmnEngineBuild();
-            }
-        }
+    protected SchemaManager createEngineSchemaManager() {
+        return new DmnDbSchemaManager();
     }
 
     // session factories ////////////////////////////////////////////////////////
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/DmnEnginePostEngineBuildConsumer.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/DmnEnginePostEngineBuildConsumer.java
new file mode 100644
index 00000000000..41c9d6953ba
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/DmnEnginePostEngineBuildConsumer.java
@@ -0,0 +1,35 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.dmn.engine.impl;
+
+import java.util.function.Consumer;
+
+import org.flowable.common.engine.api.engine.EngineLifecycleListener;
+import org.flowable.dmn.engine.DmnEngine;
+import org.flowable.dmn.engine.DmnEngineConfiguration;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class DmnEnginePostEngineBuildConsumer implements Consumer<DmnEngine> {
+
+    @Override
+    public void accept(DmnEngine dmnEngine) {
+        DmnEngineConfiguration engineConfiguration = dmnEngine.getDmnEngineConfiguration();
+        if (engineConfiguration.getEngineLifecycleListeners() != null) {
+            for (EngineLifecycleListener engineLifecycleListener : engineConfiguration.getEngineLifecycleListeners()) {
+                engineLifecycleListener.onEngineBuilt(dmnEngine);
+            }
+        }
+    }
+}
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/DmnManagementServiceImpl.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/DmnManagementServiceImpl.java
index f2daa39c027..e5fbbb0a5d7 100755
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/DmnManagementServiceImpl.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/DmnManagementServiceImpl.java
@@ -14,12 +14,14 @@
 
 import java.util.Map;
 
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.management.TableMetaData;
 import org.flowable.common.engine.api.management.TablePageQuery;
 import org.flowable.common.engine.api.tenant.ChangeTenantIdBuilder;
 import org.flowable.common.engine.impl.cmd.CustomSqlExecution;
 import org.flowable.common.engine.impl.cmd.GetTableCountCmd;
 import org.flowable.common.engine.impl.cmd.GetTableMetaDataCmd;
+import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.common.engine.impl.persistence.entity.TablePageQueryImpl;
 import org.flowable.common.engine.impl.service.CommonEngineServiceImpl;
 import org.flowable.common.engine.impl.tenant.ChangeTenantIdBuilderImpl;
@@ -66,5 +68,10 @@ public <MapperType, ResultType> ResultType executeCustomSql(CustomSqlExecution<M
     public ChangeTenantIdBuilder createChangeTenantIdBuilder(String fromTenantId, String toTenantId) {
         return new ChangeTenantIdBuilderImpl(fromTenantId, toTenantId, configuration.getChangeTenantIdManager());
     }
+    
+    @Override
+    public LockManager getLockManager(String lockName) {
+        return new LockManagerImpl(commandExecutor, lockName, getConfiguration().getLockPollRate(), configuration.getEngineCfgKey());
+    }
 
 }
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/aot/FlowableDmnRuntimeHints.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/aot/FlowableDmnRuntimeHints.java
index f3c0e982531..d6805ba2761 100644
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/aot/FlowableDmnRuntimeHints.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/aot/FlowableDmnRuntimeHints.java
@@ -26,7 +26,6 @@ public class FlowableDmnRuntimeHints implements RuntimeHintsRegistrar {
     public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
         ResourceHints resourceHints = hints.resources();
         FlowableMyBatisResourceHintsRegistrar.registerMappingResources("org/flowable/dmn/db/mapping", hints, classLoader);
-        resourceHints.registerPattern("org/flowable/dmn/db/liquibase/flowable-dmn-db-changelog.xml");
         resourceHints.registerPattern("org/flowable/impl/dmn/parser/*.xsd");
     }
 }
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/cmd/SchemaOperationsDmnEngineBuild.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/cmd/SchemaOperationsDmnEngineBuild.java
deleted file mode 100644
index dfcd34f82f5..00000000000
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/cmd/SchemaOperationsDmnEngineBuild.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.dmn.engine.impl.cmd;
-
-import org.flowable.common.engine.impl.interceptor.Command;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
-import org.flowable.dmn.engine.impl.db.DmnDbSchemaManager;
-import org.flowable.dmn.engine.impl.util.CommandContextUtil;
-
-/**
- * @author Joram Barrez
- */
-public class SchemaOperationsDmnEngineBuild implements Command<Void> {
-
-    @Override
-    public Void execute(CommandContext commandContext) {
-        ((DmnDbSchemaManager) CommandContextUtil.getDmnEngineConfiguration(commandContext).getSchemaManager()).initSchema();
-        return null;
-    }
-
-}
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/DbSchemaDrop.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/DbSchemaDrop.java
index d89b446d3b0..016382c1c14 100644
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/DbSchemaDrop.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/DbSchemaDrop.java
@@ -13,19 +13,11 @@
 
 package org.flowable.dmn.engine.impl.db;
 
-import javax.sql.DataSource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.flowable.dmn.engine.DmnEngine;
-import org.flowable.dmn.engine.DmnEngineConfiguration;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
+import org.flowable.common.engine.impl.interceptor.CommandConfig;
+import org.flowable.common.engine.impl.interceptor.CommandExecutor;
 import org.flowable.dmn.engine.DmnEngines;
-
-import liquibase.Liquibase;
-import liquibase.database.Database;
-import liquibase.database.DatabaseConnection;
-import liquibase.database.DatabaseFactory;
-import liquibase.database.jvm.JdbcConnection;
-import liquibase.resource.ClassLoaderResourceAccessor;
+import org.flowable.dmn.engine.impl.DmnEngineImpl;
 
 /**
  * @author Tijs Rademakers
@@ -33,31 +25,9 @@
 public class DbSchemaDrop {
 
     public static void main(String[] args) {
-        try {
-            DmnEngine dmnEngine = DmnEngines.getDefaultDmnEngine();
-            DataSource dataSource = dmnEngine.getDmnEngineConfiguration().getDataSource();
-
-            DatabaseConnection connection = new JdbcConnection(dataSource.getConnection());
-            Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(connection);
-            database.setDatabaseChangeLogTableName(DmnEngineConfiguration.LIQUIBASE_CHANGELOG_PREFIX + database.getDatabaseChangeLogTableName());
-            database.setDatabaseChangeLogLockTableName(DmnEngineConfiguration.LIQUIBASE_CHANGELOG_PREFIX + database.getDatabaseChangeLogLockTableName());
-
-            if (StringUtils.isNotEmpty(dmnEngine.getDmnEngineConfiguration().getDatabaseSchema())) {
-                database.setDefaultSchemaName(dmnEngine.getDmnEngineConfiguration().getDatabaseSchema());
-                database.setLiquibaseSchemaName(dmnEngine.getDmnEngineConfiguration().getDatabaseSchema());
-            }
-
-            if (StringUtils.isNotEmpty(dmnEngine.getDmnEngineConfiguration().getDatabaseCatalog())) {
-                database.setDefaultCatalogName(dmnEngine.getDmnEngineConfiguration().getDatabaseCatalog());
-                database.setLiquibaseCatalogName(dmnEngine.getDmnEngineConfiguration().getDatabaseCatalog());
-            }
-
-            Liquibase liquibase = new Liquibase("org/flowable/dmn/db/liquibase/flowable-dmn-db-changelog.xml", new ClassLoaderResourceAccessor(), database);
-            liquibase.dropAll();
-            liquibase.getDatabase().close();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        DmnEngineImpl dmnEngine = (DmnEngineImpl) DmnEngines.getDefaultDmnEngine();
+        CommandExecutor commandExecutor = dmnEngine.getDmnEngineConfiguration().getCommandExecutor();
+        CommandConfig config = new CommandConfig().transactionNotSupported();
+        commandExecutor.execute(config, new SchemaOperationsEngineDropDbCmd(dmnEngine.getDmnEngineConfiguration().getEngineScopeType()));
     }
 }
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java
index 961c861cae6..832039cc4ce 100644
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java
@@ -13,58 +13,80 @@
 
 package org.flowable.dmn.engine.impl.db;
 
-import org.flowable.common.engine.impl.db.EngineDatabaseConfiguration;
-import org.flowable.common.engine.impl.db.LiquibaseBasedSchemaManager;
-import org.flowable.common.engine.impl.db.LiquibaseDatabaseConfiguration;
-import org.flowable.common.engine.impl.db.SchemaManager;
-import org.flowable.dmn.engine.DmnEngineConfiguration;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.db.EngineSqlScriptBasedDbSchemaManager;
+import org.flowable.dmn.engine.DmnEngine;
 import org.flowable.dmn.engine.impl.util.CommandContextUtil;
 
-public class DmnDbSchemaManager extends LiquibaseBasedSchemaManager {
-    
-    public static final String LIQUIBASE_CHANGELOG = "org/flowable/dmn/db/liquibase/flowable-dmn-db-changelog.xml";
+public class DmnDbSchemaManager extends EngineSqlScriptBasedDbSchemaManager {
+
+    protected static final String DMN_DB_SCHEMA_LOCK_NAME = "dmnDbSchemaLock";
+
+    protected static final Map<String, String> changeLogVersionMap = Map.ofEntries(
+            Map.entry("1", "6.0.0.5"),
+            Map.entry("2", "6.1.1.0"),
+            Map.entry("3", "6.3.0.0"),
+            Map.entry("4", "6.3.1.0"),
+            Map.entry("5", "6.4.0.0"),
+            Map.entry("6", "6.4.1.3"),
+            Map.entry("7", "6.6.0.0"),
+            Map.entry("8", "6.6.0.0"),
+            Map.entry("9", "6.8.0.0"),
+            Map.entry("10", "7.1.0.0")
+    );
 
     public DmnDbSchemaManager() {
-        super("dmn", LIQUIBASE_CHANGELOG, DmnEngineConfiguration.LIQUIBASE_CHANGELOG_PREFIX);
+        super("dmn");
     }
 
     @Override
-    protected LiquibaseDatabaseConfiguration getDatabaseConfiguration() {
-        return new EngineDatabaseConfiguration(CommandContextUtil.getDmnEngineConfiguration());
+    protected String getEngineVersion() {
+        return DmnEngine.VERSION;
     }
 
-    public void initSchema() {
-        initSchema(CommandContextUtil.getDmnEngineConfiguration().getDatabaseSchemaUpdate());
+    @Override
+    protected String getSchemaVersionPropertyName() {
+        return "dmn.schema.version";
     }
 
     @Override
-    public void schemaCreate() {
-        getCommonSchemaManager().schemaCreate();
-        super.schemaCreate();
+    protected String getDbSchemaLockName() {
+        return DMN_DB_SCHEMA_LOCK_NAME;
     }
 
     @Override
-    public void schemaDrop() {
-        try {
-            super.schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping dmn engine tables", e);
-        }
+    protected String getEngineTableName() {
+        return "ACT_DMN_DECISION";
+    }
 
-        try {
-            getCommonSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping common tables", e);
+    @Override
+    protected String getChangeLogTableName() {
+        return "ACT_DMN_DATABASECHANGELOG";
+    }
+    
+    @Override
+    protected String getChangeLogTablePrefixName() {
+        return "ACT_DMN";
+    }
+
+    @Override
+    protected String getDbVersionForChangelogVersion(String changeLogVersion) {
+        if (StringUtils.isNotEmpty(changeLogVersion) && changeLogVersionMap.containsKey(changeLogVersion)) {
+            return changeLogVersionMap.get(changeLogVersion);
         }
+        return "5.99.0.0";
     }
 
     @Override
-    public String schemaUpdate() {
-        getCommonSchemaManager().schemaUpdate();
-        return super.schemaUpdate();
+    protected AbstractEngineConfiguration getEngineConfiguration() {
+        return CommandContextUtil.getDmnEngineConfiguration();
     }
 
-    protected SchemaManager getCommonSchemaManager() {
-        return CommandContextUtil.getDmnEngineConfiguration().getCommonSchemaManager();
+    @Override
+    protected String getResourcesRootDirectory() {
+        return "org/flowable/dmn/db/";
     }
 }
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/test/DmnTestHelper.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/test/DmnTestHelper.java
index cfa676e75c2..b73a0622fc0 100644
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/test/DmnTestHelper.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/test/DmnTestHelper.java
@@ -172,15 +172,7 @@ public static void assertAndEnsureCleanDb(final DmnEngine dmnEngine) {
                 dmnEngine.getDmnEngineConfiguration(),
                 TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK,
                 true,
-                new Command<>() {
-                    @Override
-                    public Void execute(CommandContext commandContext) {
-                        SchemaManager schemaManager = CommandContextUtil.getDmnEngineConfiguration().getSchemaManager();
-                        schemaManager.schemaDrop();
-                        schemaManager.schemaCreate();
-                        return null;
-                    }
-                }
+                dmnEngine.getDmnEngineConfiguration().getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.db2.create.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.db2.create.dmn.sql
new file mode 100644
index 00000000000..71407443be8
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.db2.create.dmn.sql
@@ -0,0 +1,34 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DEPLOY PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_DMN_DEPLOY PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION_TABLE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DECISI PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, INSTANCE_ID_ VARCHAR(255), EXECUTION_ID_ VARCHAR(255), ACTIVITY_ID_ VARCHAR(255), FAILED_ SMALLINT DEFAULT 0, TENANT_ID_ VARCHAR(255), EXECUTION_JSON_ CLOB, CONSTRAINT PK_ACT_DMN_HI_DEC PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_DMN_HI_DECISION_EXECUTION');
+
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_DMN_DECISION_TABLE');
+
+CREATE UNIQUE INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
+
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ;
+
+RENAME ACT_DMN_DECISION_TABLE TO ACT_DMN_DECISION;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_DMN_DECISION');
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_DMN_DECISION');
+
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('dmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.h2.create.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.h2.create.dmn.sql
new file mode 100644
index 00000000000..9d90304335a
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.h2.create.dmn.sql
@@ -0,0 +1,18 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_DMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INT, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DECISION_TABLE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, INSTANCE_ID_ VARCHAR(255), EXECUTION_ID_ VARCHAR(255), ACTIVITY_ID_ VARCHAR(255), FAILED_ BOOLEAN DEFAULT FALSE, TENANT_ID_ VARCHAR(255), EXECUTION_JSON_ CLOB, CONSTRAINT PK_ACT_DMN_HI_DECISION_EXECUTION PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR(255);
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('dmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.mssql.create.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.mssql.create.dmn.sql
new file mode 100644
index 00000000000..48361a900f1
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.mssql.create.dmn.sql
@@ -0,0 +1,42 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ varchar(255) NOT NULL, NAME_ varchar(255), CATEGORY_ varchar(255), DEPLOY_TIME_ datetime, TENANT_ID_ varchar(255), PARENT_DEPLOYMENT_ID_ varchar(255), CONSTRAINT PK_ACT_DMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ varchar(255) NOT NULL, NAME_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_BYTES_ varbinary(MAX), CONSTRAINT PK_ACT_DMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION_TABLE (ID_ varchar(255) NOT NULL, NAME_ varchar(255), VERSION_ int, KEY_ varchar(255), CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), PARENT_DEPLOYMENT_ID_ varchar(255), TENANT_ID_ varchar(255), RESOURCE_NAME_ varchar(255), DESCRIPTION_ varchar(255), CONSTRAINT PK_ACT_DMN_DECISION_TABLE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ varchar(255) NOT NULL, DECISION_DEFINITION_ID_ varchar(255), DEPLOYMENT_ID_ varchar(255), START_TIME_ datetime, END_TIME_ datetime, INSTANCE_ID_ varchar(255), EXECUTION_ID_ varchar(255), ACTIVITY_ID_ varchar(255), FAILED_ bit CONSTRAINT DF_ACT_DMN_HI_DECISION_EXECUTION_FAILED_ DEFAULT 0, TENANT_ID_ varchar(255), EXECUTION_JSON_ varchar(MAX), CONSTRAINT PK_ACT_DMN_HI_DECISION_EXECUTION PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ varchar(255);
+
+DECLARE @sql [nvarchar](MAX)
+SELECT @sql = N'ALTER TABLE ACT_DMN_DECISION_TABLE DROP CONSTRAINT ' + QUOTENAME([df].[name]) FROM [sys].[columns] AS [c] INNER JOIN [sys].[default_constraints] AS [df] ON [df].[object_id] = [c].[default_object_id] WHERE [c].[object_id] = OBJECT_ID(N'ACT_DMN_DECISION_TABLE') AND [c].[name] = N'PARENT_DEPLOYMENT_ID_'
+EXEC sp_executesql @sql;
+
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
+
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE;
+
+exec sp_rename 'ACT_DMN_DECISION_TABLE', 'ACT_DMN_DECISION';
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ varchar(255);
+
+CREATE NONCLUSTERED INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
+
+ALTER TABLE ACT_DMN_DEPLOYMENT ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DEPLOYMENT_RESOURCE ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DECISION ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DECISION ALTER COLUMN CATEGORY_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DECISION ALTER COLUMN RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DECISION ALTER COLUMN DESCRIPTION_ nvarchar(255);
+
+insert into ACT_GE_PROPERTY
+values ('dmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.mysql.create.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.mysql.create.dmn.sql
new file mode 100644
index 00000000000..dcac1a9a74d
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.mysql.create.dmn.sql
@@ -0,0 +1,18 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime(3) NULL, TENANT_ID_ VARCHAR(255) NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, CONSTRAINT PK_ACT_DMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_ACT_DMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, VERSION_ INT NULL, KEY_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(255) NULL, DESCRIPTION_ VARCHAR(255) NULL, CONSTRAINT PK_ACT_DMN_DECISION_TABLE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, START_TIME_ datetime(3) NULL, END_TIME_ datetime(3) NULL, INSTANCE_ID_ VARCHAR(255) NULL, EXECUTION_ID_ VARCHAR(255) NULL, ACTIVITY_ID_ VARCHAR(255) NULL, FAILED_ TINYINT DEFAULT 0 NULL, TENANT_ID_ VARCHAR(255) NULL, EXECUTION_JSON_ LONGTEXT NULL, CONSTRAINT PK_ACT_DMN_HI_DECISION_EXECUTION PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR(255) NULL;
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR(255) NULL;
+
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('dmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.oracle.create.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.oracle.create.dmn.sql
new file mode 100644
index 00000000000..4a11fe146d7
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.oracle.create.dmn.sql
@@ -0,0 +1,26 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR2(255), PARENT_DEPLOYMENT_ID_ VARCHAR2(255), CONSTRAINT PK_ACT_DMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_DMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION_TABLE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), VERSION_ INTEGER, KEY_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), PARENT_DEPLOYMENT_ID_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(255), DESCRIPTION_ VARCHAR2(255), CONSTRAINT PK_ACT_DMN_DECISION_TABLE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR2(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, INSTANCE_ID_ VARCHAR2(255), EXECUTION_ID_ VARCHAR2(255), ACTIVITY_ID_ VARCHAR2(255), FAILED_ NUMBER(1) DEFAULT 0, TENANT_ID_ VARCHAR2(255), EXECUTION_JSON_ CLOB, CONSTRAINT PK_ACT_DMN_HI_DECISION_EXECUTI PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR2(255);
+
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
+
+CREATE UNIQUE INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
+
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ;
+
+ALTER TABLE ACT_DMN_DECISION_TABLE RENAME TO ACT_DMN_DECISION;
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR2(255);
+
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('dmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.postgres.create.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.postgres.create.dmn.sql
new file mode 100644
index 00000000000..7c78cb6a9b6
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/create/flowable.postgres.create.dmn.sql
@@ -0,0 +1,18 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP WITHOUT TIME ZONE, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT "ACT_DMN_DEPLOYMENT_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT "ACT_DMN_DEPLOYMENT_RESOURCE_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT "ACT_DMN_DECISION_TABLE_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, END_TIME_ TIMESTAMP WITHOUT TIME ZONE, INSTANCE_ID_ VARCHAR(255), EXECUTION_ID_ VARCHAR(255), ACTIVITY_ID_ VARCHAR(255), FAILED_ BOOLEAN DEFAULT FALSE, TENANT_ID_ VARCHAR(255), EXECUTION_JSON_ TEXT, CONSTRAINT "ACT_DMN_HI_DECISION_EXECUTION_pkey" PRIMARY KEY (ID_));
+
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR(255);
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR(255);
+
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
+
+insert into ACT_GE_PROPERTY
+values ('dmn.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.h2.drop.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.h2.drop.dmn.sql
new file mode 100644
index 00000000000..06cfff2ec5c
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.h2.drop.dmn.sql
@@ -0,0 +1,7 @@
+drop index if exists ACT_IDX_DMN_INSTANCE_ID;
+drop index if exists ACT_IDX_DMN_DEC_UNIQ;
+
+drop table if exists ACT_DMN_HI_DECISION_EXECUTION cascade constraints;
+drop table if exists ACT_DMN_DECISION cascade constraints;
+drop table if exists ACT_DMN_DEPLOYMENT_RESOURCE cascade constraints;
+drop table if exists ACT_DMN_DEPLOYMENT cascade constraints;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.mysql.drop.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.mysql.drop.dmn.sql
new file mode 100644
index 00000000000..4a90aaa2caa
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.mysql.drop.dmn.sql
@@ -0,0 +1,7 @@
+drop index ACT_IDX_DMN_INSTANCE_ID on ACT_DMN_HI_DECISION_EXECUTION;
+drop index ACT_IDX_DMN_DEC_UNIQ on ACT_DMN_DECISION;
+
+drop table if exists ACT_DMN_HI_DECISION_EXECUTION;
+drop table if exists ACT_DMN_DECISION;
+drop table if exists ACT_DMN_DEPLOYMENT_RESOURCE;
+drop table if exists ACT_DMN_DEPLOYMENT;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.postgres.drop.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.postgres.drop.dmn.sql
new file mode 100644
index 00000000000..e3706e9a1d6
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/drop/flowable.postgres.drop.dmn.sql
@@ -0,0 +1,4 @@
+drop table if exists ACT_DMN_HI_DECISION_EXECUTION cascade;
+drop table if exists ACT_DMN_DECISION cascade;
+drop table if exists ACT_DMN_DEPLOYMENT_RESOURCE cascade;
+drop table if exists ACT_DMN_DEPLOYMENT cascade;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/liquibase/flowable-dmn-db-changelog.xml b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/liquibase/flowable-dmn-db-changelog.xml
deleted file mode 100644
index e2a9aa61178..00000000000
--- a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/liquibase/flowable-dmn-db-changelog.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
-        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
-    <changeSet id="1" author="activiti">
-
-        <createTable tableName="ACT_DMN_DEPLOYMENT">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="CATEGORY_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="DEPLOY_TIME_" type="datetime">
-                <constraints nullable="true" />
-            </column>
-            <column name="TENANT_ID_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="PARENT_DEPLOYMENT_ID_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <createTable tableName="ACT_DMN_DEPLOYMENT_RESOURCE">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="RESOURCE_BYTES_" type="longblob">
-                <constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <createTable tableName="ACT_DMN_DECISION_TABLE">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="VERSION_" type="int" />
-            <column name="KEY_" type="varchar(255)" />
-            <column name="CATEGORY_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="PARENT_DEPLOYMENT_ID_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="TENANT_ID_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="RESOURCE_NAME_" type="varchar(255)" />
-            <column name="DESCRIPTION_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-        </createTable>
-
-    </changeSet>
-    
-    <changeSet id="2" author="flowable">
-    
-        <createTable tableName="ACT_DMN_HI_DECISION_EXECUTION">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="DECISION_DEFINITION_ID_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="START_TIME_" type="datetime" />
-            <column name="END_TIME_" type="datetime">
-                <constraints nullable="true" />
-            </column>
-            <column name="INSTANCE_ID_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="EXECUTION_ID_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="ACTIVITY_ID_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="FAILED_" type="boolean" defaultValueBoolean="false" />
-            <column name="TENANT_ID_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="EXECUTION_JSON_" type="longtext">
-                <constraints nullable="true" />
-            </column>
-        </createTable>
-        
-    </changeSet>
-    
-    <changeSet id="3" author="flowable">
-    
-        <addColumn tableName="ACT_DMN_HI_DECISION_EXECUTION">
-            <column name="SCOPE_TYPE_" type="varchar(255)" />
-        </addColumn>
-    
-    </changeSet>
-    
-    <changeSet id="4" author="flowable">
-    
-        <dropColumn columnName="PARENT_DEPLOYMENT_ID_" tableName="ACT_DMN_DECISION_TABLE" />
-        
-    </changeSet>
-
-    <changeSet id="5" author="flowable" dbms="mysql,mariadb">
-
-        <modifyDataType tableName="ACT_DMN_DEPLOYMENT" columnName="DEPLOY_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_DMN_HI_DECISION_EXECUTION" columnName="START_TIME_" newDataType="datetime(3)" />
-        <modifyDataType tableName="ACT_DMN_HI_DECISION_EXECUTION" columnName="END_TIME_" newDataType="datetime(3)" />
-
-    </changeSet>
-
-    <changeSet id="6" author="flowable">
-
-        <createIndex tableName="ACT_DMN_DECISION_TABLE" indexName="ACT_IDX_DEC_TBL_UNIQ" unique="true">
-            <column name="KEY_" />
-            <column name="VERSION_" />
-            <column name="TENANT_ID_" />
-        </createIndex>
-
-    </changeSet>
-
-    <changeSet id="7" author="flowable">
-
-        <dropIndex tableName="ACT_DMN_DECISION_TABLE" indexName="ACT_IDX_DEC_TBL_UNIQ"/>
-
-        <renameTable
-                newTableName="ACT_DMN_DECISION"
-                oldTableName="ACT_DMN_DECISION_TABLE"/>
-
-        <createIndex tableName="ACT_DMN_DECISION" indexName="ACT_IDX_DMN_DEC_UNIQ" unique="true">
-            <column name="KEY_" />
-            <column name="VERSION_" />
-            <column name="TENANT_ID_" />
-        </createIndex>
-
-    </changeSet>
-
-    <changeSet id="8" author="flowable">
-
-        <addColumn tableName="ACT_DMN_DECISION">
-            <column name="DECISION_TYPE_" type="varchar(255)" />
-        </addColumn>
-
-    </changeSet>
-    
-    <changeSet id="9" author="flowable">
-
-        <createIndex tableName="ACT_DMN_HI_DECISION_EXECUTION" indexName="ACT_IDX_DMN_INSTANCE_ID">
-            <column name="INSTANCE_ID_" />
-        </createIndex>
-
-    </changeSet>
-    
-    <changeSet id="10" author="flowable" dbms="mssql">
-        <modifyDataType tableName="ACT_DMN_DEPLOYMENT" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_DMN_DEPLOYMENT_RESOURCE" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_DMN_DECISION" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_DMN_DECISION" columnName="CATEGORY_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_DMN_DECISION" columnName="RESOURCE_NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="ACT_DMN_DECISION" columnName="DESCRIPTION_" newDataType="nvarchar(255)" />
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml
index a742e75b3fa..293de0f36f3 100644
--- a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/mapping/mappings.xml
@@ -9,6 +9,7 @@
   <mappers>
     <!-- Common mappers -->
     <mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
+    <mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
     <mapper resource="org/flowable/common/db/mapping/common.xml" />
 
     <mapper resource="org/flowable/dmn/db/mapping/ChangeTenantDmn.xml" />
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.all.upgradestep.7100.to.7101.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.all.upgradestep.7100.to.7101.dmn.sql
new file mode 100644
index 00000000000..9cff2606af4
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.all.upgradestep.7100.to.7101.dmn.sql
@@ -0,0 +1,5 @@
+insert into ACT_GE_PROPERTY
+values ('dmn.schema.version', '7.1.0.1', 1);
+
+drop table ACT_DMN_DATABASECHANGELOG;
+drop table ACT_DMN_DATABASECHANGELOGLOCK;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.59900.to.6000.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.59900.to.6000.dmn.sql
new file mode 100644
index 00000000000..479e8f20934
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.59900.to.6000.dmn.sql
@@ -0,0 +1,7 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DEPLOY PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_DMN_DEPLOY PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION_TABLE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DECISI PRIMARY KEY (ID_));
+
+
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6100.to.6110.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6100.to.6110.dmn.sql
new file mode 100644
index 00000000000..227bbcaacd4
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6100.to.6110.dmn.sql
@@ -0,0 +1,3 @@
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, INSTANCE_ID_ VARCHAR(255), EXECUTION_ID_ VARCHAR(255), ACTIVITY_ID_ VARCHAR(255), FAILED_ SMALLINT DEFAULT 0, TENANT_ID_ VARCHAR(255), EXECUTION_JSON_ CLOB, CONSTRAINT PK_ACT_DMN_HI_DEC PRIMARY KEY (ID_));
+
+
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6210.to.6300.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6210.to.6300.dmn.sql
new file mode 100644
index 00000000000..39817d0e966
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6210.to.6300.dmn.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_DMN_HI_DECISION_EXECUTION');
+
+
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6300.to.6301.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6300.to.6301.dmn.sql
new file mode 100644
index 00000000000..75fa33bee2a
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6300.to.6301.dmn.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_DMN_DECISION_TABLE');
+
+
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6400.to.6410.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6400.to.6410.dmn.sql
new file mode 100644
index 00000000000..e835250d9a4
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6400.to.6410.dmn.sql
@@ -0,0 +1,3 @@
+CREATE UNIQUE INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
+
+
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6511.to.6512.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6511.to.6512.dmn.sql
new file mode 100644
index 00000000000..30f3a030913
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6511.to.6512.dmn.sql
@@ -0,0 +1,13 @@
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ;
+
+RENAME ACT_DMN_DECISION_TABLE TO ACT_DMN_DECISION;
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_DMN_DECISION');
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE ACT_DMN_DECISION');
+
+
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6723.to.6800.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6723.to.6800.dmn.sql
new file mode 100644
index 00000000000..adb9d4c0557
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.db2.upgradestep.6723.to.6800.dmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.59900.to.6000.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.59900.to.6000.dmn.sql
new file mode 100644
index 00000000000..bbe9a82963f
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.59900.to.6000.dmn.sql
@@ -0,0 +1,5 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_DMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION_TABLE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INT, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DECISION_TABLE PRIMARY KEY (ID_));
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6100.to.6110.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6100.to.6110.dmn.sql
new file mode 100644
index 00000000000..b4126421298
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6100.to.6110.dmn.sql
@@ -0,0 +1 @@
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, INSTANCE_ID_ VARCHAR(255), EXECUTION_ID_ VARCHAR(255), ACTIVITY_ID_ VARCHAR(255), FAILED_ BOOLEAN DEFAULT FALSE, TENANT_ID_ VARCHAR(255), EXECUTION_JSON_ CLOB, CONSTRAINT PK_ACT_DMN_HI_DECISION_EXECUTION PRIMARY KEY (ID_));
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6210.to.6300.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6210.to.6300.dmn.sql
new file mode 100644
index 00000000000..52e54a804ba
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6210.to.6300.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6300.to.6301.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6300.to.6301.dmn.sql
new file mode 100644
index 00000000000..d45b19fc7fa
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6300.to.6301.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6400.to.6410.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6400.to.6410.dmn.sql
new file mode 100644
index 00000000000..d4e92a24219
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6400.to.6410.dmn.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6511.to.6512.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6511.to.6512.dmn.sql
new file mode 100644
index 00000000000..fab3f27a64d
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6511.to.6512.dmn.sql
@@ -0,0 +1,7 @@
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ;
+
+ALTER TABLE ACT_DMN_DECISION_TABLE RENAME TO ACT_DMN_DECISION;
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6723.to.6800.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6723.to.6800.dmn.sql
new file mode 100644
index 00000000000..adb9d4c0557
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.h2.upgradestep.6723.to.6800.dmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.59900.to.6000.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.59900.to.6000.dmn.sql
new file mode 100644
index 00000000000..0b7d6a25cba
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.59900.to.6000.dmn.sql
@@ -0,0 +1,7 @@
+CREATE TABLE [ACT_DMN_DATABASECHANGELOG] ([ID] [nvarchar](255) NOT NULL, [AUTHOR] [nvarchar](255) NOT NULL, [FILENAME] [nvarchar](255) NOT NULL, [DATEEXECUTED] [datetime2](3) NOT NULL, [ORDEREXECUTED] [int] NOT NULL, [EXECTYPE] [nvarchar](10) NOT NULL, [MD5SUM] [nvarchar](35), [DESCRIPTION] [nvarchar](255), [COMMENTS] [nvarchar](255), [TAG] [nvarchar](255), [LIQUIBASE] [nvarchar](20), [CONTEXTS] [nvarchar](255), [LABELS] [nvarchar](255), [DEPLOYMENT_ID] [nvarchar](10))
+
+CREATE TABLE [ACT_DMN_DEPLOYMENT] ([ID_] [varchar](255) NOT NULL, [NAME_] [varchar](255), [CATEGORY_] [varchar](255), [DEPLOY_TIME_] [datetime], [TENANT_ID_] [varchar](255), [PARENT_DEPLOYMENT_ID_] [varchar](255), CONSTRAINT [PK_ACT_DMN_DEPLOYMENT] PRIMARY KEY ([ID_]))
+
+CREATE TABLE [ACT_DMN_DEPLOYMENT_RESOURCE] ([ID_] [varchar](255) NOT NULL, [NAME_] [varchar](255), [DEPLOYMENT_ID_] [varchar](255), [RESOURCE_BYTES_] [varbinary](MAX), CONSTRAINT [PK_ACT_DMN_DEPLOYMENT_RESOURCE] PRIMARY KEY ([ID_]))
+
+CREATE TABLE [ACT_DMN_DECISION_TABLE] ([ID_] [varchar](255) NOT NULL, [NAME_] [varchar](255), [VERSION_] [int], [KEY_] [varchar](255), [CATEGORY_] [varchar](255), [DEPLOYMENT_ID_] [varchar](255), [PARENT_DEPLOYMENT_ID_] [varchar](255), [TENANT_ID_] [varchar](255), [RESOURCE_NAME_] [varchar](255), [DESCRIPTION_] [varchar](255), CONSTRAINT [PK_ACT_DMN_DECISION_TABLE] PRIMARY KEY ([ID_]))
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6100.to.6110.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6100.to.6110.dmn.sql
new file mode 100644
index 00000000000..05961e57a55
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6100.to.6110.dmn.sql
@@ -0,0 +1 @@
+CREATE TABLE [ACT_DMN_HI_DECISION_EXECUTION] ([ID_] [varchar](255) NOT NULL, [DECISION_DEFINITION_ID_] [varchar](255), [DEPLOYMENT_ID_] [varchar](255), [START_TIME_] [datetime], [END_TIME_] [datetime], [INSTANCE_ID_] [varchar](255), [EXECUTION_ID_] [varchar](255), [ACTIVITY_ID_] [varchar](255), [FAILED_] [bit] CONSTRAINT [DF_ACT_DMN_HI_DECISION_EXECUTION_FAILED_] DEFAULT 0, [TENANT_ID_] [varchar](255), [EXECUTION_JSON_] [varchar](MAX), CONSTRAINT [PK_ACT_DMN_HI_DECISION_EXECUTION] PRIMARY KEY ([ID_]))
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.dmn.sql
new file mode 100644
index 00000000000..c06ee5c7659
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ varchar(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.dmn.sql
new file mode 100644
index 00000000000..c88ac49a27e
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.dmn.sql
@@ -0,0 +1,5 @@
+DECLARE @sql [nvarchar](MAX)
+SELECT @sql = N'ALTER TABLE ACT_DMN_DECISION_TABLE DROP CONSTRAINT ' + QUOTENAME([df].[name]) FROM [sys].[columns] AS [c] INNER JOIN [sys].[default_constraints] AS [df] ON [df].[object_id] = [c].[default_object_id] WHERE [c].[object_id] = OBJECT_ID(N'ACT_DMN_DECISION_TABLE') AND [c].[name] = N'PARENT_DEPLOYMENT_ID_'
+EXEC sp_executesql @sql;
+
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.dmn.sql
new file mode 100644
index 00000000000..d8bee94dbfe
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.dmn.sql
@@ -0,0 +1 @@
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.dmn.sql
new file mode 100644
index 00000000000..d39e7647f99
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.dmn.sql
@@ -0,0 +1,7 @@
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE;
+
+exec sp_rename 'ACT_DMN_DECISION_TABLE', 'ACT_DMN_DECISION';
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ varchar(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6723.to.6800.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6723.to.6800.dmn.sql
new file mode 100644
index 00000000000..239dcd9fa07
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.6723.to.6800.dmn.sql
@@ -0,0 +1 @@
+CREATE NONCLUSTERED INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.7010.to.7100.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.7010.to.7100.dmn.sql
new file mode 100644
index 00000000000..4f1fd1675a4
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mssql.upgradestep.7010.to.7100.dmn.sql
@@ -0,0 +1,11 @@
+ALTER TABLE ACT_DMN_DEPLOYMENT ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DEPLOYMENT_RESOURCE ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DECISION ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DECISION ALTER COLUMN CATEGORY_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DECISION ALTER COLUMN RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE ACT_DMN_DECISION ALTER COLUMN DESCRIPTION_ nvarchar(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.59900.to.6000.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.59900.to.6000.dmn.sql
new file mode 100644
index 00000000000..73f0b5fc560
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.59900.to.6000.dmn.sql
@@ -0,0 +1,5 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime NULL, TENANT_ID_ VARCHAR(255) NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, CONSTRAINT PK_ACT_DMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_ACT_DMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION_TABLE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, VERSION_ INT NULL, KEY_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(255) NULL, DESCRIPTION_ VARCHAR(255) NULL, CONSTRAINT PK_ACT_DMN_DECISION_TABLE PRIMARY KEY (ID_));
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6100.to.6110.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6100.to.6110.dmn.sql
new file mode 100644
index 00000000000..d64f0b58799
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6100.to.6110.dmn.sql
@@ -0,0 +1 @@
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, START_TIME_ datetime NULL, END_TIME_ datetime NULL, INSTANCE_ID_ VARCHAR(255) NULL, EXECUTION_ID_ VARCHAR(255) NULL, ACTIVITY_ID_ VARCHAR(255) NULL, FAILED_ BIT(1) DEFAULT 0 NULL, TENANT_ID_ VARCHAR(255) NULL, EXECUTION_JSON_ LONGTEXT NULL, CONSTRAINT PK_ACT_DMN_HI_DECISION_EXECUTION PRIMARY KEY (ID_));
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.dmn.sql
new file mode 100644
index 00000000000..fbde7455443
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR(255) NULL;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.dmn.sql
new file mode 100644
index 00000000000..d45b19fc7fa
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6320.to.6400.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6320.to.6400.dmn.sql
new file mode 100644
index 00000000000..ccd44e14089
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6320.to.6400.dmn.sql
@@ -0,0 +1,5 @@
+ALTER TABLE ACT_DMN_DEPLOYMENT MODIFY DEPLOY_TIME_ datetime(3);
+
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION MODIFY START_TIME_ datetime(3);
+
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION MODIFY END_TIME_ datetime(3);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.dmn.sql
new file mode 100644
index 00000000000..d4e92a24219
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.dmn.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.dmn.sql
new file mode 100644
index 00000000000..61ab45d0236
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.dmn.sql
@@ -0,0 +1,7 @@
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE;
+
+ALTER TABLE ACT_DMN_DECISION_TABLE RENAME ACT_DMN_DECISION;
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR(255) NULL;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6723.to.6800.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6723.to.6800.dmn.sql
new file mode 100644
index 00000000000..adb9d4c0557
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.mysql.upgradestep.6723.to.6800.dmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.59900.to.6000.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.59900.to.6000.dmn.sql
new file mode 100644
index 00000000000..833aaed4738
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.59900.to.6000.dmn.sql
@@ -0,0 +1,5 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR2(255), PARENT_DEPLOYMENT_ID_ VARCHAR2(255), CONSTRAINT PK_ACT_DMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_ACT_DMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION_TABLE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), VERSION_ INTEGER, KEY_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), PARENT_DEPLOYMENT_ID_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(255), DESCRIPTION_ VARCHAR2(255), CONSTRAINT PK_ACT_DMN_DECISION_TABLE PRIMARY KEY (ID_));
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6100.to.6110.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6100.to.6110.dmn.sql
new file mode 100644
index 00000000000..7389bdf9906
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6100.to.6110.dmn.sql
@@ -0,0 +1 @@
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR2(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), START_TIME_ TIMESTAMP, END_TIME_ TIMESTAMP, INSTANCE_ID_ VARCHAR2(255), EXECUTION_ID_ VARCHAR2(255), ACTIVITY_ID_ VARCHAR2(255), FAILED_ NUMBER(1) DEFAULT 0, TENANT_ID_ VARCHAR2(255), EXECUTION_JSON_ CLOB, CONSTRAINT PK_ACT_DMN_HI_DECISION_EXECUTI PRIMARY KEY (ID_));
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.dmn.sql
new file mode 100644
index 00000000000..cc5138a2dd8
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR2(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.dmn.sql
new file mode 100644
index 00000000000..d45b19fc7fa
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.dmn.sql
new file mode 100644
index 00000000000..d4e92a24219
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.dmn.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.dmn.sql
new file mode 100644
index 00000000000..e80d3c9dbeb
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.dmn.sql
@@ -0,0 +1,7 @@
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ;
+
+ALTER TABLE ACT_DMN_DECISION_TABLE RENAME TO ACT_DMN_DECISION;
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR2(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6723.to.6800.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6723.to.6800.dmn.sql
new file mode 100644
index 00000000000..adb9d4c0557
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.oracle.upgradestep.6723.to.6800.dmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.59900.to.6000.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.59900.to.6000.dmn.sql
new file mode 100644
index 00000000000..5cc4e51e842
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.59900.to.6000.dmn.sql
@@ -0,0 +1,5 @@
+CREATE TABLE ACT_DMN_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP WITHOUT TIME ZONE, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DEPLOYMENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT PK_ACT_DMN_DEPLOYMENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE ACT_DMN_DECISION_TABLE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INT, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_ACT_DMN_DECISION_TABLE PRIMARY KEY (ID_));
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6100.to.6110.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6100.to.6110.dmn.sql
new file mode 100644
index 00000000000..485d76bc16e
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6100.to.6110.dmn.sql
@@ -0,0 +1 @@
+CREATE TABLE ACT_DMN_HI_DECISION_EXECUTION (ID_ VARCHAR(255) NOT NULL, DECISION_DEFINITION_ID_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), START_TIME_ TIMESTAMP WITHOUT TIME ZONE, END_TIME_ TIMESTAMP WITHOUT TIME ZONE, INSTANCE_ID_ VARCHAR(255), EXECUTION_ID_ VARCHAR(255), ACTIVITY_ID_ VARCHAR(255), FAILED_ BOOLEAN DEFAULT FALSE, TENANT_ID_ VARCHAR(255), EXECUTION_JSON_ TEXT, CONSTRAINT PK_ACT_DMN_HI_DECISION_EXECUTION PRIMARY KEY (ID_));
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.dmn.sql
new file mode 100644
index 00000000000..52e54a804ba
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_HI_DECISION_EXECUTION ADD SCOPE_TYPE_ VARCHAR(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.dmn.sql
new file mode 100644
index 00000000000..d45b19fc7fa
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.dmn.sql
@@ -0,0 +1 @@
+ALTER TABLE ACT_DMN_DECISION_TABLE DROP COLUMN PARENT_DEPLOYMENT_ID_;
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.dmn.sql
new file mode 100644
index 00000000000..d4e92a24219
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.dmn.sql
@@ -0,0 +1 @@
+CREATE UNIQUE INDEX ACT_IDX_DEC_TBL_UNIQ ON ACT_DMN_DECISION_TABLE(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.dmn.sql
new file mode 100644
index 00000000000..fab3f27a64d
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.dmn.sql
@@ -0,0 +1,7 @@
+DROP INDEX ACT_IDX_DEC_TBL_UNIQ;
+
+ALTER TABLE ACT_DMN_DECISION_TABLE RENAME TO ACT_DMN_DECISION;
+
+CREATE UNIQUE INDEX ACT_IDX_DMN_DEC_UNIQ ON ACT_DMN_DECISION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE ACT_DMN_DECISION ADD DECISION_TYPE_ VARCHAR(255);
diff --git a/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6723.to.6800.dmn.sql b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6723.to.6800.dmn.sql
new file mode 100644
index 00000000000..adb9d4c0557
--- /dev/null
+++ b/modules/flowable-dmn-engine/src/main/resources/org/flowable/dmn/db/upgrade/flowable.postgres.upgradestep.6723.to.6800.dmn.sql
@@ -0,0 +1 @@
+CREATE INDEX ACT_IDX_DMN_INSTANCE_ID ON ACT_DMN_HI_DECISION_EXECUTION(INSTANCE_ID_);
diff --git a/modules/flowable-dmn-engine/src/test/java/org/flowable/dmn/engine/test/cfg/ForceCloseMybatisConnectionPoolTest.java b/modules/flowable-dmn-engine/src/test/java/org/flowable/dmn/engine/test/cfg/ForceCloseMybatisConnectionPoolTest.java
index f732b62160f..eb442b3d903 100644
--- a/modules/flowable-dmn-engine/src/test/java/org/flowable/dmn/engine/test/cfg/ForceCloseMybatisConnectionPoolTest.java
+++ b/modules/flowable-dmn-engine/src/test/java/org/flowable/dmn/engine/test/cfg/ForceCloseMybatisConnectionPoolTest.java
@@ -34,6 +34,7 @@ public void testForceCloseMybatisConnectionPoolTrue() {
         StandaloneInMemDmnEngineConfiguration standaloneInMemDmnEngineConfiguration =  new StandaloneInMemDmnEngineConfiguration();
         standaloneInMemDmnEngineConfiguration.setJdbcUrl("jdbc:h2:mem:flowable-dmn-" + this.getClass().getName());
         standaloneInMemDmnEngineConfiguration.setForceCloseMybatisConnectionPool(true);
+        standaloneInMemDmnEngineConfiguration.setDatabaseSchemaUpdate("true");
 
         DmnEngine dmnEngine = standaloneInMemDmnEngineConfiguration.buildDmnEngine();
 
@@ -59,6 +60,7 @@ public void testForceCloseMybatisConnectionPoolFalse() {
         StandaloneInMemDmnEngineConfiguration standaloneInMemDmnEngineConfiguration =  new StandaloneInMemDmnEngineConfiguration();
         standaloneInMemDmnEngineConfiguration.setJdbcUrl("jdbc:h2:mem:flowable-dmn-" + this.getClass().getName());
         standaloneInMemDmnEngineConfiguration.setForceCloseMybatisConnectionPool(false);
+        standaloneInMemDmnEngineConfiguration.setDatabaseSchemaUpdate("true");
 
         DmnEngine dmnEngine = standaloneInMemDmnEngineConfiguration.buildDmnEngine();
 
diff --git a/modules/flowable-dmn-engine/src/test/java/org/flowable/dmn/engine/test/mgmt/DmnManagementServiceTest.java b/modules/flowable-dmn-engine/src/test/java/org/flowable/dmn/engine/test/mgmt/DmnManagementServiceTest.java
index 41e404ce6cc..6d044267953 100644
--- a/modules/flowable-dmn-engine/src/test/java/org/flowable/dmn/engine/test/mgmt/DmnManagementServiceTest.java
+++ b/modules/flowable-dmn-engine/src/test/java/org/flowable/dmn/engine/test/mgmt/DmnManagementServiceTest.java
@@ -51,7 +51,7 @@ public void testTableCount() {
 
         String tablePrefix = dmnEngineConfiguration.getDatabaseTablePrefix();
 
-        assertThat(tableCount).containsEntry(tablePrefix + "ACT_GE_PROPERTY", 2L);
+        assertThat(tableCount).containsEntry(tablePrefix + "ACT_GE_PROPERTY", 3L);
         assertThat(tableCount.get(tablePrefix + "ACT_DMN_DECISION")).isZero();
         assertThat(tableCount.get(tablePrefix + "ACT_DMN_DEPLOYMENT")).isZero();
         assertThat(tableCount.get(tablePrefix + "ACT_DMN_DEPLOYMENT_RESOURCE")).isZero();
diff --git a/modules/flowable-dmn-spring-configurator/src/main/java/org/flowable/dmn/spring/configurator/SpringDmnEngineConfigurator.java b/modules/flowable-dmn-spring-configurator/src/main/java/org/flowable/dmn/spring/configurator/SpringDmnEngineConfigurator.java
index 646b566bd98..6864624f7d7 100644
--- a/modules/flowable-dmn-spring-configurator/src/main/java/org/flowable/dmn/spring/configurator/SpringDmnEngineConfigurator.java
+++ b/modules/flowable-dmn-spring-configurator/src/main/java/org/flowable/dmn/spring/configurator/SpringDmnEngineConfigurator.java
@@ -12,10 +12,8 @@
  */
 package org.flowable.dmn.spring.configurator;
 
-import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.spring.SpringEngineConfiguration;
-import org.flowable.dmn.engine.DmnEngine;
 import org.flowable.dmn.engine.configurator.DmnEngineConfigurator;
 import org.flowable.dmn.spring.SpringDmnEngineConfiguration;
 
@@ -41,17 +39,8 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
             dmnEngineConfiguration.setBeans(springEngineConfiguration.getBeans());
         }
 
-        initDmnEngine();
+        initEngine();
         
         initServiceConfigurations(engineConfiguration, dmnEngineConfiguration);
     }
-
-    @Override
-    protected synchronized DmnEngine initDmnEngine() {
-        if (dmnEngineConfiguration == null) {
-            throw new FlowableException("DmnEngineConfiguration is required");
-        }
-
-        return dmnEngineConfiguration.buildDmnEngine();
-    }
 }
diff --git a/modules/flowable-dmn-spring/src/main/java/org/flowable/dmn/spring/SpringDmnEngineConfiguration.java b/modules/flowable-dmn-spring/src/main/java/org/flowable/dmn/spring/SpringDmnEngineConfiguration.java
index 9d1a5bdfa97..da7547bf418 100644
--- a/modules/flowable-dmn-spring/src/main/java/org/flowable/dmn/spring/SpringDmnEngineConfiguration.java
+++ b/modules/flowable-dmn-spring/src/main/java/org/flowable/dmn/spring/SpringDmnEngineConfiguration.java
@@ -66,8 +66,8 @@ public SpringDmnEngineConfiguration() {
     }
 
     @Override
-    public DmnEngine buildDmnEngine() {
-        DmnEngine dmnEngine = super.buildDmnEngine();
+    public DmnEngine buildEngine() {
+        DmnEngine dmnEngine = super.buildEngine();
         DmnEngines.setInitialized(true);
         enginesBuild.add(dmnEngine.getName());
         return dmnEngine;
diff --git a/modules/flowable-dmn-spring/src/main/java/org/flowable/dmn/spring/autodeployment/AbstractDmnAutoDeploymentStrategy.java b/modules/flowable-dmn-spring/src/main/java/org/flowable/dmn/spring/autodeployment/AbstractDmnAutoDeploymentStrategy.java
index f613f9856c8..1258aead69a 100644
--- a/modules/flowable-dmn-spring/src/main/java/org/flowable/dmn/spring/autodeployment/AbstractDmnAutoDeploymentStrategy.java
+++ b/modules/flowable-dmn-spring/src/main/java/org/flowable/dmn/spring/autodeployment/AbstractDmnAutoDeploymentStrategy.java
@@ -17,7 +17,7 @@
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 
-import org.flowable.common.engine.impl.lock.LockManager;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.spring.CommonAutoDeploymentProperties;
 import org.flowable.common.spring.CommonAutoDeploymentStrategy;
 import org.flowable.dmn.api.DmnDeploymentBuilder;
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/lock/LockManager.java b/modules/flowable-engine-common-api/src/main/java/org/flowable/common/engine/api/lock/LockManager.java
similarity index 97%
rename from modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/lock/LockManager.java
rename to modules/flowable-engine-common-api/src/main/java/org/flowable/common/engine/api/lock/LockManager.java
index b22ca6fb9a1..aecd27f6b94 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/lock/LockManager.java
+++ b/modules/flowable-engine-common-api/src/main/java/org/flowable/common/engine/api/lock/LockManager.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.flowable.common.engine.impl.lock;
+package org.flowable.common.engine.api.lock;
 
 import java.time.Duration;
 import java.util.function.Supplier;
diff --git a/modules/flowable-engine-common/pom.xml b/modules/flowable-engine-common/pom.xml
index 3d30c94248b..f85c95daa3a 100644
--- a/modules/flowable-engine-common/pom.xml
+++ b/modules/flowable-engine-common/pom.xml
@@ -156,11 +156,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractBuildableEngineConfiguration.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractBuildableEngineConfiguration.java
new file mode 100644
index 00000000000..28038c78ec3
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractBuildableEngineConfiguration.java
@@ -0,0 +1,64 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.common.engine.impl;
+
+import java.util.function.Consumer;
+
+import org.flowable.common.engine.api.Engine;
+
+/**
+ * @author Filip Hrisafov
+ */
+public abstract class AbstractBuildableEngineConfiguration<E extends Engine> extends AbstractEngineConfiguration {
+
+    protected boolean runPostEngineBuildConsumer = true;
+    protected Consumer<E> postEngineBuildConsumer;
+
+    public E buildEngine() {
+        init();
+        initPostEngineBuildConsumer();
+        E engine = createEngine();
+        if (runPostEngineBuildConsumer) {
+            postEngineBuildConsumer.accept(engine);
+        }
+        return engine;
+    }
+
+    protected abstract E createEngine();
+
+    protected abstract void init();
+
+    protected void initPostEngineBuildConsumer() {
+        if (this.postEngineBuildConsumer == null) {
+            this.postEngineBuildConsumer = createPostEngineBuildConsumer();
+        }
+    }
+
+    protected abstract Consumer<E> createPostEngineBuildConsumer();
+
+    public boolean isRunPostEngineBuildConsumer() {
+        return runPostEngineBuildConsumer;
+    }
+
+    public void setRunPostEngineBuildConsumer(boolean runPostEngineBuildConsumer) {
+        this.runPostEngineBuildConsumer = runPostEngineBuildConsumer;
+    }
+
+    public Consumer<E> getPostEngineBuildConsumer() {
+        return postEngineBuildConsumer;
+    }
+
+    public void setPostEngineBuildConsumer(Consumer<E> postEngineBuildConsumer) {
+        this.postEngineBuildConsumer = postEngineBuildConsumer;
+    }
+}
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
index 3fde91d9bda..ee0de1306c4 100755
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
@@ -73,6 +73,7 @@
 import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
 import org.flowable.common.engine.api.delegate.event.FlowableEventListener;
 import org.flowable.common.engine.api.engine.EngineLifecycleListener;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.impl.agenda.AgendaOperationExecutionListener;
 import org.flowable.common.engine.impl.agenda.AgendaOperationRunner;
 import org.flowable.common.engine.impl.cfg.CommandExecutorImpl;
@@ -86,6 +87,7 @@
 import org.flowable.common.engine.impl.db.MybatisTypeAliasConfigurator;
 import org.flowable.common.engine.impl.db.MybatisTypeHandlerConfigurator;
 import org.flowable.common.engine.impl.db.SchemaManager;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineBuild;
 import org.flowable.common.engine.impl.event.EventDispatchAction;
 import org.flowable.common.engine.impl.event.FlowableEventDispatcherImpl;
 import org.flowable.common.engine.impl.interceptor.Command;
@@ -99,7 +101,6 @@
 import org.flowable.common.engine.impl.interceptor.LogInterceptor;
 import org.flowable.common.engine.impl.interceptor.SessionFactory;
 import org.flowable.common.engine.impl.interceptor.TransactionContextInterceptor;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.common.engine.impl.logging.LoggingListener;
 import org.flowable.common.engine.impl.logging.LoggingSession;
@@ -172,6 +173,7 @@ public abstract class AbstractEngineConfiguration {
     protected int jdbcPingConnectionNotUsedFor;
     protected int jdbcDefaultTransactionIsolationLevel;
     protected DataSource dataSource;
+    protected Map<String, SchemaManager> additionalSchemaManagers;
     protected SchemaManager commonSchemaManager;
     protected SchemaManager schemaManager;
     protected Command<Void> schemaManagementCmd;
@@ -431,7 +433,7 @@ public static Properties getDefaultDatabaseTypeMappings() {
      * Define a max length for storing String variable types in the database. Mainly used for the Oracle NVARCHAR2 limit of 2000 characters
      */
     protected int maxLengthStringVariableType = -1;
-    
+
     protected void initEngineConfigurations() {
         addEngineConfiguration(getEngineCfgKey(), getEngineScopeType(), this);
     }
@@ -548,8 +550,22 @@ public void initSchemaManager() {
         if (this.commonSchemaManager == null) {
             this.commonSchemaManager = new CommonDbSchemaManager();
         }
+
+        if (this.schemaManager == null) {
+            this.schemaManager = createEngineSchemaManager();
+        }
+
     }
 
+    protected abstract SchemaManager createEngineSchemaManager();
+
+    public void initSchemaManagementCommand() {
+        if (schemaManagementCmd == null) {
+            if (usingRelationalDatabase && databaseSchemaUpdate != null) {
+                this.schemaManagementCmd = new SchemaOperationsEngineBuild(getEngineScopeType());
+            }
+        }
+    }
     // session factories ////////////////////////////////////////////////////////
 
     public void addSessionFactory(SessionFactory sessionFactory) {
@@ -1217,6 +1233,18 @@ public AbstractEngineConfiguration setSchemaManager(SchemaManager schemaManager)
         return this;
     }
 
+    public AbstractEngineConfiguration addAdditionalSchemaManager(SchemaManager schemaManager) {
+        if (this.additionalSchemaManagers == null) {
+            this.additionalSchemaManagers = new HashMap<>();
+        }
+        this.additionalSchemaManagers.put(schemaManager.getContext(), schemaManager);
+        return this;
+    }
+
+    public Map<String, SchemaManager> getAdditionalSchemaManagers() {
+        return additionalSchemaManagers;
+    }
+
     public SchemaManager getCommonSchemaManager() {
         return commonSchemaManager;
     }
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfigurator.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfigurator.java
index 769626b46ae..a0ec4df84a8 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfigurator.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfigurator.java
@@ -25,7 +25,9 @@
 
 import org.apache.ibatis.type.TypeAliasRegistry;
 import org.apache.ibatis.type.TypeHandlerRegistry;
+import org.flowable.common.engine.api.Engine;
 import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.api.engine.EngineLifecycleListener;
 import org.flowable.common.engine.impl.db.MybatisTypeAliasConfigurator;
 import org.flowable.common.engine.impl.db.MybatisTypeHandlerConfigurator;
 import org.flowable.common.engine.impl.persistence.entity.Entity;
@@ -40,9 +42,10 @@
  *
  * @author Joram Barrez
  */
-public abstract class AbstractEngineConfigurator implements EngineConfigurator {
+public abstract class AbstractEngineConfigurator<E extends Engine> implements EngineConfigurator {
 
     protected boolean enableMybatisXmlMappingValidation;
+    protected E buildEngine;
 
     @Override
     public void beforeInit(AbstractEngineConfiguration engineConfiguration) {
@@ -204,6 +207,30 @@ protected List<MybatisTypeHandlerConfigurator> getMybatisTypeHandlers() {
         return null;
     }
 
+    protected synchronized E initEngine() {
+        this.buildEngine = buildEngine();
+        return buildEngine;
+    }
+
+    protected abstract E buildEngine();
+
+    protected void initialiseCommonProperties(AbstractEngineConfiguration engineConfiguration, AbstractBuildableEngineConfiguration<E> targetEngineConfiguration) {
+        initialiseCommonProperties(engineConfiguration, (AbstractEngineConfiguration) targetEngineConfiguration);
+        targetEngineConfiguration.setRunPostEngineBuildConsumer(false);
+        engineConfiguration.addEngineLifecycleListener(new EngineLifecycleListener() {
+
+            @Override
+            public void onEngineBuilt(Engine engine) {
+                targetEngineConfiguration.getPostEngineBuildConsumer().accept(buildEngine);
+            }
+
+            @Override
+            public void onEngineClosed(Engine engine) {
+                // nothing to do
+            }
+        });
+    }
+
     protected void initialiseCommonProperties(AbstractEngineConfiguration engineConfiguration, AbstractEngineConfiguration targetEngineConfiguration) {
         initEngineConfigurations(engineConfiguration, targetEngineConfiguration);
         initEventRegistryEventConsumers(engineConfiguration, targetEngineConfiguration);
@@ -221,6 +248,7 @@ protected void initialiseCommonProperties(AbstractEngineConfiguration engineConf
         initClock(engineConfiguration, targetEngineConfiguration);
         initObjectMapper(engineConfiguration, targetEngineConfiguration);
         initVariableTypes(engineConfiguration, targetEngineConfiguration);
+        initSchemaManager(engineConfiguration, targetEngineConfiguration);
     }
 
     protected void initEngineConfigurations(AbstractEngineConfiguration engineConfiguration, AbstractEngineConfiguration targetEngineConfiguration) {
@@ -305,6 +333,12 @@ protected void initVariableTypes(AbstractEngineConfiguration engineConfiguration
         }
     }
 
+    protected void initSchemaManager(AbstractEngineConfiguration engineConfiguration, AbstractEngineConfiguration targetEngineConfiguration) {
+        // We are going to disable the Schema management in the target engine as the lead engine is the one that is going to handle the schema generation
+        targetEngineConfiguration.setDatabaseSchemaUpdate(null);
+        engineConfiguration.addAdditionalSchemaManager(targetEngineConfiguration.createEngineSchemaManager());
+    }
+
     protected abstract List<Class<? extends Entity>> getEntityInsertionOrder();
 
     protected abstract List<Class<? extends Entity>> getEntityDeletionOrder();
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/FlowableVersions.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/FlowableVersions.java
index 99e57d1463d..d09690de2d0 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/FlowableVersions.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/FlowableVersions.java
@@ -23,7 +23,7 @@
  */
 public class FlowableVersions {
     
-    public static final String CURRENT_VERSION = "7.1.0.0"; // Note the extra .x at the end. To cater for snapshot releases with different database changes
+    public static final String CURRENT_VERSION = "7.1.0.1"; // Note the extra .x at the end. To cater for snapshot releases with different database changes
     
     public static final List<FlowableVersion> FLOWABLE_VERSIONS = new ArrayList<>();
     
@@ -143,6 +143,7 @@ public class FlowableVersions {
         FLOWABLE_VERSIONS.add(new FlowableVersion("7.0.0.0"));
         FLOWABLE_VERSIONS.add(new FlowableVersion("7.0.1.0"));
         FLOWABLE_VERSIONS.add(new FlowableVersion("7.0.1.1"));
+        FLOWABLE_VERSIONS.add(new FlowableVersion("7.1.0.0"));
 
         /* Current */
         FLOWABLE_VERSIONS.add(new FlowableVersion(CURRENT_VERSION));
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/CommonDbSchemaManager.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/CommonDbSchemaManager.java
index 68953bd1a45..a1657990413 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/CommonDbSchemaManager.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/CommonDbSchemaManager.java
@@ -22,7 +22,7 @@ public class CommonDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager
     private static final String SCHEMA_COMPONENT = "common";
     
     public CommonDbSchemaManager() {
-        super(PROPERTY_TABLE, SCHEMA_COMPONENT, null, COMMON_VERSION_PROPERTY);
+        super(PROPERTY_TABLE, SCHEMA_COMPONENT, COMMON_VERSION_PROPERTY);
     }
     
     @Override
@@ -30,4 +30,14 @@ protected String getResourcesRootDirectory() {
         return "org/flowable/common/db/";
     }
     
+    @Override
+    public void schemaCheckVersion() {
+        // Schema check is ignored for the common DB
+    }
+
+    @Override
+    public String getContext() {
+        return SCHEMA_COMPONENT;
+    }
+    
 }
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineDatabaseConfiguration.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineDatabaseConfiguration.java
deleted file mode 100644
index 32413101935..00000000000
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineDatabaseConfiguration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.common.engine.impl.db;
-
-import javax.sql.DataSource;
-
-import org.flowable.common.engine.impl.AbstractEngineConfiguration;
-
-/**
- * @author Filip Hrisafov
- */
-public class EngineDatabaseConfiguration implements LiquibaseDatabaseConfiguration {
-
-    protected final AbstractEngineConfiguration engineConfiguration;
-
-    public EngineDatabaseConfiguration(AbstractEngineConfiguration engineConfiguration) {
-        this.engineConfiguration = engineConfiguration;
-    }
-
-    @Override
-    public DataSource getDataSource() {
-        return engineConfiguration.getDataSource();
-    }
-
-    @Override
-    public String getDatabaseSchema() {
-        return engineConfiguration.getDatabaseSchema();
-    }
-
-    @Override
-    public String getDatabaseCatalog() {
-        return engineConfiguration.getDatabaseCatalog();
-    }
-}
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java
new file mode 100644
index 00000000000..3e51d5a8d95
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java
@@ -0,0 +1,251 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.common.engine.impl.db;
+
+import java.util.List;
+
+import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.api.FlowableWrongDbException;
+import org.flowable.common.engine.api.lock.LockManager;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.FlowableVersions;
+import org.flowable.common.engine.impl.persistence.entity.PropertyEntity;
+import org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl;
+
+public abstract class EngineSqlScriptBasedDbSchemaManager extends AbstractSqlScriptBasedDbSchemaManager {
+
+    protected final String context;
+
+    protected EngineSqlScriptBasedDbSchemaManager(String context) {
+        this.context = context;
+    }
+
+    protected abstract String getEngineVersion();
+
+    protected abstract String getSchemaVersionPropertyName();
+
+    protected abstract String getDbSchemaLockName();
+
+    protected abstract String getEngineTableName();
+
+    protected abstract String getChangeLogTableName();
+    
+    protected abstract String getChangeLogTablePrefixName();
+
+    protected abstract String getDbVersionForChangelogVersion(String changeLogVersion);
+
+    protected abstract AbstractEngineConfiguration getEngineConfiguration();
+
+    @Override
+    public void schemaCheckVersion() {
+        try {
+            String dbVersion = getDbVersion();
+            String currentVersion = getEngineVersion();
+            if (!currentVersion.equals(dbVersion)) {
+                throw new FlowableWrongDbException(currentVersion, dbVersion);
+            }
+
+            String errorMessage = null;
+            if (!isEngineTablePresent()) {
+                errorMessage = addMissingComponent(errorMessage, context);
+            }
+
+            if (errorMessage != null) {
+                throw new FlowableException("Flowable database problem: " + errorMessage);
+            }
+
+        } catch (Exception e) {
+            if (isMissingTablesException(e)) {
+                throw new FlowableException(
+                        "No flowable tables in DB. Set property \"databaseSchemaUpdate\" \"true\" or value=\"create-drop\" (use create-drop for testing only!) for automatic schema creation",
+                        e);
+            } else {
+                if (e instanceof RuntimeException) {
+                    throw (RuntimeException) e;
+                } else {
+                    throw new FlowableException("couldn't get " + context + " db schema version", e);
+                }
+            }
+        }
+
+        logger.debug("flowable {} db schema check successful", context);
+    }
+
+    @Override
+    public void schemaCreate() {
+
+        AbstractEngineConfiguration engineConfiguration = getEngineConfiguration();
+        if (engineConfiguration.isUseLockForDatabaseSchemaUpdate()) {
+            LockManager lockManager = engineConfiguration.getLockManager(getDbSchemaLockName());
+            lockManager.waitForLockRunAndRelease(engineConfiguration.getSchemaLockWaitTime(), () -> {
+                schemaCreateInLock();
+                return null;
+            });
+        } else {
+            schemaCreateInLock();
+        }
+    }
+
+    protected void schemaCreateInLock() {
+        if (isEngineTablePresent()) {
+            String dbVersion = getDbVersion();
+            String engineVersion = getEngineVersion();
+            if (!engineVersion.equals(dbVersion)) {
+                throw new FlowableWrongDbException(engineVersion, dbVersion);
+            }
+        } else {
+            dbSchemaCreateEngine();
+        }
+    }
+
+    protected void dbSchemaCreateEngine() {
+        executeMandatorySchemaResource("create", context);
+    }
+
+    @Override
+    public void schemaDrop() {
+
+        try {
+            executeMandatorySchemaResource("drop", context);
+
+        } catch (Exception e) {
+            logger.info("Error dropping {} tables", context, e);
+        }
+
+    }
+
+    @Override
+    public String schemaUpdate() {
+
+        PropertyEntity dbVersionProperty = null;
+        String feedback = null;
+        boolean isUpgradeNeeded = false;
+        int matchingVersionIndex = -1;
+
+        DbSqlSession dbSqlSession = getDbSqlSession();
+        boolean isEngineTablePresent = isEngineTablePresent();
+
+        ChangeLogVersion changeLogVersion = null;
+        String dbVersion = null;
+        if (isEngineTablePresent) {
+            dbVersionProperty = dbSqlSession.selectById(PropertyEntityImpl.class, getSchemaVersionPropertyName());
+            if (dbVersionProperty != null) {
+                dbVersion = dbVersionProperty.getValue();
+            } else {
+                changeLogVersion = getChangeLogVersion();
+                dbVersion = changeLogVersion.dbVersion();
+            }
+        }
+
+        AbstractEngineConfiguration engineConfiguration = getEngineConfiguration();
+        LockManager lockManager;
+        if (engineConfiguration.isUseLockForDatabaseSchemaUpdate()) {
+            lockManager = engineConfiguration.getLockManager(getDbSchemaLockName());
+            lockManager.waitForLock(engineConfiguration.getSchemaLockWaitTime());
+        } else {
+            lockManager = null;
+        }
+
+        try {
+            if (isEngineTablePresent) {
+                matchingVersionIndex = FlowableVersions.getFlowableVersionIndexForDbVersion(dbVersion);
+                isUpgradeNeeded = (matchingVersionIndex != (FlowableVersions.FLOWABLE_VERSIONS.size() - 1));
+            }
+
+            if (isUpgradeNeeded) {
+                // Engine upgrade
+                dbSchemaUpgrade(context, matchingVersionIndex, dbVersion);
+                dbSchemaUpgraded(changeLogVersion);
+
+                feedback = "upgraded Flowable from " + dbVersion + " to " + getEngineVersion();
+
+            } else if (!isEngineTablePresent) {
+                dbSchemaCreateEngine();
+            }
+
+            return feedback;
+            
+        } finally {
+            if (lockManager != null) {
+                lockManager.releaseLock();
+            }
+        }
+    }
+
+    @Override
+    public String getContext() {
+        return context;
+    }
+
+    protected void dbSchemaUpgraded(ChangeLogVersion changeLogVersion) {
+
+    }
+
+    public boolean isEngineTablePresent() {
+        return isTablePresent(getEngineTableName());
+    }
+
+    protected String addMissingComponent(String missingComponents, String component) {
+        if (missingComponents == null) {
+            return "Tables missing for component(s) " + component;
+        }
+        return missingComponents + ", " + component;
+    }
+
+    protected String getDbVersion() {
+        DbSqlSession dbSqlSession = getDbSqlSession();
+        String selectSchemaVersionStatement = dbSqlSession.getDbSqlSessionFactory()
+                .mapStatement("org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl.selectPropertyValue");
+        return dbSqlSession.getSqlSession().selectOne(selectSchemaVersionStatement, getSchemaVersionPropertyName());
+    }
+
+    protected ChangeLogVersion getChangeLogVersion() {
+        String changeLogTableName = getChangeLogTableName();
+        if (changeLogTableName != null && isTablePresent(changeLogTableName)) {
+            DbSqlSession dbSqlSession = getDbSqlSession();
+            String selectChangeLogVersionsStatement = dbSqlSession.getDbSqlSessionFactory().mapStatement("org.flowable.common.engine.impl.persistence.change.ChangeLog.selectFlowableChangeLogVersions");
+            List<String> changeLogIds = dbSqlSession.getSqlSession().selectList(selectChangeLogVersionsStatement, getChangeLogTablePrefixName());
+            if (changeLogIds != null && !changeLogIds.isEmpty()) {
+                String changeLogVersion = changeLogIds.get(changeLogIds.size() - 1);
+                return new ChangeLogVersion(changeLogVersion, getDbVersionForChangelogVersion(changeLogVersion));
+            }
+        }
+
+        return new ChangeLogVersion(null, getDbVersionForChangelogVersion(null));
+    }
+
+    protected boolean isMissingTablesException(Exception e) {
+        String exceptionMessage = e.getMessage();
+        if (e.getMessage() != null) {
+            // Matches message returned from H2
+            if ((exceptionMessage.contains("Table")) && (exceptionMessage.contains("not found"))) {
+                return true;
+            }
+
+            // Message returned from MySQL and Oracle
+            if ((exceptionMessage.contains("Table") || exceptionMessage.contains("table")) && (exceptionMessage.contains("doesn't exist"))) {
+                return true;
+            }
+
+            // Message returned from Postgres
+            if ((exceptionMessage.contains("relation") || exceptionMessage.contains("table")) && (exceptionMessage.contains("does not exist"))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public record ChangeLogVersion(String version, String dbVersion) {
+    }
+
+}
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseBasedSchemaManager.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseBasedSchemaManager.java
deleted file mode 100644
index 68654fbd9a2..00000000000
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseBasedSchemaManager.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.common.engine.impl.db;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.apache.commons.lang3.StringUtils;
-import org.flowable.common.engine.api.FlowableException;
-import org.flowable.common.engine.impl.AbstractEngineConfiguration;
-import org.flowable.common.engine.impl.context.Context;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.ClassUtils;
-
-import liquibase.Liquibase;
-import liquibase.Scope;
-import liquibase.database.Database;
-import liquibase.database.DatabaseConnection;
-import liquibase.database.DatabaseFactory;
-import liquibase.database.jvm.JdbcConnection;
-import liquibase.exception.DatabaseException;
-import liquibase.resource.ClassLoaderResourceAccessor;
-import liquibase.ui.LoggerUIService;
-
-/**
- * @author Filip Hrisafov
- */
-public abstract class LiquibaseBasedSchemaManager implements SchemaManager {
-
-    protected static final Map<String, Object> LIQUIBASE_SCOPE_VALUES = new HashMap<>();
-
-    static {
-        LoggerUIService uiService = new LoggerUIService();
-        uiService.setStandardLogLevel(Level.FINE);
-        LIQUIBASE_SCOPE_VALUES.put(Scope.Attr.ui.name(), uiService);
-    }
-
-    protected final Logger logger = LoggerFactory.getLogger(getClass());
-
-    protected final String context;
-    protected final String changeLogFile;
-    protected final String changeLogPrefix;
-
-    public LiquibaseBasedSchemaManager(String context, String changeLogFile, String changeLogPrefix) {
-        this.context = context;
-        this.changeLogFile = changeLogFile;
-        this.changeLogPrefix = changeLogPrefix;
-    }
-
-    public void initSchema(String databaseSchemaUpdate) {
-        try {
-            if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_CREATE.equals(databaseSchemaUpdate)) {
-                runForLiquibase(this::schemaCreate);
-            }
-            else if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_CREATE_DROP.equals(databaseSchemaUpdate)) {
-                runForLiquibase(this::schemaCreate);
-
-            } else if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE.equals(databaseSchemaUpdate)) {
-                runForLiquibase(() -> {
-                    schemaDrop();
-                    schemaCreate();
-                });
-
-            } else if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_TRUE.equals(databaseSchemaUpdate)) {
-                runForLiquibase(this::schemaUpdate);
-
-            } else if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_FALSE.equals(databaseSchemaUpdate)) {
-                runForLiquibase(this::schemaCheckVersion);
-
-            }
-        } catch (Exception e) {
-            throw new FlowableException("Error initialising " + context + " data model", e);
-        }
-    }
-
-    protected void runForLiquibase(Runnable runnable) throws Exception {
-        Scope.child(LIQUIBASE_SCOPE_VALUES, runnable::run);
-    }
-
-    @Override
-    public void schemaCreate() {
-        Liquibase liquibase = null;
-        try {
-            liquibase = createLiquibaseInstance(getDatabaseConfiguration());
-            liquibase.update(context);
-        } catch (Exception e) {
-            throw new FlowableException("Error creating " + context + " engine tables", e);
-        } finally {
-            closeDatabase(liquibase);
-        }
-    }
-
-    @Override
-    public void schemaDrop() {
-        Liquibase liquibase = null;
-        try {
-            liquibase = createLiquibaseInstance(getDatabaseConfiguration());
-            liquibase.dropAll();
-        } catch (Exception e) {
-            throw new FlowableException("Error dropping " + context + " engine tables", e);
-        } finally {
-            closeDatabase(liquibase);
-        }
-    }
-
-    @Override
-    public String schemaUpdate() {
-        Liquibase liquibase = null;
-        try {
-            liquibase = createLiquibaseInstance(getDatabaseConfiguration());
-            liquibase.update(context);
-        } catch (Exception e) {
-            throw new FlowableException("Error updating " + context + " engine tables", e);
-        } finally {
-            closeDatabase(liquibase);
-        }
-        return null;
-    }
-
-    @Override
-    public void schemaCheckVersion() {
-        Liquibase liquibase = null;
-        try {
-            liquibase = createLiquibaseInstance(getDatabaseConfiguration());
-            liquibase.validate();
-        } catch (Exception e) {
-            throw new FlowableException("Error validating " + context + " engine schema", e);
-        } finally {
-            closeDatabase(liquibase);
-        }
-    }
-
-    protected abstract LiquibaseDatabaseConfiguration getDatabaseConfiguration();
-
-    protected Liquibase createLiquibaseInstance(LiquibaseDatabaseConfiguration databaseConfiguration) throws SQLException {
-        Connection jdbcConnection = null;
-        boolean closeConnection = false;
-        try {
-            CommandContext commandContext = Context.getCommandContext();
-            if (commandContext == null) {
-                jdbcConnection = databaseConfiguration.getDataSource().getConnection();
-                closeConnection = true;
-            } else {
-                jdbcConnection = commandContext.getSession(DbSqlSession.class).getSqlSession().getConnection();
-            }
-
-            // A commit is needed here, because one of the things that Liquibase does when acquiring its lock
-            // is doing a rollback, which removes all changes done so far.
-            // For most databases, this is not a problem as DDL statements are not transactional.
-            // However for some (e.g. sql server), this would remove all previous statements, which is not wanted,
-            // hence the extra commit here.
-            if (!jdbcConnection.getAutoCommit()) {
-                jdbcConnection.commit();
-            }
-
-            DatabaseConnection connection = new JdbcConnection(jdbcConnection);
-            Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(connection);
-            database.setDatabaseChangeLogTableName(changeLogPrefix + database.getDatabaseChangeLogTableName());
-            database.setDatabaseChangeLogLockTableName(changeLogPrefix + database.getDatabaseChangeLogLockTableName());
-
-            String databaseSchema = databaseConfiguration.getDatabaseSchema();
-            if (StringUtils.isNotEmpty(databaseSchema)) {
-                database.setDefaultSchemaName(databaseSchema);
-                database.setLiquibaseSchemaName(databaseSchema);
-            }
-
-            String databaseCatalog = databaseConfiguration.getDatabaseCatalog();
-            if (StringUtils.isNotEmpty(databaseCatalog)) {
-                database.setDefaultCatalogName(databaseCatalog);
-                database.setLiquibaseCatalogName(databaseCatalog);
-            }
-
-            return new Liquibase(changeLogFile, new ClassLoaderResourceAccessor(), database);
-
-        } catch (Exception e) {
-            // We only close the connection if an exception occurred, otherwise the Liquibase instance cannot be used
-            if (jdbcConnection != null && closeConnection) {
-                jdbcConnection.close();
-            }
-            throw new FlowableException("Error creating " + context + " liquibase instance", e);
-        }
-    }
-
-    protected void closeDatabase(Liquibase liquibase) {
-        if (liquibase != null) {
-            Database database = liquibase.getDatabase();
-            if (database != null) {
-                // do not close the shared connection if a command context is currently active
-                if (Context.getCommandContext() == null) {
-                    try {
-                        database.close();
-                    } catch (DatabaseException e) {
-                        logger.warn("Error closing database for {}", context, e);
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseDatabaseConfiguration.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseDatabaseConfiguration.java
deleted file mode 100644
index 36e670b033b..00000000000
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/LiquibaseDatabaseConfiguration.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.common.engine.impl.db;
-
-import javax.sql.DataSource;
-
-/**
- * A configuration that is used by the {@link LiquibaseBasedSchemaManager}
- * to ease the access to certain database properties.
- *
- * @author Filip Hrisafov
- */
-public interface LiquibaseDatabaseConfiguration {
-
-    DataSource getDataSource();
-
-    String getDatabaseSchema();
-
-    String getDatabaseCatalog();
-}
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaManager.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaManager.java
index 09e90e5695e..8ef849c21c4 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaManager.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaManager.java
@@ -29,5 +29,7 @@ default String schemaUpdate(String engineDbVersion) {
     }
     
     void schemaCheckVersion();
+    
+    String getContext();
 
 }
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java
new file mode 100644
index 00000000000..a7210015dbd
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineBuild.java
@@ -0,0 +1,100 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.common.engine.impl.db;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.flowable.common.engine.api.FlowableIllegalArgumentException;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.interceptor.CommandContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class SchemaOperationsEngineBuild implements Command<Void> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SchemaOperationsEngineBuild.class);
+
+    protected final String engineScopeType;
+    protected final String schemaOperation;
+
+    public SchemaOperationsEngineBuild(String engineScopeType) {
+        this(engineScopeType, null);
+    }
+
+    public SchemaOperationsEngineBuild(String engineScopeType, String schemaOperation) {
+        this.engineScopeType = engineScopeType;
+        this.schemaOperation = schemaOperation;
+    }
+
+    @Override
+    public Void execute(CommandContext commandContext) {
+
+        AbstractEngineConfiguration engineConfiguration = commandContext.getEngineConfigurations()
+                .get(engineScopeType);
+        if (engineConfiguration == null) {
+            throw new FlowableIllegalArgumentException("There is no engine configuration for scope " + engineScopeType);
+        }
+
+        String databaseSchemaUpdate = schemaOperation == null ? engineConfiguration.getDatabaseSchemaUpdate() : schemaOperation;
+        List<SchemaManager> schemaManagers = new ArrayList<>();
+        schemaManagers.add(engineConfiguration.getCommonSchemaManager());
+        schemaManagers.add(engineConfiguration.getSchemaManager());
+
+        Map<String, SchemaManager> additionalSchemaManagers = engineConfiguration.getAdditionalSchemaManagers();
+
+        if (additionalSchemaManagers != null) {
+            schemaManagers.addAll(additionalSchemaManagers.values());
+        }
+
+        executeSchemaUpdate(schemaManagers, databaseSchemaUpdate);
+
+        return null;
+    }
+
+    protected void executeSchemaUpdate(List<SchemaManager> schemaManagers, String databaseSchemaUpdate) {
+        LOGGER.debug("Executing schema management with setting {} from engine {}", databaseSchemaUpdate, engineScopeType);
+
+        if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE.equals(databaseSchemaUpdate)) {
+            // The drop is executed in the reverse order
+            ListIterator<SchemaManager> listIterator = schemaManagers.listIterator(schemaManagers.size());
+            while (listIterator.hasPrevious()) {
+                SchemaManager schemaManager = listIterator.previous();
+                try {
+                    schemaManager.schemaDrop();
+                } catch (RuntimeException e) {
+                    // ignore
+                }
+            }
+        }
+
+        if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_CREATE_DROP.equals(databaseSchemaUpdate)
+                || AbstractEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE.equals(databaseSchemaUpdate)
+                || AbstractEngineConfiguration.DB_SCHEMA_UPDATE_CREATE.equals(databaseSchemaUpdate)) {
+            schemaManagers.forEach(SchemaManager::schemaCreate);
+
+        } else if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_FALSE.equals(databaseSchemaUpdate)) {
+            schemaManagers.forEach(SchemaManager::schemaCheckVersion);
+
+        } else if (AbstractEngineConfiguration.DB_SCHEMA_UPDATE_TRUE.equals(databaseSchemaUpdate)) {
+            schemaManagers.forEach(SchemaManager::schemaUpdate);
+        }
+
+    }
+}
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineDropDbCmd.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineDropDbCmd.java
new file mode 100644
index 00000000000..17865d2ca7d
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/SchemaOperationsEngineDropDbCmd.java
@@ -0,0 +1,69 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.common.engine.impl.db;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.flowable.common.engine.api.FlowableIllegalArgumentException;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.interceptor.CommandContext;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class SchemaOperationsEngineDropDbCmd implements Command<Void> {
+
+    protected final String engineScopeType;
+
+    public SchemaOperationsEngineDropDbCmd(String engineScopeType) {
+        this.engineScopeType = engineScopeType;
+    }
+
+    @Override
+    public Void execute(CommandContext commandContext) {
+
+        AbstractEngineConfiguration engineConfiguration = commandContext.getEngineConfigurations()
+                .get(engineScopeType);
+        if (engineConfiguration == null) {
+            throw new FlowableIllegalArgumentException("There is no engine configuration for scope " + engineScopeType);
+        }
+
+        List<SchemaManager> schemaManagers = new ArrayList<>();
+        schemaManagers.add(engineConfiguration.getCommonSchemaManager());
+        schemaManagers.add(engineConfiguration.getSchemaManager());
+
+        Map<String, SchemaManager> additionalSchemaManagers = engineConfiguration.getAdditionalSchemaManagers();
+
+        if (additionalSchemaManagers != null) {
+            schemaManagers.addAll(additionalSchemaManagers.values());
+        }
+
+        // The drop is executed in the reverse order
+        ListIterator<SchemaManager> listIterator = schemaManagers.listIterator(schemaManagers.size());
+        while (listIterator.hasPrevious()) {
+            SchemaManager schemaManager = listIterator.previous();
+            try {
+                schemaManager.schemaDrop();
+            } catch (RuntimeException e) {
+                // ignore
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/ServiceSqlScriptBasedDbSchemaManager.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/ServiceSqlScriptBasedDbSchemaManager.java
index 2bab240ec0c..82054e2156c 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/ServiceSqlScriptBasedDbSchemaManager.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/db/ServiceSqlScriptBasedDbSchemaManager.java
@@ -23,13 +23,11 @@ public abstract class ServiceSqlScriptBasedDbSchemaManager extends AbstractSqlSc
     
     protected String table;
     protected String schemaComponent;
-    protected String schemaComponentHistory;
     protected String schemaVersionProperty;
     
-    public ServiceSqlScriptBasedDbSchemaManager(String table, String schemaComponent, String schemaComponentHistory, String schemaVersionProperty) {
+    public ServiceSqlScriptBasedDbSchemaManager(String table, String schemaComponent, String schemaVersionProperty) {
         this.table = table;
         this.schemaComponent = schemaComponent;
-        this.schemaComponentHistory = schemaComponentHistory;
         this.schemaVersionProperty = schemaVersionProperty;
     }
     
@@ -47,16 +45,14 @@ public void schemaCreate() {
 
     protected void internalDbSchemaCreate() {
         executeMandatorySchemaResource("create", schemaComponent);
-        if (isHistoryUsed()) {
-            executeMandatorySchemaResource("create", schemaComponentHistory);
-        }
     }
 
     @Override
     public void schemaDrop() {
-        executeMandatorySchemaResource("drop", schemaComponent);
-        if (isHistoryUsed()) {
-            executeMandatorySchemaResource("drop", schemaComponentHistory);
+        try {
+            executeMandatorySchemaResource("drop", schemaComponent);
+        } catch (Exception e) {
+            logger.info("Error dropping {} tables", schemaComponent, e);
         }
     }
 
@@ -81,9 +77,6 @@ public String schemaUpdate(String engineDbVersion) {
             boolean isUpgradeNeeded = (matchingVersionIndex != (FlowableVersions.FLOWABLE_VERSIONS.size() - 1));
             if (isUpgradeNeeded) {
                 dbSchemaUpgrade(schemaComponent, matchingVersionIndex, engineDbVersion);
-                if (isHistoryUsed()) {
-                    dbSchemaUpgrade(schemaComponentHistory, matchingVersionIndex, engineDbVersion);
-                }
             }
             
             feedback = "upgraded from " + compareWithVersion + " to " + FlowableVersions.CURRENT_VERSION;
@@ -104,10 +97,6 @@ public void schemaCheckVersion() {
     protected boolean isUpdateNeeded() {
         return isTablePresent(table);
     }
-    
-    protected boolean isHistoryUsed() {
-        return getDbSqlSession().getDbSqlSessionFactory().isDbHistoryUsed() && schemaComponentHistory != null;
-    }
 
     protected String getSchemaVersion() {
         if (schemaVersionProperty == null) {
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/lock/LockManagerImpl.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/lock/LockManagerImpl.java
index 782863d3e1b..361e7e03f5c 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/lock/LockManagerImpl.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/lock/LockManagerImpl.java
@@ -19,6 +19,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableOptimisticLockingException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.impl.cfg.TransactionPropagation;
 import org.flowable.common.engine.impl.cmd.GetLockValueCmd;
 import org.flowable.common.engine.impl.cmd.LockCmd;
diff --git a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/test/EnsureCleanDbUtils.java b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/test/EnsureCleanDbUtils.java
index 602fb1f0c69..8cfc39a226c 100644
--- a/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/test/EnsureCleanDbUtils.java
+++ b/modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/test/EnsureCleanDbUtils.java
@@ -101,9 +101,15 @@ public static void assertAndEnsureCleanDb(String testName, Logger logger, Abstra
             logger.info("dropping and recreating db");
 
             if (dropAndRecreateDbCommand != null) {
-                CommandExecutor commandExecutor = engineConfiguration.getCommandExecutor();
-                CommandConfig config = new CommandConfig().transactionNotSupported();
-                commandExecutor.execute(config, dropAndRecreateDbCommand);
+                String originalDatabaseSchemaUpdate = engineConfiguration.getDatabaseSchemaUpdate();
+                try {
+                    engineConfiguration.setDatabaseSchemaUpdate(AbstractEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE);
+                    CommandExecutor commandExecutor = engineConfiguration.getCommandExecutor();
+                    CommandConfig config = new CommandConfig().transactionNotSupported();
+                    commandExecutor.execute(config, dropAndRecreateDbCommand);
+                } finally {
+                    engineConfiguration.setDatabaseSchemaUpdate(originalDatabaseSchemaUpdate);
+                }
             }
 
             if (hasNoException) {
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.cockroachdb.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.cockroachdb.create.common.sql
index 84884727c8f..4e384686a9a 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.cockroachdb.create.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.cockroachdb.create.common.sql
@@ -16,9 +16,46 @@ CREATE TABLE if not exists ACT_GE_BYTEARRAY  (
 );
 
 insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
+values ('common.schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
 
--- force-commit
\ No newline at end of file
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.db2.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.db2.create.common.sql
index 8b70c5e2c1c..0d95dcb029e 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.db2.create.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.db2.create.common.sql
@@ -16,7 +16,590 @@ create table ACT_GE_BYTEARRAY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
+values ('common.schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
+
+
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CREATE_TIME_ timestamp,
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64) not null,
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ timestamp,
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ varchar(64) not null,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    PROC_INST_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_JOB (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) not null,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_TIMER_JOB (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) not null,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_SUSPENDED_JOB (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) not null,
+    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_DEADLETTER_JOB (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) not null,
+    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_HISTORY_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    ADV_HANDLER_CFG_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) not null,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_JOB_EXCEPTION_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_JOB_CUSTOM_VAL_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_TJOB_EXCEPTION_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_TJOB_CUSTOM_VAL_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TJOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_TJOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_);
+
+create index ACT_IDX_SJOB_EXCEPTION_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_SJOB_CUSTOM_VAL_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SJOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_DJOB_EXCEPTION_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_DJOB_CUSTOM_VAL_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DJOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_EJOB_EXCEPTION_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EJOB_CUSTOM_VAL_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_EJOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
+
+create table ACT_RU_TASK (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    TASK_DEF_KEY_ varchar(255),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    DELEGATION_ varchar(64),
+    PRIORITY_ integer,
+    CREATE_TIME_ timestamp,
+    IN_PROGRESS_TIME_ timestamp,
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ timestamp,
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ timestamp,
+    SUSPENDED_BY_ varchar(255),
+    IN_PROGRESS_DUE_DATE_ timestamp,
+    DUE_DATE_ timestamp,
+    CATEGORY_ varchar(255),
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(255) default '',
+    FORM_KEY_ varchar(255),
+    IS_COUNT_ENABLED_ smallint check(IS_COUNT_ENABLED_ in (1,0)),
+    VAR_COUNT_ integer, 
+    ID_LINK_COUNT_ integer,
+    SUB_TASK_COUNT_ integer,
+    primary key (ID_)
+);
+
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_TASKINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    TASK_DEF_KEY_ varchar(255),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    START_TIME_ timestamp not null,
+    IN_PROGRESS_TIME_ timestamp,
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ timestamp,
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ timestamp,
+    SUSPENDED_BY_ varchar(255),
+    END_TIME_ timestamp,
+    COMPLETED_BY_ varchar(255),
+    DURATION_ bigint,
+    DELETE_REASON_ varchar(4000),
+    PRIORITY_ integer,
+    IN_PROGRESS_DUE_DATE_ timestamp,
+    DUE_DATE_ timestamp,
+    FORM_KEY_ varchar(255),
+    CATEGORY_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    LAST_UPDATED_TIME_ timestamp,
+    primary key (ID_)
+);
+
+create table ACT_HI_TSK_LOG (
+    ID_ bigint not null GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+    TYPE_ varchar(64),
+    TASK_ID_ varchar(64) not null,
+    TIME_STAMP_ timestamp not null,
+    USER_ID_ varchar(255),
+    DATA_ varchar(4000),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
+
+
+create table ACT_RU_VARIABLE (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(255) not null,
+    NAME_ varchar(255) not null,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double precision,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    primary key (ID_)
+);
+
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_VARIABLE_BA on ACT_RU_VARIABLE(BYTEARRAY_ID_);
+alter table ACT_RU_VARIABLE 
+    add constraint ACT_FK_VAR_BYTEARRAY 
+    foreign key (BYTEARRAY_ID_) 
+    references ACT_GE_BYTEARRAY (ID_);
+
+create table ACT_HI_VARINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(100),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double precision,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    CREATE_TIME_ timestamp,
+    LAST_UPDATED_TIME_ timestamp,
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ varchar(255) not null,
+    EVENT_NAME_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(64),
+    CONFIGURATION_ varchar(255),
+    CREATED_ timestamp not null,
+    PROC_DEF_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_ID_ varchar(64),
+    SCOPE_DEFINITION_ID_ varchar(64),
+    SCOPE_DEFINITION_KEY_ varchar(255),
+    SCOPE_TYPE_ varchar(64),
+    LOCK_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR_EXEC_ID on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.h2.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.h2.create.common.sql
index a6e7a0485b6..7589cd67120 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.h2.create.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.h2.create.common.sql
@@ -16,7 +16,582 @@ create table ACT_GE_BYTEARRAY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
+values ('common.schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+    
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    CREATE_TIME_ timestamp,
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64),
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ timestamp,
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ varchar(255) not null,
+    EVENT_NAME_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(64),
+    CONFIGURATION_ varchar(255),
+    CREATED_ timestamp not null,
+    PROC_DEF_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_ID_ varchar(64),
+    SCOPE_DEFINITION_ID_ varchar(64),
+    SCOPE_DEFINITION_KEY_ varchar(255),
+    SCOPE_TYPE_ varchar(64),
+    LOCK_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64) null,
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ varchar(64),
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    PROC_INST_ID_ varchar(64) null,
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_RU_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_TIMER_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_SUSPENDED_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_DEADLETTER_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_HISTORY_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    ADV_HANDLER_CFG_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
+create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_RU_TASK (
+    ID_ varchar(64),
+    REV_ integer,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    TASK_DEF_KEY_ varchar(255),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    DELEGATION_ varchar(64),
+    PRIORITY_ integer,
+    CREATE_TIME_ timestamp,
+    IN_PROGRESS_TIME_ timestamp,
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ timestamp,
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ timestamp,
+    SUSPENDED_BY_ varchar(255),
+    IN_PROGRESS_DUE_DATE_ timestamp,
+    DUE_DATE_ timestamp,
+    CATEGORY_ varchar(255),
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(255) default '',
+    FORM_KEY_ varchar(255),
+    IS_COUNT_ENABLED_ bit,
+    VAR_COUNT_ integer, 
+    ID_LINK_COUNT_ integer,
+    SUB_TASK_COUNT_ integer,
+    primary key (ID_)
+);
+
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_TASKINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    TASK_DEF_KEY_ varchar(255),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    START_TIME_ timestamp not null,
+    IN_PROGRESS_TIME_ timestamp,
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ timestamp,
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ timestamp,
+    SUSPENDED_BY_ varchar(255),
+    END_TIME_ timestamp,
+    COMPLETED_BY_ varchar(255),
+    DURATION_ bigint,
+    DELETE_REASON_ varchar(4000),
+    PRIORITY_ integer,
+    IN_PROGRESS_DUE_DATE_ timestamp,
+    DUE_DATE_ timestamp,
+    FORM_KEY_ varchar(255),
+    CATEGORY_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    LAST_UPDATED_TIME_ timestamp,
+    primary key (ID_)
+);
+
+create table ACT_HI_TSK_LOG (
+    ID_ identity,
+    TYPE_ varchar(64),
+    TASK_ID_ varchar(64) not null,
+    TIME_STAMP_ timestamp not null,
+    USER_ID_ varchar(255),
+    DATA_ varchar(4000),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
+
+create table ACT_RU_VARIABLE (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(255) not null,
+    NAME_ varchar(255) not null,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    primary key (ID_)
+);
+
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_BYTEARRAY
+    foreign key (BYTEARRAY_ID_)
+    references ACT_GE_BYTEARRAY;
+
+create table ACT_HI_VARINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(100),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    CREATE_TIME_ timestamp,
+    LAST_UPDATED_TIME_ timestamp,
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.hsql.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.hsql.create.common.sql
index a6e7a0485b6..7589cd67120 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.hsql.create.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.hsql.create.common.sql
@@ -16,7 +16,582 @@ create table ACT_GE_BYTEARRAY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
+values ('common.schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+    
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    CREATE_TIME_ timestamp,
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64),
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ timestamp,
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ varchar(255) not null,
+    EVENT_NAME_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(64),
+    CONFIGURATION_ varchar(255),
+    CREATED_ timestamp not null,
+    PROC_DEF_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_ID_ varchar(64),
+    SCOPE_DEFINITION_ID_ varchar(64),
+    SCOPE_DEFINITION_KEY_ varchar(255),
+    SCOPE_TYPE_ varchar(64),
+    LOCK_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64) null,
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ varchar(64),
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    PROC_INST_ID_ varchar(64) null,
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_RU_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_TIMER_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_SUSPENDED_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_DEADLETTER_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_HISTORY_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    ADV_HANDLER_CFG_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
+create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_RU_TASK (
+    ID_ varchar(64),
+    REV_ integer,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    TASK_DEF_KEY_ varchar(255),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    DELEGATION_ varchar(64),
+    PRIORITY_ integer,
+    CREATE_TIME_ timestamp,
+    IN_PROGRESS_TIME_ timestamp,
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ timestamp,
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ timestamp,
+    SUSPENDED_BY_ varchar(255),
+    IN_PROGRESS_DUE_DATE_ timestamp,
+    DUE_DATE_ timestamp,
+    CATEGORY_ varchar(255),
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(255) default '',
+    FORM_KEY_ varchar(255),
+    IS_COUNT_ENABLED_ bit,
+    VAR_COUNT_ integer, 
+    ID_LINK_COUNT_ integer,
+    SUB_TASK_COUNT_ integer,
+    primary key (ID_)
+);
+
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_TASKINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    TASK_DEF_KEY_ varchar(255),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    START_TIME_ timestamp not null,
+    IN_PROGRESS_TIME_ timestamp,
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ timestamp,
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ timestamp,
+    SUSPENDED_BY_ varchar(255),
+    END_TIME_ timestamp,
+    COMPLETED_BY_ varchar(255),
+    DURATION_ bigint,
+    DELETE_REASON_ varchar(4000),
+    PRIORITY_ integer,
+    IN_PROGRESS_DUE_DATE_ timestamp,
+    DUE_DATE_ timestamp,
+    FORM_KEY_ varchar(255),
+    CATEGORY_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    LAST_UPDATED_TIME_ timestamp,
+    primary key (ID_)
+);
+
+create table ACT_HI_TSK_LOG (
+    ID_ identity,
+    TYPE_ varchar(64),
+    TASK_ID_ varchar(64) not null,
+    TIME_STAMP_ timestamp not null,
+    USER_ID_ varchar(255),
+    DATA_ varchar(4000),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
+
+create table ACT_RU_VARIABLE (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(255) not null,
+    NAME_ varchar(255) not null,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    primary key (ID_)
+);
+
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_RU_VARIABLE
+    add constraint ACT_FK_VAR_BYTEARRAY
+    foreign key (BYTEARRAY_ID_)
+    references ACT_GE_BYTEARRAY;
+
+create table ACT_HI_VARINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(100),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    CREATE_TIME_ timestamp,
+    LAST_UPDATED_TIME_ timestamp,
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mssql.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mssql.create.common.sql
index ce396e8c910..5bcee4c16a3 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mssql.create.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mssql.create.common.sql
@@ -16,7 +16,588 @@ create table ACT_GE_BYTEARRAY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
+values ('common.schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
+
+
+create table ACT_RU_ENTITYLINK (
+    ID_ nvarchar(64),
+    REV_ int,
+    CREATE_TIME_ datetime,
+    LINK_TYPE_ nvarchar(255),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    PARENT_ELEMENT_ID_ nvarchar(255),
+    REF_SCOPE_ID_ nvarchar(255),
+    REF_SCOPE_TYPE_ nvarchar(255),
+    REF_SCOPE_DEFINITION_ID_ nvarchar(255),
+    ROOT_SCOPE_ID_ nvarchar(255),
+    ROOT_SCOPE_TYPE_ nvarchar(255),
+    HIERARCHY_TYPE_ nvarchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ nvarchar(64),
+    LINK_TYPE_ nvarchar(255),
+    CREATE_TIME_ datetime,
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    PARENT_ELEMENT_ID_ nvarchar(255),
+    REF_SCOPE_ID_ nvarchar(255),
+    REF_SCOPE_TYPE_ nvarchar(255),
+    REF_SCOPE_DEFINITION_ID_ nvarchar(255),
+    ROOT_SCOPE_ID_ nvarchar(255),
+    ROOT_SCOPE_TYPE_ nvarchar(255),
+    HIERARCHY_TYPE_ nvarchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ nvarchar(64),
+    REV_ int,
+    GROUP_ID_ nvarchar(255),
+    TYPE_ nvarchar(255),
+    USER_ID_ nvarchar(255),
+    TASK_ID_ nvarchar(64),
+    PROC_INST_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ nvarchar(64),
+    GROUP_ID_ nvarchar(255),
+    TYPE_ nvarchar(255),
+    USER_ID_ nvarchar(255),
+    TASK_ID_ nvarchar(64),
+    CREATE_TIME_ datetime,
+    PROC_INST_ID_ nvarchar(64),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_JOB (
+    ID_ nvarchar(64) NOT NULL,
+    REV_ int,
+    CATEGORY_ varchar(255),
+    TYPE_ nvarchar(255) NOT NULL,
+    LOCK_EXP_TIME_ datetime,
+    LOCK_OWNER_ nvarchar(255),
+    EXCLUSIVE_ bit,
+    EXECUTION_ID_ nvarchar(64),
+    PROCESS_INSTANCE_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    ELEMENT_ID_ nvarchar(255),
+    ELEMENT_NAME_ nvarchar(255),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    CORRELATION_ID_ nvarchar(255),
+    RETRIES_ int,
+    EXCEPTION_STACK_ID_ nvarchar(64),
+    EXCEPTION_MSG_ nvarchar(4000),
+    DUEDATE_ datetime NULL,
+    REPEAT_ nvarchar(255),
+    HANDLER_TYPE_ nvarchar(255),
+    HANDLER_CFG_ nvarchar(4000),
+    CUSTOM_VALUES_ID_ nvarchar(64),
+    CREATE_TIME_ datetime2 NULL,
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_TIMER_JOB (
+    ID_ nvarchar(64) NOT NULL,
+    REV_ int,
+    CATEGORY_ varchar(255),
+    TYPE_ nvarchar(255) NOT NULL,
+    LOCK_EXP_TIME_ datetime,
+    LOCK_OWNER_ nvarchar(255),
+    EXCLUSIVE_ bit,
+    EXECUTION_ID_ nvarchar(64),
+    PROCESS_INSTANCE_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    ELEMENT_ID_ nvarchar(255),
+    ELEMENT_NAME_ nvarchar(255),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    CORRELATION_ID_ nvarchar(255),
+    RETRIES_ int,
+    EXCEPTION_STACK_ID_ nvarchar(64),
+    EXCEPTION_MSG_ nvarchar(4000),
+    DUEDATE_ datetime NULL,
+    REPEAT_ nvarchar(255),
+    HANDLER_TYPE_ nvarchar(255),
+    HANDLER_CFG_ nvarchar(4000),
+    CUSTOM_VALUES_ID_ nvarchar(64),
+    CREATE_TIME_ datetime2 NULL,
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_SUSPENDED_JOB (
+    ID_ nvarchar(64) NOT NULL,
+    REV_ int,
+    CATEGORY_ varchar(255),
+    TYPE_ nvarchar(255) NOT NULL,
+    EXCLUSIVE_ bit,
+    EXECUTION_ID_ nvarchar(64),
+    PROCESS_INSTANCE_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    ELEMENT_ID_ nvarchar(255),
+    ELEMENT_NAME_ nvarchar(255),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    CORRELATION_ID_ nvarchar(255),
+    RETRIES_ int,
+    EXCEPTION_STACK_ID_ nvarchar(64),
+    EXCEPTION_MSG_ nvarchar(4000),
+    DUEDATE_ datetime NULL,
+    REPEAT_ nvarchar(255),
+    HANDLER_TYPE_ nvarchar(255),
+    HANDLER_CFG_ nvarchar(4000),
+    CUSTOM_VALUES_ID_ nvarchar(64),
+    CREATE_TIME_ datetime2 NULL,
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_DEADLETTER_JOB (
+    ID_ nvarchar(64) NOT NULL,
+    REV_ int,
+    CATEGORY_ varchar(255),
+    TYPE_ nvarchar(255) NOT NULL,
+    EXCLUSIVE_ bit,
+    EXECUTION_ID_ nvarchar(64),
+    PROCESS_INSTANCE_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    ELEMENT_ID_ nvarchar(255),
+    ELEMENT_NAME_ nvarchar(255),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    CORRELATION_ID_ nvarchar(255),
+    EXCEPTION_STACK_ID_ nvarchar(64),
+    EXCEPTION_MSG_ nvarchar(4000),
+    DUEDATE_ datetime NULL,
+    REPEAT_ nvarchar(255),
+    HANDLER_TYPE_ nvarchar(255),
+    HANDLER_CFG_ nvarchar(4000),
+    CUSTOM_VALUES_ID_ nvarchar(64),
+    CREATE_TIME_ datetime2 NULL,
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_HISTORY_JOB (
+    ID_ nvarchar(64) NOT NULL,
+    REV_ int,
+    LOCK_EXP_TIME_ datetime NULL,
+    LOCK_OWNER_ nvarchar(255),
+    RETRIES_ int,
+    EXCEPTION_STACK_ID_ nvarchar(64),
+    EXCEPTION_MSG_ nvarchar(4000),
+    HANDLER_TYPE_ nvarchar(255),
+    HANDLER_CFG_ nvarchar(4000),
+    CUSTOM_VALUES_ID_ nvarchar(64),
+    ADV_HANDLER_CFG_ID_ nvarchar(64),
+    CREATE_TIME_ datetime2 NULL,
+    SCOPE_TYPE_ nvarchar(255),
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ nvarchar(64) NOT NULL,
+    REV_ int,
+    CATEGORY_ varchar(255),
+    TYPE_ nvarchar(255) NOT NULL,
+    LOCK_EXP_TIME_ datetime,
+    LOCK_OWNER_ nvarchar(255),
+    EXCLUSIVE_ bit,
+    EXECUTION_ID_ nvarchar(64),
+    PROCESS_INSTANCE_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    ELEMENT_ID_ nvarchar(255),
+    ELEMENT_NAME_ nvarchar(255),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    CORRELATION_ID_ nvarchar(255),
+    RETRIES_ int,
+    EXCEPTION_STACK_ID_ nvarchar(64),
+    EXCEPTION_MSG_ nvarchar(4000),
+    DUEDATE_ datetime NULL,
+    REPEAT_ nvarchar(255),
+    HANDLER_TYPE_ nvarchar(255),
+    HANDLER_CFG_ nvarchar(4000),
+    CUSTOM_VALUES_ID_ nvarchar(64),
+    CREATE_TIME_ datetime2 NULL,
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
+create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table FLW_RU_BATCH (
+    ID_ nvarchar(64) not null,
+    REV_ int,
+    TYPE_ nvarchar(64) not null,
+    SEARCH_KEY_ nvarchar(255),
+    SEARCH_KEY2_ nvarchar(255),
+    CREATE_TIME_ datetime not null,
+    COMPLETE_TIME_ datetime,
+    STATUS_ nvarchar(255),
+    BATCH_DOC_ID_ nvarchar(64),
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create table FLW_RU_BATCH_PART (
+    ID_ nvarchar(64) not null,
+    REV_ int,
+    BATCH_ID_ nvarchar(64),
+    TYPE_ nvarchar(64) not null,
+    SCOPE_ID_ nvarchar(64),
+    SUB_SCOPE_ID_ nvarchar(64),
+    SCOPE_TYPE_ nvarchar(64),
+    SEARCH_KEY_ nvarchar(255),
+    SEARCH_KEY2_ nvarchar(255),
+    CREATE_TIME_ datetime not null,
+    COMPLETE_TIME_ datetime,
+    STATUS_ nvarchar(255),
+    RESULT_DOC_ID_ nvarchar(64),
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
+create table ACT_RU_TASK (
+    ID_ nvarchar(64),
+    REV_ int,
+    EXECUTION_ID_ nvarchar(64),
+    PROC_INST_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    TASK_DEF_ID_ nvarchar(64),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    PROPAGATED_STAGE_INST_ID_ nvarchar(255),
+    STATE_ nvarchar(255),
+    NAME_ nvarchar(255),
+    PARENT_TASK_ID_ nvarchar(64),
+    DESCRIPTION_ nvarchar(4000),
+    TASK_DEF_KEY_ nvarchar(255),
+    OWNER_ nvarchar(255),
+    ASSIGNEE_ nvarchar(255),
+    DELEGATION_ nvarchar(64),
+    PRIORITY_ int,
+    CREATE_TIME_ datetime,
+    IN_PROGRESS_TIME_ datetime,
+    IN_PROGRESS_STARTED_BY_ nvarchar(255),
+    CLAIM_TIME_ datetime,
+    CLAIMED_BY_ nvarchar(255),
+    SUSPENDED_TIME_ datetime,
+    SUSPENDED_BY_ nvarchar(255),
+    IN_PROGRESS_DUE_DATE_ datetime,
+    DUE_DATE_ datetime,
+    CATEGORY_ nvarchar(255),
+    SUSPENSION_STATE_ int,
+    TENANT_ID_ nvarchar(255) default '',
+    FORM_KEY_ nvarchar(255),
+    IS_COUNT_ENABLED_ tinyint,
+    VAR_COUNT_ int, 
+    ID_LINK_COUNT_ int,
+    SUB_TASK_COUNT_ int,
+    primary key (ID_)
+);
+
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_TASKINST (
+    ID_ nvarchar(64) not null,
+    REV_ int default 1,
+    PROC_DEF_ID_ nvarchar(64),
+    TASK_DEF_ID_ nvarchar(64),
+    TASK_DEF_KEY_ nvarchar(255),
+    PROC_INST_ID_ nvarchar(64),
+    EXECUTION_ID_ nvarchar(64),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    PROPAGATED_STAGE_INST_ID_ nvarchar(255),
+    STATE_ nvarchar(255),
+    NAME_ nvarchar(255),
+    PARENT_TASK_ID_ nvarchar(64),
+    DESCRIPTION_ nvarchar(4000),
+    OWNER_ nvarchar(255),
+    ASSIGNEE_ nvarchar(255),
+    START_TIME_ datetime not null,
+    IN_PROGRESS_TIME_ datetime,
+    IN_PROGRESS_STARTED_BY_ nvarchar(255),
+    CLAIM_TIME_ datetime,
+    CLAIMED_BY_ nvarchar(255),
+    SUSPENDED_TIME_ datetime,
+    SUSPENDED_BY_ nvarchar(255),
+    END_TIME_ datetime,
+    COMPLETED_BY_ nvarchar(255),
+    DURATION_ numeric(19,0),
+    DELETE_REASON_ nvarchar(4000),
+    PRIORITY_ int,
+    IN_PROGRESS_DUE_DATE_ datetime,
+    DUE_DATE_ datetime,
+    FORM_KEY_ nvarchar(255),
+    CATEGORY_ nvarchar(255),
+    TENANT_ID_ nvarchar(255) default '',
+    LAST_UPDATED_TIME_ datetime2,
+    primary key (ID_)
+);
+
+create table ACT_HI_TSK_LOG (
+    ID_ numeric(19,0) IDENTITY (1,1),
+    TYPE_ nvarchar(64),
+    TASK_ID_ nvarchar(64) not null,
+    TIME_STAMP_ datetime not null,
+    USER_ID_ nvarchar(255),
+    DATA_ nvarchar(4000),
+    EXECUTION_ID_ nvarchar(64),
+    PROC_INST_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    SCOPE_ID_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
+
+create table ACT_RU_VARIABLE (
+    ID_ nvarchar(64) not null,
+    REV_ int,
+    TYPE_ nvarchar(255) not null,
+    NAME_ nvarchar(255) not null,
+    EXECUTION_ID_ nvarchar(64),
+    PROC_INST_ID_ nvarchar(64),
+    TASK_ID_ nvarchar(64),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    BYTEARRAY_ID_ nvarchar(64),
+    DOUBLE_ double precision,
+    LONG_ numeric(19,0),
+    TEXT_ nvarchar(4000),
+    TEXT2_ nvarchar(4000),
+    META_INFO_ nvarchar(4000),
+    primary key (ID_)
+);
+
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_VARIABLE_BA on ACT_RU_VARIABLE(BYTEARRAY_ID_);
+alter table ACT_RU_VARIABLE 
+    add constraint ACT_FK_VAR_BYTEARRAY 
+    foreign key (BYTEARRAY_ID_) 
+    references ACT_GE_BYTEARRAY (ID_);
+
+create table ACT_HI_VARINST (
+    ID_ nvarchar(64) not null,
+    REV_ int default 1,
+    PROC_INST_ID_ nvarchar(64),
+    EXECUTION_ID_ nvarchar(64),
+    TASK_ID_ nvarchar(64),
+    NAME_ nvarchar(255) not null,
+    VAR_TYPE_ nvarchar(100),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    BYTEARRAY_ID_ nvarchar(64),
+    DOUBLE_ double precision,
+    LONG_ numeric(19,0),
+    TEXT_ nvarchar(4000),
+    TEXT2_ nvarchar(4000),
+    META_INFO_ nvarchar(4000),
+    CREATE_TIME_ datetime,
+    LAST_UPDATED_TIME_ datetime2,
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ nvarchar(64) not null,
+    REV_ int,
+    EVENT_TYPE_ nvarchar(255) not null,
+    EVENT_NAME_ nvarchar(255),
+    EXECUTION_ID_ nvarchar(64),
+    PROC_INST_ID_ nvarchar(64),
+    ACTIVITY_ID_ nvarchar(64),
+    CONFIGURATION_ nvarchar(255),
+    CREATED_ datetime not null,
+    PROC_DEF_ID_ nvarchar(64),
+    SUB_SCOPE_ID_ nvarchar(64),
+    SCOPE_ID_ nvarchar(64),
+    SCOPE_DEFINITION_ID_ nvarchar(64),
+    SCOPE_DEFINITION_KEY_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(64),
+    LOCK_TIME_ datetime,
+    LOCK_OWNER_ nvarchar(255),
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR_EXEC_ID on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mysql.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mysql.create.common.sql
index bbdec94096f..466b99a328a 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mysql.create.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mysql.create.common.sql
@@ -16,7 +16,587 @@ create table ACT_GE_BYTEARRAY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
+values ('common.schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
+
+
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    CREATE_TIME_ datetime(3),
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64),
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ datetime(3),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ varchar(64),
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    CREATE_TIME_ datetime(3),
+    PROC_INST_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp(3) NULL,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp(3) NULL,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_TIMER_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp(3) NULL,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp(3) NULL,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_SUSPENDED_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp(3) NULL,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp(3) NULL,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_DEADLETTER_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp(3) NULL,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp(3) NULL,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_HISTORY_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    LOCK_EXP_TIME_ timestamp(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    ADV_HANDLER_CFG_ID_ varchar(64),
+    CREATE_TIME_ timestamp(3) NULL,
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp(3) NULL,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp(3) NULL,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
+create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ datetime(3) not null,
+    COMPLETE_TIME_ datetime(3),
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ datetime(3) not null,
+    COMPLETE_TIME_ datetime(3),
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
+create table ACT_RU_TASK (
+    ID_ varchar(64),
+    REV_ integer,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    TASK_DEF_KEY_ varchar(255),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    DELEGATION_ varchar(64),
+    PRIORITY_ integer,
+    CREATE_TIME_ timestamp(3) NULL,
+    IN_PROGRESS_TIME_ datetime(3),
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ datetime(3),
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ datetime(3),
+    SUSPENDED_BY_ varchar(255),
+    IN_PROGRESS_DUE_DATE_ datetime(3),
+    DUE_DATE_ datetime(3),
+    CATEGORY_ varchar(255),
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(255) default '',
+    FORM_KEY_ varchar(255),
+    IS_COUNT_ENABLED_ TINYINT,
+    VAR_COUNT_ integer,
+    ID_LINK_COUNT_ integer,
+    SUB_TASK_COUNT_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_TASKINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    TASK_DEF_KEY_ varchar(255),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    START_TIME_ datetime(3) not null,
+    IN_PROGRESS_TIME_ datetime(3),
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ datetime(3),
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ datetime(3),
+    SUSPENDED_BY_ varchar(255),
+    END_TIME_ datetime(3),
+    COMPLETED_BY_ varchar(255),
+    DURATION_ bigint,
+    DELETE_REASON_ varchar(4000),
+    PRIORITY_ integer,
+    IN_PROGRESS_DUE_DATE_ datetime(3),
+    DUE_DATE_ datetime(3),
+    FORM_KEY_ varchar(255),
+    CATEGORY_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    LAST_UPDATED_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_HI_TSK_LOG (
+    ID_ bigint auto_increment,
+    TYPE_ varchar(64),
+    TASK_ID_ varchar(64) not null,
+    TIME_STAMP_ timestamp(3) not null,
+    USER_ID_ varchar(255),
+    DATA_ varchar(4000),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
+
+
+create table ACT_RU_VARIABLE (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(255) not null,
+    NAME_ varchar(255) not null,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_RU_VARIABLE 
+    add constraint ACT_FK_VAR_BYTEARRAY 
+    foreign key (BYTEARRAY_ID_) 
+    references ACT_GE_BYTEARRAY (ID_);
+
+create table ACT_HI_VARINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(100),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    CREATE_TIME_ datetime(3),
+    LAST_UPDATED_TIME_ datetime(3),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ varchar(255) not null,
+    EVENT_NAME_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(64),
+    CONFIGURATION_ varchar(255),
+    CREATED_ timestamp(3) not null DEFAULT CURRENT_TIMESTAMP(3),
+    PROC_DEF_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_ID_ varchar(64),
+    SCOPE_DEFINITION_ID_ varchar(64),
+    SCOPE_DEFINITION_KEY_ varchar(255),
+    SCOPE_TYPE_ varchar(64),
+    LOCK_TIME_ timestamp(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mysql55.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mysql55.create.common.sql
deleted file mode 100644
index bbdec94096f..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.mysql55.create.common.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_GE_PROPERTY (
-    NAME_ varchar(64),
-    VALUE_ varchar(300),
-    REV_ integer,
-    primary key (NAME_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_GE_BYTEARRAY (
-    ID_ varchar(64),
-    REV_ integer,
-    NAME_ varchar(255),
-    DEPLOYMENT_ID_ varchar(64),
-    BYTES_ LONGBLOB,
-    GENERATED_ TINYINT,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
-
-insert into ACT_GE_PROPERTY
-values ('next.dbid', '1', 1);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.oracle.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.oracle.create.common.sql
index c4c3def0484..db635a59f65 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.oracle.create.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.oracle.create.common.sql
@@ -16,7 +16,590 @@ create table ACT_GE_BYTEARRAY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
+values ('common.schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
+
+
+create table ACT_RU_ENTITYLINK (
+    ID_ NVARCHAR2(64),
+    REV_ INTEGER,
+    CREATE_TIME_ TIMESTAMP(6),
+    LINK_TYPE_ NVARCHAR2(255),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    PARENT_ELEMENT_ID_ NVARCHAR2(255),
+    REF_SCOPE_ID_ NVARCHAR2(255),
+    REF_SCOPE_TYPE_ NVARCHAR2(255),
+    REF_SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    ROOT_SCOPE_ID_ NVARCHAR2(255),
+    ROOT_SCOPE_TYPE_ NVARCHAR2(255),
+    HIERARCHY_TYPE_ NVARCHAR2(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ NVARCHAR2(64),
+    LINK_TYPE_ NVARCHAR2(255),
+    CREATE_TIME_ TIMESTAMP(6),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    PARENT_ELEMENT_ID_ NVARCHAR2(255),
+    REF_SCOPE_ID_ NVARCHAR2(255),
+    REF_SCOPE_TYPE_ NVARCHAR2(255),
+    REF_SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    ROOT_SCOPE_ID_ NVARCHAR2(255),
+    ROOT_SCOPE_TYPE_ NVARCHAR2(255),
+    HIERARCHY_TYPE_ NVARCHAR2(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ NVARCHAR2(64),
+    REV_ INTEGER,
+    GROUP_ID_ NVARCHAR2(255),
+    TYPE_ NVARCHAR2(255),
+    USER_ID_ NVARCHAR2(255),
+    TASK_ID_ NVARCHAR2(64),
+    PROC_INST_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ NVARCHAR2(64),
+    GROUP_ID_ NVARCHAR2(255),
+    TYPE_ NVARCHAR2(255),
+    USER_ID_ NVARCHAR2(255),
+    TASK_ID_ NVARCHAR2(64),
+    CREATE_TIME_ TIMESTAMP(6),
+    PROC_INST_ID_ NVARCHAR2(64),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_JOB (
+    ID_ NVARCHAR2(64) NOT NULL,
+    REV_ INTEGER,
+    CATEGORY_ NVARCHAR2(255),
+    TYPE_ NVARCHAR2(255) NOT NULL,
+    LOCK_EXP_TIME_ TIMESTAMP(6),
+    LOCK_OWNER_ NVARCHAR2(255),
+    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    ELEMENT_ID_ NVARCHAR2(255),
+    ELEMENT_NAME_ NVARCHAR2(255),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    CORRELATION_ID_ NVARCHAR2(255),
+    RETRIES_ INTEGER,
+    EXCEPTION_STACK_ID_ NVARCHAR2(64),
+    EXCEPTION_MSG_ NVARCHAR2(2000),
+    DUEDATE_ TIMESTAMP(6),
+    REPEAT_ NVARCHAR2(255),
+    HANDLER_TYPE_ NVARCHAR2(255),
+    HANDLER_CFG_ NVARCHAR2(2000),
+    CUSTOM_VALUES_ID_ NVARCHAR2(64),
+    CREATE_TIME_ TIMESTAMP(6),
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    primary key (ID_)
+);
+
+create table ACT_RU_TIMER_JOB (
+    ID_ NVARCHAR2(64) NOT NULL,
+    REV_ INTEGER,
+    CATEGORY_ NVARCHAR2(255),
+    TYPE_ NVARCHAR2(255) NOT NULL,
+    LOCK_EXP_TIME_ TIMESTAMP(6),
+    LOCK_OWNER_ NVARCHAR2(255),
+    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    ELEMENT_ID_ NVARCHAR2(255),
+    ELEMENT_NAME_ NVARCHAR2(255),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    CORRELATION_ID_ NVARCHAR2(255),
+    RETRIES_ INTEGER,
+    EXCEPTION_STACK_ID_ NVARCHAR2(64),
+    EXCEPTION_MSG_ NVARCHAR2(2000),
+    DUEDATE_ TIMESTAMP(6),
+    REPEAT_ NVARCHAR2(255),
+    HANDLER_TYPE_ NVARCHAR2(255),
+    HANDLER_CFG_ NVARCHAR2(2000),
+    CUSTOM_VALUES_ID_ NVARCHAR2(64),
+    CREATE_TIME_ TIMESTAMP(6),
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    primary key (ID_)
+);
+
+create table ACT_RU_SUSPENDED_JOB (
+    ID_ NVARCHAR2(64) NOT NULL,
+    REV_ INTEGER,
+    CATEGORY_ NVARCHAR2(255),
+    TYPE_ NVARCHAR2(255) NOT NULL,
+    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    ELEMENT_ID_ NVARCHAR2(255),
+    ELEMENT_NAME_ NVARCHAR2(255),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    CORRELATION_ID_ NVARCHAR2(255),
+    RETRIES_ INTEGER,
+    EXCEPTION_STACK_ID_ NVARCHAR2(64),
+    EXCEPTION_MSG_ NVARCHAR2(2000),
+    DUEDATE_ TIMESTAMP(6),
+    REPEAT_ NVARCHAR2(255),
+    HANDLER_TYPE_ NVARCHAR2(255),
+    HANDLER_CFG_ NVARCHAR2(2000),
+    CUSTOM_VALUES_ID_ NVARCHAR2(64),
+    CREATE_TIME_ TIMESTAMP(6),
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    primary key (ID_)
+);
+
+create table ACT_RU_DEADLETTER_JOB (
+    ID_ NVARCHAR2(64) NOT NULL,
+    REV_ INTEGER,
+    CATEGORY_ NVARCHAR2(255),
+    TYPE_ NVARCHAR2(255) NOT NULL,
+    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    ELEMENT_ID_ NVARCHAR2(255),
+    ELEMENT_NAME_ NVARCHAR2(255),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    CORRELATION_ID_ NVARCHAR2(255),
+    EXCEPTION_STACK_ID_ NVARCHAR2(64),
+    EXCEPTION_MSG_ NVARCHAR2(2000),
+    DUEDATE_ TIMESTAMP(6),
+    REPEAT_ NVARCHAR2(255),
+    HANDLER_TYPE_ NVARCHAR2(255),
+    HANDLER_CFG_ NVARCHAR2(2000),
+    CUSTOM_VALUES_ID_ NVARCHAR2(64),
+    CREATE_TIME_ TIMESTAMP(6),
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    primary key (ID_)
+);
+
+create table ACT_RU_HISTORY_JOB (
+    ID_ NVARCHAR2(64) NOT NULL,
+    REV_ INTEGER,
+    LOCK_EXP_TIME_ TIMESTAMP(6),
+    LOCK_OWNER_ NVARCHAR2(255),
+    RETRIES_ INTEGER,
+    EXCEPTION_STACK_ID_ NVARCHAR2(64),
+    EXCEPTION_MSG_ NVARCHAR2(2000),
+    HANDLER_TYPE_ NVARCHAR2(255),
+    HANDLER_CFG_ NVARCHAR2(2000),
+    CUSTOM_VALUES_ID_ NVARCHAR2(64),
+    ADV_HANDLER_CFG_ID_ NVARCHAR2(64),
+    CREATE_TIME_ TIMESTAMP(6),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    primary key (ID_)
+);
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ NVARCHAR2(64) NOT NULL,
+    REV_ INTEGER,
+    CATEGORY_ NVARCHAR2(255),
+    TYPE_ NVARCHAR2(255) NOT NULL,
+    LOCK_EXP_TIME_ TIMESTAMP(6),
+    LOCK_OWNER_ NVARCHAR2(255),
+    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    ELEMENT_ID_ NVARCHAR2(255),
+    ELEMENT_NAME_ NVARCHAR2(255),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    CORRELATION_ID_ NVARCHAR2(255),
+    RETRIES_ INTEGER,
+    EXCEPTION_STACK_ID_ NVARCHAR2(64),
+    EXCEPTION_MSG_ NVARCHAR2(2000),
+    DUEDATE_ TIMESTAMP(6),
+    REPEAT_ NVARCHAR2(255),
+    HANDLER_TYPE_ NVARCHAR2(255),
+    HANDLER_CFG_ NVARCHAR2(2000),
+    CUSTOM_VALUES_ID_ NVARCHAR2(64),
+    CREATE_TIME_ TIMESTAMP(6),
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_JOB_CUSTOM_VAL_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_TJOB_EXCEPTION on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_TJOB_CUSTOM_VAL_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TJOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_SJOB_EXCEPTION on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_SJOB_CUSTOM_VAL_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SJOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_DJOB_EXCEPTION on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_DJOB_CUSTOM_VAL_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DJOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_EJOB_EXCEPTION on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EJOB_CUSTOM_VAL_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_EJOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_);  
+
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);     
+
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table FLW_RU_BATCH (
+    ID_ NVARCHAR2(64) not null,
+    REV_ INTEGER,
+    TYPE_ NVARCHAR2(64) not null,
+    SEARCH_KEY_ NVARCHAR2(255),
+    SEARCH_KEY2_ NVARCHAR2(255),
+    CREATE_TIME_ TIMESTAMP(6) not null,
+    COMPLETE_TIME_ TIMESTAMP(6),
+    STATUS_ NVARCHAR2(255),
+    BATCH_DOC_ID_ NVARCHAR2(64),
+    TENANT_ID_ NVARCHAR2(255) default '',
+    primary key (ID_)
+);
+
+create table FLW_RU_BATCH_PART (
+    ID_ NVARCHAR2(64) not null,
+    REV_ INTEGER,
+    BATCH_ID_ NVARCHAR2(64),
+    TYPE_ NVARCHAR2(64) not null,
+    SCOPE_ID_ NVARCHAR2(64),
+    SUB_SCOPE_ID_ NVARCHAR2(64),
+    SCOPE_TYPE_ NVARCHAR2(64),
+    SEARCH_KEY_ NVARCHAR2(255),
+    SEARCH_KEY2_ NVARCHAR2(255),
+    CREATE_TIME_ TIMESTAMP(6) not null,
+    COMPLETE_TIME_ TIMESTAMP(6),
+    STATUS_ NVARCHAR2(255),
+    RESULT_DOC_ID_ NVARCHAR2(64),
+    TENANT_ID_ NVARCHAR2(255) default '',
+    primary key (ID_)
+);
+
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
+create table ACT_RU_TASK (
+    ID_ NVARCHAR2(64),
+    REV_ INTEGER,
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROC_INST_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    TASK_DEF_ID_ NVARCHAR2(64),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    PROPAGATED_STAGE_INST_ID_ NVARCHAR2(255),
+    STATE_ NVARCHAR2(255),
+    NAME_ NVARCHAR2(255),
+    PARENT_TASK_ID_ NVARCHAR2(64),
+    DESCRIPTION_ NVARCHAR2(2000),
+    TASK_DEF_KEY_ NVARCHAR2(255),
+    OWNER_ NVARCHAR2(255),
+    ASSIGNEE_ NVARCHAR2(255),
+    DELEGATION_ NVARCHAR2(64),
+    PRIORITY_ INTEGER,
+    CREATE_TIME_ TIMESTAMP(6),
+    IN_PROGRESS_TIME_ TIMESTAMP(6),
+    IN_PROGRESS_STARTED_BY_ NVARCHAR2(255),
+    CLAIM_TIME_ TIMESTAMP(6),
+    CLAIMED_BY_ NVARCHAR2(255),
+    SUSPENDED_TIME_ TIMESTAMP(6),
+    SUSPENDED_BY_ NVARCHAR2(255),
+    IN_PROGRESS_DUE_DATE_ TIMESTAMP(6),
+    DUE_DATE_ TIMESTAMP(6),
+    CATEGORY_ NVARCHAR2(255),
+    SUSPENSION_STATE_ INTEGER,
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    FORM_KEY_ NVARCHAR2(255),
+    IS_COUNT_ENABLED_ NUMBER(1,0) CHECK (IS_COUNT_ENABLED_ IN (1,0)),
+    VAR_COUNT_ INTEGER, 
+    ID_LINK_COUNT_ INTEGER,
+    SUB_TASK_COUNT_ INTEGER,
+    primary key (ID_)
+);
+
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_TASKINST (
+    ID_ NVARCHAR2(64) not null,
+    REV_ INTEGER default 1,
+    PROC_DEF_ID_ NVARCHAR2(64),
+    TASK_DEF_ID_ NVARCHAR2(64),
+    TASK_DEF_KEY_ NVARCHAR2(255),
+    PROC_INST_ID_ NVARCHAR2(64),
+    EXECUTION_ID_ NVARCHAR2(64),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    PROPAGATED_STAGE_INST_ID_ NVARCHAR2(255),
+    PARENT_TASK_ID_ NVARCHAR2(64),
+    STATE_ NVARCHAR2(255),
+    NAME_ NVARCHAR2(255),
+    DESCRIPTION_ NVARCHAR2(2000),
+    OWNER_ NVARCHAR2(255),
+    ASSIGNEE_ NVARCHAR2(255),
+    START_TIME_ TIMESTAMP(6) not null,
+    IN_PROGRESS_TIME_ TIMESTAMP(6),
+    IN_PROGRESS_STARTED_BY_ NVARCHAR2(255),
+    CLAIM_TIME_ TIMESTAMP(6),
+    CLAIMED_BY_ NVARCHAR2(255),
+    SUSPENDED_TIME_ TIMESTAMP(6),
+    SUSPENDED_BY_ NVARCHAR2(255),
+    END_TIME_ TIMESTAMP(6),
+    COMPLETED_BY_ NVARCHAR2(255),
+    DURATION_ NUMBER(19,0),
+    DELETE_REASON_ NVARCHAR2(2000),
+    PRIORITY_ INTEGER,
+    IN_PROGRESS_DUE_DATE_ TIMESTAMP(6),
+    DUE_DATE_ TIMESTAMP(6),
+    FORM_KEY_ NVARCHAR2(255),
+    CATEGORY_ NVARCHAR2(255),
+    TENANT_ID_ NVARCHAR2(255) default '',
+    LAST_UPDATED_TIME_ TIMESTAMP(6),
+    primary key (ID_)
+);
+
+create table ACT_HI_TSK_LOG (
+    ID_ NUMBER(19),
+    TYPE_ NVARCHAR2(64),
+    TASK_ID_ NVARCHAR2(64) not null,
+    TIME_STAMP_ TIMESTAMP(6) not null,
+    USER_ID_ NVARCHAR2(255),
+    DATA_ NVARCHAR2(2000),
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROC_INST_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    TENANT_ID_ NVARCHAR2(255) default '',
+    primary key (ID_)
+);
+
+create sequence act_hi_task_evt_log_seq start with 1 increment by 1;
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
+
+create table ACT_RU_VARIABLE (
+    ID_ NVARCHAR2(64) not null,
+    REV_ INTEGER,
+    TYPE_ NVARCHAR2(255) not null,
+    NAME_ NVARCHAR2(255) not null,
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROC_INST_ID_ NVARCHAR2(64),
+    TASK_ID_ NVARCHAR2(64),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    BYTEARRAY_ID_ NVARCHAR2(64),
+    DOUBLE_ NUMBER(*,10),
+    LONG_ NUMBER(19,0),
+    TEXT_ NVARCHAR2(2000),
+    TEXT2_ NVARCHAR2(2000),
+    META_INFO_ NVARCHAR2(2000),
+    primary key (ID_)
+);
+
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_);
+alter table ACT_RU_VARIABLE 
+    add constraint ACT_FK_VAR_BYTEARRAY 
+    foreign key (BYTEARRAY_ID_) 
+    references ACT_GE_BYTEARRAY (ID_);
+
+create table ACT_HI_VARINST (
+    ID_ NVARCHAR2(64) not null,
+    REV_ INTEGER default 1,
+    PROC_INST_ID_ NVARCHAR2(64),
+    EXECUTION_ID_ NVARCHAR2(64),
+    TASK_ID_ NVARCHAR2(64),
+    NAME_ NVARCHAR2(255) not null,
+    VAR_TYPE_ NVARCHAR2(100),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    BYTEARRAY_ID_ NVARCHAR2(64),
+    DOUBLE_ NUMBER(*,10),
+    LONG_ NUMBER(19,0),
+    TEXT_ NVARCHAR2(2000),
+    TEXT2_ NVARCHAR2(2000),
+    META_INFO_ NVARCHAR2(2000),
+    CREATE_TIME_ TIMESTAMP(6),
+    LAST_UPDATED_TIME_ TIMESTAMP(6),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ NVARCHAR2(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ NVARCHAR2(255) not null,
+    EVENT_NAME_ NVARCHAR2(255),
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROC_INST_ID_ NVARCHAR2(64),
+    ACTIVITY_ID_ NVARCHAR2(64),
+    CONFIGURATION_ NVARCHAR2(255),
+    CREATED_ TIMESTAMP(6) not null,
+    PROC_DEF_ID_ NVARCHAR2(64),
+    SUB_SCOPE_ID_ NVARCHAR2(64),
+    SCOPE_ID_ NVARCHAR2(64),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(64),
+    SCOPE_DEFINITION_KEY_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(64),
+    LOCK_TIME_ TIMESTAMP(6),
+    LOCK_OWNER_ NVARCHAR2(255),
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.postgres.create.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.postgres.create.common.sql
index ad762197d08..87c6c5fd55d 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.postgres.create.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/create/flowable.postgres.create.common.sql
@@ -16,7 +16,587 @@ create table ACT_GE_BYTEARRAY (
 );
 
 insert into ACT_GE_PROPERTY
-values ('common.schema.version', '7.1.0.0', 1);
+values ('common.schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
 values ('next.dbid', '1', 1);
+
+
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    CREATE_TIME_ timestamp,
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64),
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ timestamp,
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PARENT_ELEMENT_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    ROOT_SCOPE_ID_ varchar(255),
+    ROOT_SCOPE_TYPE_ varchar(255),
+    HIERARCHY_TYPE_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+
+create table ACT_RU_IDENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar (64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_IDENTITYLINK (
+    ID_ varchar(64),
+    GROUP_ID_ varchar(255),
+    TYPE_ varchar(255),
+    USER_ID_ varchar(255),
+    TASK_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    PROC_INST_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_TIMER_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_SUSPENDED_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_DEADLETTER_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_HISTORY_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    ADV_HANDLER_CFG_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    CORRELATION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
+create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
+create table ACT_RU_TASK (
+    ID_ varchar(64),
+    REV_ integer,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    TASK_DEF_KEY_ varchar(255),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    DELEGATION_ varchar(64),
+    PRIORITY_ integer,
+    CREATE_TIME_ timestamp,
+    IN_PROGRESS_TIME_ timestamp,
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ timestamp,
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ timestamp,
+    SUSPENDED_BY_ varchar(255),
+    IN_PROGRESS_DUE_DATE_ timestamp,
+    DUE_DATE_ timestamp,
+    CATEGORY_ varchar(255),
+    SUSPENSION_STATE_ integer,
+    TENANT_ID_ varchar(255) default '',
+    FORM_KEY_ varchar(255),
+    IS_COUNT_ENABLED_ boolean,
+    VAR_COUNT_ integer, 
+    ID_LINK_COUNT_ integer,
+    SUB_TASK_COUNT_ integer,
+    primary key (ID_)
+);
+
+create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+create table ACT_HI_TASKINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_DEF_ID_ varchar(64),
+    TASK_DEF_ID_ varchar(64),
+    TASK_DEF_KEY_ varchar(255),
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    PROPAGATED_STAGE_INST_ID_ varchar(255),
+    STATE_ varchar(255),
+    NAME_ varchar(255),
+    PARENT_TASK_ID_ varchar(64),
+    DESCRIPTION_ varchar(4000),
+    OWNER_ varchar(255),
+    ASSIGNEE_ varchar(255),
+    START_TIME_ timestamp not null,
+    IN_PROGRESS_TIME_ timestamp,
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIM_TIME_ timestamp,
+    CLAIMED_BY_ varchar(255),
+    SUSPENDED_TIME_ timestamp,
+    SUSPENDED_BY_ varchar(255),
+    END_TIME_ timestamp,
+    COMPLETED_BY_ varchar(255),
+    DURATION_ bigint,
+    DELETE_REASON_ varchar(4000),
+    PRIORITY_ integer,
+    IN_PROGRESS_DUE_DATE_ timestamp,
+    DUE_DATE_ timestamp,
+    FORM_KEY_ varchar(255),
+    CATEGORY_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    LAST_UPDATED_TIME_ timestamp,
+    primary key (ID_)
+);
+
+create table ACT_HI_TSK_LOG (
+    ID_ SERIAL PRIMARY KEY,
+    TYPE_ varchar(64),
+    TASK_ID_ varchar(64) not null,
+    TIME_STAMP_ timestamp not null,
+    USER_ID_ varchar(255),
+    DATA_ varchar(4000),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    TENANT_ID_ varchar(255) default ''
+);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
+
+create table ACT_RU_VARIABLE (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(255) not null,
+    NAME_ varchar(255) not null,
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double precision,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    primary key (ID_)
+);
+
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_);
+alter table ACT_RU_VARIABLE 
+    add constraint ACT_FK_VAR_BYTEARRAY 
+    foreign key (BYTEARRAY_ID_) 
+    references ACT_GE_BYTEARRAY (ID_);
+
+create table ACT_HI_VARINST (
+    ID_ varchar(64) not null,
+    REV_ integer default 1,
+    PROC_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    TASK_ID_ varchar(64),
+    NAME_ varchar(255) not null,
+    VAR_TYPE_ varchar(100),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    BYTEARRAY_ID_ varchar(64),
+    DOUBLE_ double precision,
+    LONG_ bigint,
+    TEXT_ varchar(4000),
+    TEXT2_ varchar(4000),
+    META_INFO_ varchar(4000),
+    CREATE_TIME_ timestamp,
+    LAST_UPDATED_TIME_ timestamp,
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+
+create table ACT_RU_EVENT_SUBSCR (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    EVENT_TYPE_ varchar(255) not null,
+    EVENT_NAME_ varchar(255),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(64),
+    CONFIGURATION_ varchar(255),
+    CREATED_ timestamp not null,
+    PROC_DEF_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_ID_ varchar(64),
+    SCOPE_DEFINITION_ID_ varchar(64),
+    SCOPE_DEFINITION_KEY_ varchar(255),
+    SCOPE_TYPE_ varchar(64),
+    LOCK_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+
+create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
+create index ACT_IDX_EVENT_SUBSCR on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.cockroachdb.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.cockroachdb.drop.common.sql
index df96f4db2ed..172ad175490 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.cockroachdb.drop.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.cockroachdb.drop.common.sql
@@ -1,4 +1,38 @@
+drop table if exists flw_ru_batch_part cascade;
+drop table if exists flw_ru_batch cascade;
+
+-- force-commit
+
+drop table if exists act_ru_entitylink cascade;
+
+-- force-commit
+
+drop table if exists ACT_RU_EVENT_SUBSCR cascade;
+
+drop table if exists act_ru_identitylink cascade;
+
+-- force-commit
+
+drop table if exists act_ru_job cascade;
+drop table if exists act_ru_timer_job cascade;
+drop table if exists act_ru_suspended_job cascade;
+drop table if exists act_ru_deadletter_job cascade;
+drop table if exists act_ru_history_job cascade;
+drop table if exists act_ru_external_job cascade;
+
+-- force-commit
+
+drop table if exists act_ru_task cascade;
+
+-- force-commit
+
+
+drop table if exists act_ru_variable cascade;
+
+-- force-commit
+
 drop table if exists act_ge_bytearray cascade;
 drop table if exists act_ge_property cascade;
 
--- force-commit
\ No newline at end of file
+-- force-commit
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.db2.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.db2.drop.common.sql
index 5f8ef049b28..3fea75eeccd 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.db2.drop.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.db2.drop.common.sql
@@ -1,2 +1,97 @@
+drop index FLW_IDX_BATCH_PART;
+
+drop table FLW_RU_BATCH_PART;
+drop table FLW_RU_BATCH;
+
+drop index ACT_IDX_ENT_LNK_SCOPE;
+drop index ACT_IDX_ENT_LNK_SCOPE_DEF;
+
+drop table ACT_RU_ENTITYLINK;
+
+drop index ACT_IDX_EVENT_SUBSCR_CONFIG_;
+drop index ACT_IDX_EVENT_SUBSCR_EXEC_ID;
+drop index ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
+
+drop table ACT_RU_EVENT_SUBSCR;
+
+drop index ACT_IDX_IDENT_LNK_USER;
+drop index ACT_IDX_IDENT_LNK_GROUP;
+drop index ACT_IDX_IDENT_LNK_SCOPE;
+drop index ACT_IDX_IDENT_LNK_SUB_SCOPE;
+drop index ACT_IDX_IDENT_LNK_SCOPE_DEF;
+
+drop table ACT_RU_IDENTITYLINK;
+
+drop index ACT_IDX_JOB_SCOPE;
+drop index ACT_IDX_JOB_SUB_SCOPE;
+drop index ACT_IDX_JOB_SCOPE_DEF;
+drop index ACT_IDX_TJOB_SCOPE;
+drop index ACT_IDX_TJOB_SUB_SCOPE;
+drop index ACT_IDX_TJOB_SCOPE_DEF;
+drop index ACT_IDX_SJOB_SCOPE;
+drop index ACT_IDX_SJOB_SUB_SCOPE;
+drop index ACT_IDX_SJOB_SCOPE_DEF;
+drop index ACT_IDX_DJOB_SCOPE;
+drop index ACT_IDX_DJOB_SUB_SCOPE;
+drop index ACT_IDX_DJOB_SCOPE_DEF;
+drop index ACT_IDX_EJOB_SCOPE;
+drop index ACT_IDX_EJOB_SUB_SCOPE;
+drop index ACT_IDX_EJOB_SCOPE_DEF;
+
+alter table ACT_RU_JOB
+    drop foreign key ACT_FK_JOB_EXCEPTION;
+
+alter table ACT_RU_JOB
+    drop foreign key ACT_FK_JOB_CUSTOM_VAL;
+
+alter table ACT_RU_TIMER_JOB
+    drop foreign key ACT_FK_TJOB_EXCEPTION;
+
+alter table ACT_RU_TIMER_JOB
+    drop foreign key ACT_FK_TJOB_CUSTOM_VAL;
+
+alter table ACT_RU_SUSPENDED_JOB
+    drop foreign key ACT_FK_SJOB_EXCEPTION;
+
+alter table ACT_RU_SUSPENDED_JOB
+    drop foreign key ACT_FK_SJOB_CUSTOM_VAL;
+
+alter table ACT_RU_DEADLETTER_JOB
+    drop foreign key ACT_FK_DJOB_EXCEPTION;
+
+alter table ACT_RU_DEADLETTER_JOB
+    drop foreign key ACT_FK_DJOB_CUSTOM_VAL;
+
+alter table ACT_RU_EXTERNAL_JOB
+    drop foreign key ACT_FK_EJOB_EXCEPTION;
+
+alter table ACT_RU_EXTERNAL_JOB
+    drop foreign key ACT_FK_EJOB_CUSTOM_VAL;
+
+drop table ACT_RU_JOB;
+drop table ACT_RU_TIMER_JOB;
+drop table ACT_RU_SUSPENDED_JOB;
+drop table ACT_RU_DEADLETTER_JOB;
+drop table ACT_RU_HISTORY_JOB;
+drop table ACT_RU_EXTERNAL_JOB;
+
+
+drop index ACT_IDX_TASK_CREATE;
+drop index ACT_IDX_TASK_SCOPE;
+drop index ACT_IDX_TASK_SUB_SCOPE;
+drop index ACT_IDX_TASK_SCOPE_DEF;
+
+drop table ACT_HI_TSK_LOG;
+
+drop index ACT_IDX_RU_VAR_SCOPE_ID_TYPE;
+drop index ACT_IDX_RU_VAR_SUB_ID_TYPE;
+
+alter table ACT_RU_VARIABLE
+    drop foreign key ACT_FK_VAR_BYTEARRAY;
+
+drop table ACT_RU_VARIABLE;
+
+
 drop table ACT_GE_BYTEARRAY;
-drop table ACT_GE_PROPERTY;
\ No newline at end of file
+drop table ACT_GE_PROPERTY;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.h2.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.h2.drop.common.sql
index baeb2522785..7364ece1f5b 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.h2.drop.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.h2.drop.common.sql
@@ -1,2 +1,82 @@
+drop table if exists FLW_RU_BATCH_PART cascade constraints;
+drop table if exists FLW_RU_BATCH cascade constraints;
+
+drop index if exists FLW_IDX_BATCH_PART;
+
+drop table if exists ACT_RU_ENTITYLINK cascade constraints;
+
+drop index if exists ACT_IDX_ENT_LNK_SCOPE;
+drop index if exists ACT_IDX_ENT_LNK_SCOPE_DEF;
+
+drop table if exists ACT_HI_ENTITYLINK cascade constraints;
+
+drop index if exists ACT_IDX_HI_ENT_LNK_SCOPE;
+drop index if exists ACT_IDX_HI_ENT_LNK_SCOPE_DEF;
+
+drop table if exists ACT_RU_EVENT_SUBSCR cascade constraints;
+
+drop index if exists ACT_IDX_EVENT_SUBSCR_CONFIG_;
+drop index if exists ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
+
+drop table if exists ACT_RU_IDENTITYLINK cascade constraints;
+
+drop index if exists ACT_IDX_IDENT_LNK_USER;
+drop index if exists ACT_IDX_IDENT_LNK_GROUP;
+drop index if exists ACT_IDX_IDENT_LNK_SCOPE;
+drop index if exists ACT_IDX_IDENT_LNK_SUB_SCOPE;
+drop index if exists ACT_IDX_IDENT_LNK_SCOPE_DEF;
+
+drop table if exists ACT_HI_IDENTITYLINK cascade constraints;
+
+drop index if exists ACT_IDX_HI_IDENT_LNK_USER;
+drop index if exists ACT_IDX_HI_IDENT_LNK_SCOPE;
+drop index if exists ACT_IDX_HI_IDENT_LNK_SUB_SCOPE;
+drop index if exists ACT_IDX_HI_IDENT_LNK_SCOPE_DEF;
+
+drop index if exists ACT_IDX_JOB_SCOPE;
+drop index if exists ACT_IDX_JOB_SUB_SCOPE;
+drop index if exists ACT_IDX_JOB_SCOPE_DEF;
+drop index if exists ACT_IDX_TJOB_SCOPE;
+drop index if exists ACT_IDX_TJOB_SUB_SCOPE;
+drop index if exists ACT_IDX_TJOB_SCOPE_DEF;
+drop index if exists ACT_IDX_SJOB_SCOPE;
+drop index if exists ACT_IDX_SJOB_SUB_SCOPE;
+drop index if exists ACT_IDX_SJOB_SCOPE_DEF;
+drop index if exists ACT_IDX_DJOB_SCOPE;
+drop index if exists ACT_IDX_DJOB_SUB_SCOPE;
+drop index if exists ACT_IDX_DJOB_SCOPE_DEF;  
+drop index if exists ACT_IDX_EJOB_SCOPE;
+drop index if exists ACT_IDX_EJOB_SUB_SCOPE;
+drop index if exists ACT_IDX_EJOB_SCOPE_DEF;
+
+drop table if exists ACT_RU_JOB cascade constraints;
+drop table if exists ACT_RU_EXTERNAL_JOB cascade constraints;
+drop table if exists ACT_RU_TIMER_JOB cascade constraints;
+drop table if exists ACT_RU_SUSPENDED_JOB cascade constraints;
+drop table if exists ACT_RU_DEADLETTER_JOB cascade constraints;
+drop table if exists ACT_RU_HISTORY_JOB cascade constraints;
+
+drop table if exists ACT_RU_TASK cascade constraints;
+
+drop index if exists ACT_IDX_TASK_CREATE;
+
+drop table if exists ACT_HI_TASKINST cascade constraints;
+drop table if exists ACT_HI_TSK_LOG cascade constraints;
+
+drop index if exists ACT_IDX_HI_TASK_SCOPE;
+drop index if exists ACT_IDX_HI_TASK_SUB_SCOPE;
+drop index if exists ACT_IDX_HI_TASK_SCOPE_DEF;
+
+drop table if exists ACT_RU_VARIABLE cascade constraints;
+
+
+drop table if exists ACT_HI_VARINST cascade constraints;
+
+drop index if exists ACT_IDX_HI_PROCVAR_NAME_TYPE;
+drop index if exists ACT_IDX_HI_VAR_SCOPE_ID_TYPE;
+drop index if exists ACT_IDX_HI_VAR_SUB_ID_TYPE;
+
+
 drop table if exists ACT_GE_BYTEARRAY cascade constraints;
-drop table if exists ACT_GE_PROPERTY cascade constraints;
\ No newline at end of file
+drop table if exists ACT_GE_PROPERTY cascade constraints;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.hsql.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.hsql.drop.common.sql
index 44691e17b91..c1f26622073 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.hsql.drop.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.hsql.drop.common.sql
@@ -1,2 +1,56 @@
+drop table if exists FLW_RU_BATCH_PART cascade constraints;
+drop table if exists FLW_RU_BATCH cascade constraints;
+
+drop index if exists FLW_IDX_BATCH_PART;
+
+drop table if exists ACT_RU_ENTITYLINK cascade;
+
+drop index if exists ACT_IDX_ENT_LNK_SCOPE;
+drop index if exists ACT_IDX_ENT_LNK_SCOPE_DEF;
+
+drop table if exists ACT_RU_EVENT_SUBSCR cascade;
+
+drop index if exists ACT_IDX_EVENT_SUBSCR_CONFIG_;
+drop index if exists ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
+
+drop table if exists ACT_RU_IDENTITYLINK cascade;
+
+drop index if exists ACT_IDX_IDENT_LNK_USER;
+drop index if exists ACT_IDX_IDENT_LNK_GROUP;
+drop index if exists ACT_IDX_IDENT_LNK_SCOPE;
+drop index if exists ACT_IDX_IDENT_LNK_SUB_SCOPE;
+drop index if exists ACT_IDX_IDENT_LNK_SCOPE_DEF;
+
+drop index if exists ACT_IDX_JOB_SCOPE;
+drop index if exists ACT_IDX_JOB_SUB_SCOPE;
+drop index if exists ACT_IDX_JOB_SCOPE_DEF;
+drop index if exists ACT_IDX_TJOB_SCOPE;
+drop index if exists ACT_IDX_TJOB_SUB_SCOPE;
+drop index if exists ACT_IDX_TJOB_SCOPE_DEF;
+drop index if exists ACT_IDX_SJOB_SCOPE;
+drop index if exists ACT_IDX_SJOB_SUB_SCOPE;
+drop index if exists ACT_IDX_SJOB_SCOPE_DEF;
+drop index if exists ACT_IDX_DJOB_SCOPE;
+drop index if exists ACT_IDX_DJOB_SUB_SCOPE;
+drop index if exists ACT_IDX_DJOB_SCOPE_DEF;
+
+drop table if exists ACT_RU_JOB cascade;
+drop table if exists ACT_RU_TIMER_JOB cascade;
+drop table if exists ACT_RU_SUSPENDED_JOB cascade;
+drop table if exists ACT_RU_DEADLETTER_JOB cascade;
+drop table if exists ACT_RU_EXTERNAL_JOB cascade;
+drop table if exists ACT_RU_HISTORY_JOB cascade;
+
+drop table if exists ACT_RU_TASK cascade;
+
+drop index if exists ACT_IDX_TASK_CREATE;
+drop index if exists ACT_IDX_TASK_SCOPE;
+drop index if exists ACT_IDX_TASK_SUB_SCOPE;
+drop index if exists ACT_IDX_TASK_SCOPE_DEF;
+
+drop table if exists ACT_RU_VARIABLE cascade;
+
+
 drop table if exists ACT_GE_BYTEARRAY cascade;
-drop table if exists ACT_GE_PROPERTY cascade;
\ No newline at end of file
+drop table if exists ACT_GE_PROPERTY cascade;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mssql.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mssql.drop.common.sql
index f1b06b5e220..0b909914e2d 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mssql.drop.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mssql.drop.common.sql
@@ -1,2 +1,75 @@
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'FLW_IDX_BATCH_PART') drop index FLW_RU_BATCH_PART.FLW_IDX_BATCH_PART;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_RU_BATCH_PART') drop table FLW_RU_BATCH_PART;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'FLW_RU_BATCH') drop table FLW_RU_BATCH;
+
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_ENT_LNK_SCOPE') drop index ACT_RU_ENTITYLINK.ACT_IDX_ENT_LNK_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_ENT_LNK_SCOPE_DEF') drop index ACT_RU_ENTITYLINK.ACT_IDX_ENT_LNK_SCOPE_DEF;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_ENTITYLINK') drop table ACT_RU_ENTITYLINK;
+
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EVENT_SUBSCR_CONFIG_') drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_CONFIG_;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EVENT_SUBSCR_EXEC_ID') drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_EXEC_ID;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EVENT_SUBSCR_SCOPEREF_') drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EVENT_SUBSCR') drop table ACT_RU_EVENT_SUBSCR;
+
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_USER') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_USER;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_GROUP') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_GROUP;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_SCOPE') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_SUB_SCOPE') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_SUB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_SCOPE_DEF') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_SCOPE_DEF;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_IDENTITYLINK') drop table ACT_RU_IDENTITYLINK;
+
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_JOB_SCOPE') drop index ACT_RU_JOB.ACT_IDX_JOB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_JOB_SUB_SCOPE') drop index ACT_RU_JOB.ACT_IDX_JOB_SUB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_JOB_SCOPE_DEF') drop index ACT_RU_JOB.ACT_IDX_JOB_SCOPE_DEF;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TJOB_SCOPE') drop index ACT_RU_TIMER_JOB.ACT_IDX_TJOB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TJOB_SUB_SCOPE') drop index ACT_RU_TIMER_JOB.ACT_IDX_TJOB_SUB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TJOB_SCOPE_DEF') drop index ACT_RU_TIMER_JOB.ACT_IDX_TJOB_SCOPE_DEF;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_SJOB_SCOPE') drop index ACT_RU_SUSPENDED_JOB.ACT_IDX_SJOB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_SJOB_SUB_SCOPE') drop index ACT_RU_SUSPENDED_JOB.ACT_IDX_SJOB_SUB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_SJOB_SCOPE_DEF') drop index ACT_RU_SUSPENDED_JOB.ACT_IDX_SJOB_SCOPE_DEF;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_DJOB_SCOPE') drop index ACT_RU_DEADLETTER_JOB.ACT_IDX_DJOB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_DJOB_SUB_SCOPE') drop index ACT_RU_DEADLETTER_JOB.ACT_IDX_DJOB_SUB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_DJOB_SCOPE_DEF') drop index ACT_RU_DEADLETTER_JOB.ACT_IDX_DJOB_SCOPE_DEF;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EJOB_SCOPE') drop index ACT_RU_EXTERNAL_JOB.ACT_IDX_EJOB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EJOB_SUB_SCOPE') drop index ACT_RU_EXTERNAL_JOB.ACT_IDX_EJOB_SUB_SCOPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EJOB_SCOPE_DEF') drop index ACT_RU_EXTERNAL_JOB.ACT_IDX_EJOB_SCOPE_DEF;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') alter table ACT_RU_JOB drop constraint ACT_FK_JOB_CUSTOM_VALUES;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TIMER_JOB') alter table ACT_RU_TIMER_JOB drop constraint ACT_FK_TIMER_JOB_EXCEPTION;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TIMER_JOB') alter table ACT_RU_TIMER_JOB drop constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_SUSPENDED_JOB') alter table ACT_RU_SUSPENDED_JOB drop constraint ACT_FK_SUSPENDED_JOB_EXCEPTION;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_SUSPENDED_JOB') alter table ACT_RU_SUSPENDED_JOB drop constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_DEADLETTER_JOB') alter table ACT_RU_DEADLETTER_JOB drop constraint ACT_FK_DEADLETTER_JOB_EXCEPTION;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_DEADLETTER_JOB') alter table ACT_RU_DEADLETTER_JOB drop constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXTERNAL_JOB') alter table ACT_RU_EXTERNAL_JOB drop constraint ACT_FK_EXTERNAL_JOB_EXCEPTION;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXTERNAL_JOB') alter table ACT_RU_EXTERNAL_JOB drop constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') drop table ACT_RU_JOB;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TIMER_JOB') drop table ACT_RU_TIMER_JOB;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_SUSPENDED_JOB') drop table ACT_RU_SUSPENDED_JOB;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_DEADLETTER_JOB') drop table ACT_RU_DEADLETTER_JOB;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_HISTORY_JOB') drop table ACT_RU_HISTORY_JOB;
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXTERNAL_JOB') drop table ACT_RU_EXTERNAL_JOB;
+
+
+if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_CREATE') drop index ACT_RU_TASK.ACT_IDX_TASK_CREATE;
+if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SCOPE') drop index ACT_RU_TASK.ACT_IDX_TASK_SCOPE;
+if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SUB_SCOPE') drop index ACT_RU_TASK.ACT_IDX_TASK_SUB_SCOPE;
+if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SCOPE_DEF') drop index ACT_RU_TASK.ACT_IDX_TASK_SCOPE_DEF;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TASK') drop table ACT_RU_TASK;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_BYTEARRAY;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_RU_VAR_SCOPE_ID_TYPE') drop index ACT_RU_VARIABLE.ACT_IDX_RU_VAR_SCOPE_ID_TYPE;
+IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_RU_VAR_SUB_ID_TYPE') drop index ACT_RU_VARIABLE.ACT_IDX_RU_VAR_SUB_ID_TYPE;
+
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') drop table ACT_RU_VARIABLE;
+
 if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_BYTEARRAY') drop table ACT_GE_BYTEARRAY;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_PROPERTY') drop table ACT_GE_PROPERTY;
\ No newline at end of file
+if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_GE_PROPERTY') drop table ACT_GE_PROPERTY;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mysql.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mysql.drop.common.sql
index 46790073ab1..6aafcdcd5cc 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mysql.drop.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.mysql.drop.common.sql
@@ -1,2 +1,95 @@
+drop index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART;
+
+drop table if exists FLW_RU_BATCH_PART;
+drop table if exists FLW_RU_BATCH;
+
+drop index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK;
+drop index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK;
+
+drop table if exists ACT_RU_ENTITYLINK;
+
+drop index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR;
+drop index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR;
+
+drop table if exists ACT_RU_EVENT_SUBSCR;
+
+drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK;
+drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK;
+drop index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK;
+drop index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK;
+drop index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK;
+
+drop table if exists ACT_RU_IDENTITYLINK;
+
+drop index ACT_IDX_JOB_SCOPE on ACT_RU_JOB;
+drop index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB;
+drop index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB;
+drop index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB;
+drop index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB;
+drop index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB;
+drop index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB;
+drop index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB;
+drop index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB;
+drop index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB;
+drop index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB;
+drop index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB;
+drop index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB;
+
+alter table ACT_RU_JOB
+    drop foreign key ACT_FK_JOB_EXCEPTION;
+
+alter table ACT_RU_JOB
+    drop foreign key ACT_FK_JOB_CUSTOM_VALUES;
+
+alter table ACT_RU_TIMER_JOB
+    drop foreign key ACT_FK_TIMER_JOB_EXCEPTION;
+
+alter table ACT_RU_TIMER_JOB
+    drop foreign key ACT_FK_TIMER_JOB_CUSTOM_VALUES;
+
+alter table ACT_RU_SUSPENDED_JOB
+    drop foreign key ACT_FK_SUSPENDED_JOB_EXCEPTION;
+
+alter table ACT_RU_SUSPENDED_JOB
+    drop foreign key ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES;
+
+alter table ACT_RU_DEADLETTER_JOB
+    drop foreign key ACT_FK_DEADLETTER_JOB_EXCEPTION;
+
+alter table ACT_RU_DEADLETTER_JOB
+    drop foreign key ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES;
+
+alter table ACT_RU_EXTERNAL_JOB
+    drop foreign key ACT_FK_EXTERNAL_JOB_EXCEPTION;
+
+alter table ACT_RU_EXTERNAL_JOB
+    drop foreign key ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES;
+
+drop table if exists ACT_RU_JOB;
+drop table if exists ACT_RU_TIMER_JOB;
+drop table if exists ACT_RU_SUSPENDED_JOB;
+drop table if exists ACT_RU_DEADLETTER_JOB;
+drop table if exists ACT_RU_HISTORY_JOB;
+drop table if exists ACT_RU_EXTERNAL_JOB;
+
+drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK;
+drop index ACT_IDX_TASK_SCOPE on ACT_RU_TASK;
+drop index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK;
+drop index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK;
+
+drop table if exists ACT_RU_TASK;
+
+alter table ACT_RU_VARIABLE
+    drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY;
+    
+drop index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE;
+drop index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE;    
+
+drop table if exists ACT_RU_VARIABLE;
+
+
 drop table if exists ACT_GE_BYTEARRAY;
-drop table if exists ACT_GE_PROPERTY;
\ No newline at end of file
+drop table if exists ACT_GE_PROPERTY;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.oracle.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.oracle.drop.common.sql
index 5f8ef049b28..96b446825d9 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.oracle.drop.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.oracle.drop.common.sql
@@ -1,2 +1,119 @@
+drop index FLW_IDX_BATCH_PART;
+
+drop table FLW_RU_BATCH_PART;
+drop table FLW_RU_BATCH;
+
+drop index ACT_IDX_ENT_LNK_SCOPE;
+drop index ACT_IDX_ENT_LNK_SCOPE_DEF;
+
+drop table ACT_RU_ENTITYLINK;
+
+drop index ACT_IDX_EVENT_SUBSCR_CONFIG_;
+drop index ACT_IDX_EVENT_SUBSCR;
+drop index ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
+
+drop table ACT_RU_EVENT_SUBSCR;
+
+drop index ACT_IDX_IDENT_LNK_USER;
+drop index ACT_IDX_IDENT_LNK_GROUP;
+drop index ACT_IDX_IDENT_LNK_SCOPE;
+drop index ACT_IDX_IDENT_LNK_SUB_SCOPE;
+drop index ACT_IDX_IDENT_LNK_SCOPE_DEF;
+
+drop table ACT_RU_IDENTITYLINK;
+
+drop index ACT_IDX_JOB_SCOPE;
+drop index ACT_IDX_JOB_SUB_SCOPE;
+drop index ACT_IDX_JOB_SCOPE_DEF;
+drop index ACT_IDX_TJOB_SCOPE;
+drop index ACT_IDX_TJOB_SUB_SCOPE;
+drop index ACT_IDX_TJOB_SCOPE_DEF;
+drop index ACT_IDX_SJOB_SCOPE;
+drop index ACT_IDX_SJOB_SUB_SCOPE;
+drop index ACT_IDX_SJOB_SCOPE_DEF;
+drop index ACT_IDX_DJOB_SCOPE;
+drop index ACT_IDX_DJOB_SUB_SCOPE;
+drop index ACT_IDX_DJOB_SCOPE_DEF;
+drop index ACT_IDX_EJOB_SCOPE;
+drop index ACT_IDX_EJOB_SUB_SCOPE;
+drop index ACT_IDX_EJOB_SCOPE_DEF;
+
+drop index ACT_IDX_JOB_EXCEPTION;
+drop index ACT_IDX_JOB_CUSTOM_VAL_ID;
+drop index ACT_IDX_JOB_CORRELATION_ID;
+
+drop index ACT_IDX_TJOB_EXCEPTION;
+drop index ACT_IDX_TJOB_CUSTOM_VAL_ID;
+drop index ACT_IDX_TJOB_CORRELATION_ID;
+drop index ACT_IDX_TJOB_DUEDATE; 
+
+drop index ACT_IDX_SJOB_EXCEPTION;
+drop index ACT_IDX_SJOB_CUSTOM_VAL_ID;
+drop index ACT_IDX_SJOB_CORRELATION_ID;
+
+drop index ACT_IDX_DJOB_EXCEPTION;
+drop index ACT_IDX_DJOB_CUSTOM_VAL_ID;
+drop index ACT_IDX_DJOB_CORRELATION_ID;
+
+drop index ACT_IDX_EJOB_EXCEPTION;
+drop index ACT_IDX_EJOB_CUSTOM_VAL_ID;
+drop index ACT_IDX_EJOB_CORRELATION_ID;
+
+alter table ACT_RU_JOB
+    drop CONSTRAINT ACT_FK_JOB_EXCEPTION;
+
+alter table ACT_RU_JOB
+    drop CONSTRAINT ACT_FK_JOB_CUSTOM_VAL;
+
+alter table ACT_RU_TIMER_JOB
+    drop CONSTRAINT ACT_FK_TJOB_EXCEPTION;
+
+alter table ACT_RU_TIMER_JOB
+    drop CONSTRAINT ACT_FK_TJOB_CUSTOM_VAL;
+
+alter table ACT_RU_SUSPENDED_JOB
+    drop CONSTRAINT ACT_FK_SJOB_EXCEPTION;
+
+alter table ACT_RU_SUSPENDED_JOB
+    drop CONSTRAINT ACT_FK_SJOB_CUSTOM_VAL;
+
+alter table ACT_RU_DEADLETTER_JOB
+    drop CONSTRAINT ACT_FK_DJOB_EXCEPTION;
+
+alter table ACT_RU_DEADLETTER_JOB
+    drop CONSTRAINT ACT_FK_DJOB_CUSTOM_VAL;
+
+alter table ACT_RU_EXTERNAL_JOB
+    drop CONSTRAINT ACT_FK_DJOB_EXCEPTION;
+
+alter table ACT_RU_EXTERNAL_JOB
+    drop CONSTRAINT ACT_FK_DJOB_CUSTOM_VAL;
+
+drop table ACT_RU_JOB;
+drop table ACT_RU_TIMER_JOB;
+drop table ACT_RU_SUSPENDED_JOB;
+drop table ACT_RU_DEADLETTER_JOB;
+drop table ACT_RU_HISTORY_JOB;
+drop table ACT_RU_EXTERNAL_JOB;
+
+
+drop index ACT_IDX_TASK_CREATE;
+drop index ACT_IDX_TASK_SCOPE;
+drop index ACT_IDX_TASK_SUB_SCOPE;
+drop index ACT_IDX_TASK_SCOPE_DEF;
+
+drop table ACT_RU_TASK;
+
+drop index ACT_IDX_VAR_BYTEARRAY;
+drop index ACT_IDX_RU_VAR_SCOPE_ID_TYPE;
+drop index ACT_IDX_RU_VAR_SUB_ID_TYPE;
+
+alter table ACT_RU_VARIABLE
+    drop CONSTRAINT ACT_FK_VAR_BYTEARRAY;
+
+drop table ACT_RU_VARIABLE;
+
+
 drop table ACT_GE_BYTEARRAY;
-drop table ACT_GE_PROPERTY;
\ No newline at end of file
+drop table ACT_GE_PROPERTY;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.postgres.drop.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.postgres.drop.common.sql
index 9fd50cba413..743c649600f 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.postgres.drop.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/drop/flowable.postgres.drop.common.sql
@@ -1,2 +1,26 @@
+drop table if exists FLW_RU_BATCH_PART cascade;
+drop table if exists FLW_RU_BATCH cascade;
+
+drop table if exists ACT_RU_ENTITYLINK cascade;
+
+drop table if exists ACT_RU_EVENT_SUBSCR cascade;
+
+drop table if exists ACT_RU_IDENTITYLINK cascade;
+
+drop table if exists ACT_RU_JOB cascade;
+drop table if exists ACT_RU_TIMER_JOB cascade;
+drop table if exists ACT_RU_SUSPENDED_JOB cascade;
+drop table if exists ACT_RU_DEADLETTER_JOB cascade;
+drop table if exists ACT_RU_HISTORY_JOB cascade;
+drop table if exists ACT_RU_EXTERNAL_JOB cascade;
+
+drop table if exists ACT_RU_TASK cascade;
+
+
+drop table if exists ACT_RU_VARIABLE cascade;
+
+
 drop table if exists ACT_GE_BYTEARRAY cascade;
 drop table if exists ACT_GE_PROPERTY cascade;
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml
new file mode 100644
index 00000000000..02c17b226b8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/ChangeLog.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
+  
+<mapper namespace="org.flowable.common.engine.impl.persistence.change.ChangeLog">
+
+  <!-- CHANGELOG SELECT -->
+  
+  <select id="selectFlowableChangeLogVersions" parameterType="string" resultType="string">
+    select ID from ${prefix}${changeLogTablePrefix}_DATABASECHANGELOG order by ORDEREXECUTED
+  </select>
+  
+</mapper>
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/Property.xml b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/Property.xml
index 2c598d5d3c9..b2baff3e0a5 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/Property.xml
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/Property.xml
@@ -77,8 +77,8 @@
     <result property="revision" column="REV_" jdbcType="INTEGER" />
   </resultMap>
   
-  <select id="selectDbSchemaVersion" resultType="string">
-    select VALUE_ from ${prefix}ACT_GE_PROPERTY where NAME_ = 'schema.version'
+  <select id="selectPropertyValue" parameterType="string" resultType="string">
+    select VALUE_ from ${prefix}ACT_GE_PROPERTY where NAME_ = #{name, jdbcType=NVARCHAR}
   </select>
 
   <select id="selectProperty" parameterType="string" resultMap="propertyResultMap">
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6120.to.6200.common.sql
deleted file mode 100644
index 480667b2761..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6120.to.6200.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6200.to.6210.common.sql
deleted file mode 100644
index 529dd508003..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6200.to.6210.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6210.to.6300.common.sql
deleted file mode 100644
index a5974cbe836..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6210.to.6300.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6300.to.6301.common.sql
deleted file mode 100644
index 20e1fa5b627..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6300.to.6301.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6301.to.6310.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6301.to.6310.common.sql
index aef5390d13b..7bea2460f09 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6301.to.6310.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6301.to.6310.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6310.to.6320.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6310.to.6320.common.sql
index c7a104c4538..4d85141866e 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6310.to.6320.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6310.to.6320.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.3.2.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6320.to.6400.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6320.to.6400.common.sql
index 1051f6a9fd9..2d59f5ee80f 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6320.to.6400.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6320.to.6400.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.4.0.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6400.to.6410.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6400.to.6410.common.sql
index a00504936a2..60a56d93da5 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6400.to.6410.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6400.to.6410.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6410.to.6411.common.sql
deleted file mode 100644
index 2bea49788d8..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6410.to.6411.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6411.to.6412.common.sql
deleted file mode 100644
index 475fef77fdf..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6411.to.6412.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6412.to.6413.common.sql
deleted file mode 100644
index a42efae83ba..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6412.to.6413.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6413.to.6500.common.sql
deleted file mode 100644
index bfdb168a942..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6413.to.6500.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6500.to.6501.common.sql
deleted file mode 100644
index e863b2151e4..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6500.to.6501.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6501.to.6502.common.sql
deleted file mode 100644
index 283a4e37b86..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6501.to.6502.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6502.to.6503.common.sql
deleted file mode 100644
index 8ce3e68be20..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6502.to.6503.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6503.to.6504.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6503.to.6504.common.sql
index 2cc11840f16..1bc5c764268 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6503.to.6504.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6503.to.6504.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.5.0.4' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6504.to.6505.common.sql
deleted file mode 100644
index b3cd628bdd3..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6504.to.6505.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6505.to.6506.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6505.to.6506.common.sql
index 86a6f50ebb6..205844f9156 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6505.to.6506.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6505.to.6506.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.5.0.6' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6506.to.6510.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6506.to.6510.common.sql
index 2ea841860e5..e88e8e9e551 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6506.to.6510.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6506.to.6510.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.5.1.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6510.to.6511.common.sql
deleted file mode 100644
index 918a71e2a33..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6510.to.6511.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6511.to.6512.common.sql
deleted file mode 100644
index cab1b944c3a..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6511.to.6512.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6512.to.6513.common.sql
deleted file mode 100644
index 0c24665a61f..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6512.to.6513.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6513.to.6514.common.sql
deleted file mode 100644
index e5f153009e2..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6513.to.6514.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6514.to.6515.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6514.to.6515.common.sql
index f40716b1a70..0e6aeb1a7c5 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6514.to.6515.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6514.to.6515.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.5.1.5' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6515.to.6516.common.sql
deleted file mode 100644
index 88929e2654c..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6515.to.6516.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6516.to.6600.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6516.to.6600.common.sql
index 3b8a9fa2b7d..7fe2659dce9 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6516.to.6600.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6516.to.6600.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.6.0.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6600.to.6601.common.sql
deleted file mode 100644
index 984601e1053..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6600.to.6601.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6601.to.6610.common.sql
deleted file mode 100644
index 0ca6a47bbe0..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6601.to.6610.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6610.to.6620.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6610.to.6620.common.sql
index 895766d5c69..1a35c7a7174 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6610.to.6620.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6610.to.6620.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.6.2.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6620.to.6621.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6620.to.6621.common.sql
index 8426b94b4ba..d889054ec3f 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6620.to.6621.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6620.to.6621.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.6.2.1' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6621.to.6700.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6621.to.6700.common.sql
index de2326d872d..92933a5339a 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6621.to.6700.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6621.to.6700.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.7.0.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6700.to.6701.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6700.to.6701.common.sql
index 977407eae9d..c8f9eebd50a 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6700.to.6701.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6700.to.6701.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.7.0.1' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6701.to.6710.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6701.to.6710.common.sql
index cfa43c04a59..1061576de87 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6701.to.6710.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6701.to.6710.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.7.1.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6710.to.6720.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6710.to.6720.common.sql
index 0faf82e1d50..bea0b7e7f09 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6710.to.6720.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6710.to.6720.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.7.2.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6720.to.6721.common.sql
deleted file mode 100644
index 2298746256c..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6720.to.6721.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6721.to.6722.common.sql
deleted file mode 100644
index e819089da65..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6721.to.6722.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6722.to.6723.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6722.to.6723.common.sql
index ffee74d6bf2..4210c0001c1 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6722.to.6723.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6722.to.6723.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.7.2.3' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6723.to.6800.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6723.to.6800.common.sql
index 0b1acf0c9cb..132a7ef943e 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6723.to.6800.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6723.to.6800.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '6.8.0.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6800.to.6810.common.sql
deleted file mode 100644
index 0ceefbd44a4..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6800.to.6810.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6810.to.7000.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6810.to.7000.common.sql
index 07fa250980b..4f8144f1924 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6810.to.7000.common.sql
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.6810.to.7000.common.sql
@@ -1 +1,3 @@
 update ACT_GE_PROPERTY set VALUE_ = '7.0.0.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7000.to.7010.common.sql
deleted file mode 100644
index 75fa3d33a65..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7000.to.7010.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7010.to.7011.common.sql
deleted file mode 100644
index ebd17fd7af7..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7010.to.7011.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7011.to.7100.common.sql
deleted file mode 100644
index 72f81864bed..00000000000
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7011.to.7100.common.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7100.to.7101.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7100.to.7101.common.sql
new file mode 100644
index 00000000000..c44f7321749
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.all.upgradestep.7100.to.7101.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.1' where NAME_ = 'common.schema.version';
+
+delete from ACT_GE_PROPERTY where NAME_ = 'batch.schema.version';
+delete from ACT_GE_PROPERTY where NAME_ = 'entitylink.schema.version';
+delete from ACT_GE_PROPERTY where NAME_ = 'eventsubscription.schema.version';
+delete from ACT_GE_PROPERTY where NAME_ = 'identitylink.schema.version';
+delete from ACT_GE_PROPERTY where NAME_ = 'job.schema.version';
+delete from ACT_GE_PROPERTY where NAME_ = 'task.schema.version';
+delete from ACT_GE_PROPERTY where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6120.to.6200.common.sql
new file mode 100644
index 00000000000..c9608c16e8f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6120.to.6200.common.sql
@@ -0,0 +1,2 @@
+insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6200.to.6210.common.sql
new file mode 100644
index 00000000000..cb0121845e7
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6200.to.6210.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6210.to.6300.common.sql
new file mode 100644
index 00000000000..e2d64b0949e
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6210.to.6300.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6300.to.6301.common.sql
new file mode 100644
index 00000000000..8deb3f3d13d
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6300.to.6301.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6410.to.6411.common.sql
new file mode 100644
index 00000000000..fe29c22fff0
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6410.to.6411.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6411.to.6412.common.sql
new file mode 100644
index 00000000000..5dc6aeafe90
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6411.to.6412.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6412.to.6413.common.sql
new file mode 100644
index 00000000000..0bbb3d81d17
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6412.to.6413.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6413.to.6500.common.sql
new file mode 100644
index 00000000000..395d5ab60e9
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6413.to.6500.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6500.to.6501.common.sql
new file mode 100644
index 00000000000..237ad3f4715
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6500.to.6501.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6501.to.6502.common.sql
new file mode 100644
index 00000000000..bb02cdfdc1d
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6501.to.6502.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6502.to.6503.common.sql
new file mode 100644
index 00000000000..820b498e0bd
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6502.to.6503.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6504.to.6505.common.sql
new file mode 100644
index 00000000000..ce09a3faf02
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6504.to.6505.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.common.sql
new file mode 100644
index 00000000000..24085ada032
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.common.sql
@@ -0,0 +1,11 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6511.to.6512.common.sql
new file mode 100644
index 00000000000..e112b6613d4
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6511.to.6512.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6512.to.6513.common.sql
new file mode 100644
index 00000000000..b215bf27fa8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6512.to.6513.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6513.to.6514.common.sql
new file mode 100644
index 00000000000..45d5262c8ec
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6513.to.6514.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.common.sql
new file mode 100644
index 00000000000..6f8a541d352
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.common.sql
new file mode 100644
index 00000000000..394c8f2a803
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6601.to.6610.common.sql
new file mode 100644
index 00000000000..3c2b6a9e32b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6601.to.6610.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6720.to.6721.common.sql
new file mode 100644
index 00000000000..6aa575e607b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6720.to.6721.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6721.to.6722.common.sql
new file mode 100644
index 00000000000..5bde57f5f97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6721.to.6722.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.common.sql
new file mode 100644
index 00000000000..a291197e532
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
+
+alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7000.to.7010.common.sql
new file mode 100644
index 00000000000..5833ab7ffbe
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7000.to.7010.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7010.to.7011.common.sql
new file mode 100644
index 00000000000..c2ea2b48419
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7010.to.7011.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7011.to.7100.common.sql
new file mode 100644
index 00000000000..a3351768b28
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.cockroachdb.upgradestep.7011.to.7100.common.sql
@@ -0,0 +1,3 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
+
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6120.to.6200.common.sql
new file mode 100644
index 00000000000..5f800380548
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6120.to.6200.common.sql
@@ -0,0 +1,31 @@
+insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
+
+alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+ alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
+ alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
+ alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
+ alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
+
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6200.to.6210.common.sql
new file mode 100644
index 00000000000..7944dc2dc2e
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6200.to.6210.common.sql
@@ -0,0 +1,61 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_JOB');
+alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_TIMER_JOB');
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_SUSPENDED_JOB');
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_DEADLETTER_JOB');
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+create index ACT_IDX_JOB_CUSTOM_VAL_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TJOB_CUSTOM_VAL_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SJOB_CUSTOM_VAL_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DJOB_CUSTOM_VAL_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6210.to.6300.common.sql
new file mode 100644
index 00000000000..302829393ab
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6210.to.6300.common.sql
@@ -0,0 +1,18 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6300.to.6301.common.sql
new file mode 100644
index 00000000000..c2287f32c76
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6300.to.6301.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
+
+alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6400.to.6410.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6400.to.6410.common.sql
new file mode 100644
index 00000000000..3bce7a61f56
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6400.to.6410.common.sql
@@ -0,0 +1,34 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'common.schema.version';
+
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CREATE_TIME_ timestamp,
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64) not null,
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ timestamp,
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6410.to.6411.common.sql
new file mode 100644
index 00000000000..29ca76e521f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6410.to.6411.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6411.to.6412.common.sql
new file mode 100644
index 00000000000..5dc6aeafe90
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6411.to.6412.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6412.to.6413.common.sql
new file mode 100644
index 00000000000..ece1d02509e
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6412.to.6413.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
+
+
+
+create table ACT_HI_TSK_LOG (
+  ID_ bigint not null GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
+  TYPE_ varchar(64),
+  TASK_ID_ varchar(64) not null,
+  TIME_STAMP_ timestamp not null,
+  USER_ID_ varchar(255),
+  DATA_ varchar(4000),
+  EXECUTION_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  SCOPE_ID_ varchar(255),
+  SCOPE_DEFINITION_ID_ varchar(255),
+  SUB_SCOPE_ID_ varchar(255),
+  SCOPE_TYPE_ varchar(255),
+  TENANT_ID_ varchar(255) default '',
+  primary key (ID_)
+);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6413.to.6500.common.sql
new file mode 100644
index 00000000000..9b63e337f26
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6413.to.6500.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6500.to.6501.common.sql
new file mode 100644
index 00000000000..31c0783a3f5
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6500.to.6501.common.sql
@@ -0,0 +1,12 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6501.to.6502.common.sql
new file mode 100644
index 00000000000..63a0a5dd168
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6501.to.6502.common.sql
@@ -0,0 +1,39 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
+
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6502.to.6503.common.sql
new file mode 100644
index 00000000000..bfd185c6795
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6502.to.6503.common.sql
@@ -0,0 +1,10 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6504.to.6505.common.sql
new file mode 100644
index 00000000000..ad6732faab7
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6504.to.6505.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
+
+alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6510.to.6511.common.sql
new file mode 100644
index 00000000000..24085ada032
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6510.to.6511.common.sql
@@ -0,0 +1,11 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6511.to.6512.common.sql
new file mode 100644
index 00000000000..a2bd469cc38
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6511.to.6512.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6512.to.6513.common.sql
new file mode 100644
index 00000000000..5292d46c51f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6512.to.6513.common.sql
@@ -0,0 +1,46 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
+
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) not null,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create index ACT_IDX_EJOB_EXCEPTION_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EJOB_CUSTOM_VAL_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6513.to.6514.common.sql
new file mode 100644
index 00000000000..2d519c2c89d
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6513.to.6514.common.sql
@@ -0,0 +1,14 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+create index ACT_IDX_TJOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_SJOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+create index ACT_IDX_DJOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+create index ACT_IDX_EJOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6515.to.6516.common.sql
new file mode 100644
index 00000000000..6f8a541d352
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6515.to.6516.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6600.to.6601.common.sql
new file mode 100644
index 00000000000..394c8f2a803
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6600.to.6601.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6601.to.6610.common.sql
new file mode 100644
index 00000000000..e343a9ec61a
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6601.to.6610.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_TJOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6720.to.6721.common.sql
new file mode 100644
index 00000000000..6aa575e607b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6720.to.6721.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6721.to.6722.common.sql
new file mode 100644
index 00000000000..5bde57f5f97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6721.to.6722.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6800.to.6810.common.sql
new file mode 100644
index 00000000000..a291197e532
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.6800.to.6810.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
+
+alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7000.to.7010.common.sql
new file mode 100644
index 00000000000..f305c0f5c98
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7000.to.7010.common.sql
@@ -0,0 +1,22 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK 
+  add column STATE_ varchar(255)
+  add column IN_PROGRESS_TIME_ timestamp
+  add column IN_PROGRESS_STARTED_BY_ varchar(255)
+  add column CLAIMED_BY_ varchar(255)
+  add column SUSPENDED_TIME_ timestamp
+  add column SUSPENDED_BY_ varchar(255)
+  add column IN_PROGRESS_DUE_DATE_ timestamp;
+
+alter table ACT_HI_TASKINST 
+  add column STATE_ varchar(255)
+  add column IN_PROGRESS_TIME_ timestamp
+  add column IN_PROGRESS_STARTED_BY_ varchar(255)
+  add column CLAIMED_BY_ varchar(255)
+  add column SUSPENDED_TIME_ timestamp
+  add column SUSPENDED_BY_ varchar(255)
+  add column COMPLETED_BY_ varchar(255)
+  add column IN_PROGRESS_DUE_DATE_ timestamp;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7010.to.7011.common.sql
new file mode 100644
index 00000000000..cbf2db13d97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7010.to.7011.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7011.to.7100.common.sql
new file mode 100644
index 00000000000..eebd15bbef8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.db2.upgradestep.7011.to.7100.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
+
+
+
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6120.to.6200.common.sql
new file mode 100644
index 00000000000..22c8febe9c9
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6120.to.6200.common.sql
@@ -0,0 +1,30 @@
+insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
+
+alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
+
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6200.to.6210.common.sql
new file mode 100644
index 00000000000..1277daaa5e5
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6200.to.6210.common.sql
@@ -0,0 +1,57 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);  
+alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6210.to.6300.common.sql
new file mode 100644
index 00000000000..302829393ab
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6210.to.6300.common.sql
@@ -0,0 +1,18 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6300.to.6301.common.sql
new file mode 100644
index 00000000000..c2287f32c76
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6300.to.6301.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
+
+alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6400.to.6410.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6400.to.6410.common.sql
new file mode 100644
index 00000000000..edc3bb187b0
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6400.to.6410.common.sql
@@ -0,0 +1,34 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'common.schema.version';
+
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    CREATE_TIME_ timestamp,
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64),
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ timestamp,
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6410.to.6411.common.sql
new file mode 100644
index 00000000000..29ca76e521f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6410.to.6411.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6411.to.6412.common.sql
new file mode 100644
index 00000000000..5dc6aeafe90
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6411.to.6412.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6412.to.6413.common.sql
new file mode 100644
index 00000000000..f1ccbd001e7
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6412.to.6413.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
+
+
+
+create table ACT_HI_TSK_LOG (
+  ID_ identity,
+  TYPE_ varchar(64),
+  TASK_ID_ varchar(64) not null,
+  TIME_STAMP_ timestamp not null,
+  USER_ID_ varchar(255),
+  DATA_ varchar(4000),
+  EXECUTION_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  SCOPE_ID_ varchar(255),
+  SCOPE_DEFINITION_ID_ varchar(255),
+  SUB_SCOPE_ID_ varchar(255),
+  SCOPE_TYPE_ varchar(255),
+  TENANT_ID_ varchar(255) default '',
+  primary key (ID_)
+);
\ No newline at end of file
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6413.to.6500.common.sql
new file mode 100644
index 00000000000..9b63e337f26
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6413.to.6500.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6500.to.6501.common.sql
new file mode 100644
index 00000000000..31c0783a3f5
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6500.to.6501.common.sql
@@ -0,0 +1,12 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6501.to.6502.common.sql
new file mode 100644
index 00000000000..63a0a5dd168
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6501.to.6502.common.sql
@@ -0,0 +1,39 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
+
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6502.to.6503.common.sql
new file mode 100644
index 00000000000..bfd185c6795
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6502.to.6503.common.sql
@@ -0,0 +1,10 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6504.to.6505.common.sql
new file mode 100644
index 00000000000..ad6732faab7
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6504.to.6505.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
+
+alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6510.to.6511.common.sql
new file mode 100644
index 00000000000..24085ada032
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6510.to.6511.common.sql
@@ -0,0 +1,11 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6511.to.6512.common.sql
new file mode 100644
index 00000000000..a2bd469cc38
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6511.to.6512.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6512.to.6513.common.sql
new file mode 100644
index 00000000000..7ca6b156fda
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6512.to.6513.common.sql
@@ -0,0 +1,46 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
+
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6513.to.6514.common.sql
new file mode 100644
index 00000000000..440218cf602
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6513.to.6514.common.sql
@@ -0,0 +1,14 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6515.to.6516.common.sql
new file mode 100644
index 00000000000..6f8a541d352
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6515.to.6516.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6600.to.6601.common.sql
new file mode 100644
index 00000000000..394c8f2a803
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6600.to.6601.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6601.to.6610.common.sql
new file mode 100644
index 00000000000..e64fb924c98
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6601.to.6610.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6720.to.6721.common.sql
new file mode 100644
index 00000000000..6aa575e607b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6720.to.6721.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6721.to.6722.common.sql
new file mode 100644
index 00000000000..5bde57f5f97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6721.to.6722.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6800.to.6810.common.sql
new file mode 100644
index 00000000000..a291197e532
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.6800.to.6810.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
+
+alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7000.to.7010.common.sql
new file mode 100644
index 00000000000..9acefeafad3
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7000.to.7010.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add (
+    STATE_ varchar(255), 
+    IN_PROGRESS_TIME_ timestamp, 
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIMED_BY_ varchar(255), 
+    SUSPENDED_TIME_ timestamp, 
+    SUSPENDED_BY_ varchar(255), 
+    IN_PROGRESS_DUE_DATE_ timestamp);
+
+alter table ACT_HI_TASKINST add (
+    STATE_ varchar(255), 
+    IN_PROGRESS_TIME_ timestamp, 
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIMED_BY_ varchar(255), 
+    SUSPENDED_TIME_ timestamp, 
+    SUSPENDED_BY_ varchar(255), 
+    COMPLETED_BY_ varchar(255), 
+    IN_PROGRESS_DUE_DATE_ timestamp);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7010.to.7011.common.sql
new file mode 100644
index 00000000000..cbf2db13d97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7010.to.7011.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7011.to.7100.common.sql
new file mode 100644
index 00000000000..eebd15bbef8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.h2.upgradestep.7011.to.7100.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
+
+
+
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.common.sql
new file mode 100644
index 00000000000..bfd5b9d8c77
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.common.sql
@@ -0,0 +1,31 @@
+insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
+
+alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+ alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
+
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6200.to.6210.common.sql
new file mode 100644
index 00000000000..b2714006706
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6200.to.6210.common.sql
@@ -0,0 +1,57 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.common.sql
new file mode 100644
index 00000000000..302829393ab
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.common.sql
@@ -0,0 +1,18 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.common.sql
new file mode 100644
index 00000000000..af26a1e6100
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
+
+alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6400.to.6410.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6400.to.6410.common.sql
new file mode 100644
index 00000000000..edc3bb187b0
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6400.to.6410.common.sql
@@ -0,0 +1,34 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'common.schema.version';
+
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    CREATE_TIME_ timestamp,
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64),
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ timestamp,
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.common.sql
new file mode 100644
index 00000000000..29ca76e521f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6411.to.6412.common.sql
new file mode 100644
index 00000000000..5dc6aeafe90
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6411.to.6412.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6412.to.6413.common.sql
new file mode 100644
index 00000000000..2393533e3c5
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6412.to.6413.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
+
+
+
+create table ACT_HI_TSK_LOG (
+  ID_ identity,
+  TYPE_ varchar(64),
+  TASK_ID_ varchar(64) not null,
+  TIME_STAMP_ timestamp not null,
+  USER_ID_ varchar(255),
+  DATA_ varchar(4000),
+  EXECUTION_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  SCOPE_ID_ varchar(255),
+  SCOPE_DEFINITION_ID_ varchar(255),
+  SUB_SCOPE_ID_ varchar(255),
+  SCOPE_TYPE_ varchar(255),
+  TENANT_ID_ varchar(255) default '',
+  primary key (ID_)
+);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6413.to.6500.common.sql
new file mode 100644
index 00000000000..9b63e337f26
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6413.to.6500.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6500.to.6501.common.sql
new file mode 100644
index 00000000000..31c0783a3f5
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6500.to.6501.common.sql
@@ -0,0 +1,12 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6501.to.6502.common.sql
new file mode 100644
index 00000000000..63a0a5dd168
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6501.to.6502.common.sql
@@ -0,0 +1,39 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
+
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.common.sql
new file mode 100644
index 00000000000..bfd185c6795
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.common.sql
@@ -0,0 +1,10 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.common.sql
new file mode 100644
index 00000000000..ad6732faab7
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
+
+alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.common.sql
new file mode 100644
index 00000000000..24085ada032
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.common.sql
@@ -0,0 +1,11 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6511.to.6512.common.sql
new file mode 100644
index 00000000000..a2bd469cc38
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6511.to.6512.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6512.to.6513.common.sql
new file mode 100644
index 00000000000..7ca6b156fda
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6512.to.6513.common.sql
@@ -0,0 +1,46 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
+
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6513.to.6514.common.sql
new file mode 100644
index 00000000000..440218cf602
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6513.to.6514.common.sql
@@ -0,0 +1,14 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.common.sql
new file mode 100644
index 00000000000..6f8a541d352
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.common.sql
new file mode 100644
index 00000000000..394c8f2a803
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6601.to.6610.common.sql
new file mode 100644
index 00000000000..e64fb924c98
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6601.to.6610.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6720.to.6721.common.sql
new file mode 100644
index 00000000000..6aa575e607b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6720.to.6721.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6721.to.6722.common.sql
new file mode 100644
index 00000000000..5bde57f5f97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6721.to.6722.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.common.sql
new file mode 100644
index 00000000000..a291197e532
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
+
+alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.common.sql
new file mode 100644
index 00000000000..9acefeafad3
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add (
+    STATE_ varchar(255), 
+    IN_PROGRESS_TIME_ timestamp, 
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIMED_BY_ varchar(255), 
+    SUSPENDED_TIME_ timestamp, 
+    SUSPENDED_BY_ varchar(255), 
+    IN_PROGRESS_DUE_DATE_ timestamp);
+
+alter table ACT_HI_TASKINST add (
+    STATE_ varchar(255), 
+    IN_PROGRESS_TIME_ timestamp, 
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIMED_BY_ varchar(255), 
+    SUSPENDED_TIME_ timestamp, 
+    SUSPENDED_BY_ varchar(255), 
+    COMPLETED_BY_ varchar(255), 
+    IN_PROGRESS_DUE_DATE_ timestamp);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7010.to.7011.common.sql
new file mode 100644
index 00000000000..cbf2db13d97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7010.to.7011.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7011.to.7100.common.sql
new file mode 100644
index 00000000000..eebd15bbef8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.hsql.upgradestep.7011.to.7100.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
+
+
+
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.common.sql
new file mode 100644
index 00000000000..e2069181cbf
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.common.sql
@@ -0,0 +1,30 @@
+insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
+
+alter table ACT_RU_TASK add SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_TASK add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_TASK add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_RU_TASK add SCOPE_DEFINITION_ID_ nvarchar(255);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_TASKINST add SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_TASKINST add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_TASKINST add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_HI_TASKINST add SCOPE_DEFINITION_ID_ nvarchar(255);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+alter table ACT_RU_VARIABLE add SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_VARIABLE add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_VARIABLE add SCOPE_TYPE_ nvarchar(255);
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_VARINST add SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_VARINST add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_VARINST add SCOPE_TYPE_ nvarchar(255);
+
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.common.sql
new file mode 100644
index 00000000000..a52c8d37ff8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.common.sql
@@ -0,0 +1,57 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_JOB add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_JOB add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_RU_JOB add SCOPE_DEFINITION_ID_ nvarchar(255);
+alter table ACT_RU_TIMER_JOB add SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_TIMER_JOB add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_TIMER_JOB add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_RU_TIMER_JOB add SCOPE_DEFINITION_ID_ nvarchar(255);
+alter table ACT_RU_SUSPENDED_JOB add SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_SUSPENDED_JOB add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_SUSPENDED_JOB add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_RU_SUSPENDED_JOB add SCOPE_DEFINITION_ID_ nvarchar(255);
+alter table ACT_RU_DEADLETTER_JOB add SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_DEADLETTER_JOB add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_DEADLETTER_JOB add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_RU_DEADLETTER_JOB add SCOPE_DEFINITION_ID_ nvarchar(255);
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+alter table ACT_RU_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
+alter table ACT_RU_TIMER_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
+alter table ACT_RU_SUSPENDED_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
+alter table ACT_RU_DEADLETTER_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
+alter table ACT_RU_HISTORY_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.common.sql
new file mode 100644
index 00000000000..008b95889b9
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.common.sql
@@ -0,0 +1,18 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_IDENTITYLINK add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_RU_IDENTITYLINK add SCOPE_DEFINITION_ID_ nvarchar(255);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_IDENTITYLINK add SCOPE_TYPE_ nvarchar(255);
+alter table ACT_HI_IDENTITYLINK add SCOPE_DEFINITION_ID_ nvarchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.common.sql
new file mode 100644
index 00000000000..3a8621104e2
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add TASK_DEF_ID_ nvarchar(64);
+
+alter table ACT_HI_TASKINST add TASK_DEF_ID_ nvarchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.common.sql
new file mode 100644
index 00000000000..c991a9e3a08
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6400.to.6410.common.sql
@@ -0,0 +1,34 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'common.schema.version';
+
+create table ACT_RU_ENTITYLINK (
+    ID_ nvarchar(64),
+    REV_ int,
+    CREATE_TIME_ datetime,
+    LINK_TYPE_ nvarchar(255),
+    SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    REF_SCOPE_ID_ nvarchar(255),
+    REF_SCOPE_TYPE_ nvarchar(255),
+    REF_SCOPE_DEFINITION_ID_ nvarchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ nvarchar(64),
+    LINK_TYPE_ nvarchar(255),
+    CREATE_TIME_ datetime,
+    SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    REF_SCOPE_ID_ nvarchar(255),
+    REF_SCOPE_TYPE_ nvarchar(255),
+    REF_SCOPE_DEFINITION_ID_ nvarchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.common.sql
new file mode 100644
index 00000000000..24588b68510
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add HIERARCHY_TYPE_ nvarchar(255);
+
+alter table ACT_HI_ENTITYLINK add HIERARCHY_TYPE_ nvarchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6411.to.6412.common.sql
new file mode 100644
index 00000000000..5dc6aeafe90
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6411.to.6412.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.common.sql
new file mode 100644
index 00000000000..0b8a77dde89
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
+
+
+
+create table ACT_HI_TSK_LOG (
+  ID_ numeric(19,0) IDENTITY (1,1),
+  TYPE_ nvarchar(64),
+  TASK_ID_ nvarchar(64) not null,
+  TIME_STAMP_ datetime not null,
+  USER_ID_ nvarchar(255),
+  DATA_ nvarchar(4000),
+  EXECUTION_ID_ nvarchar(64),
+  PROC_INST_ID_ nvarchar(64),
+  PROC_DEF_ID_ nvarchar(64),
+  SCOPE_ID_ nvarchar(255),
+  SCOPE_DEFINITION_ID_ nvarchar(255),
+  SUB_SCOPE_ID_ nvarchar(255),
+  SCOPE_TYPE_ nvarchar(255),
+  TENANT_ID_ nvarchar(255) default '',
+  primary key (ID_)
+);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6413.to.6500.common.sql
new file mode 100644
index 00000000000..cde94d858ac
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6413.to.6500.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add SUB_SCOPE_ID_ nvarchar(64);
+alter table ACT_RU_EVENT_SUBSCR add SCOPE_ID_ nvarchar(64);
+alter table ACT_RU_EVENT_SUBSCR add SCOPE_DEFINITION_ID_ nvarchar(64);
+alter table ACT_RU_EVENT_SUBSCR add SCOPE_TYPE_ nvarchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6500.to.6501.common.sql
new file mode 100644
index 00000000000..a9c615b9172
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6500.to.6501.common.sql
@@ -0,0 +1,12 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add ELEMENT_ID_ nvarchar(255);
+alter table ACT_RU_JOB add ELEMENT_NAME_ nvarchar(255);
+alter table ACT_RU_TIMER_JOB add ELEMENT_ID_ nvarchar(255);
+alter table ACT_RU_TIMER_JOB add ELEMENT_NAME_ nvarchar(255);
+alter table ACT_RU_SUSPENDED_JOB add ELEMENT_ID_ nvarchar(255);
+alter table ACT_RU_SUSPENDED_JOB add ELEMENT_NAME_ nvarchar(255);
+alter table ACT_RU_DEADLETTER_JOB add ELEMENT_ID_ nvarchar(255);
+alter table ACT_RU_DEADLETTER_JOB add ELEMENT_NAME_ nvarchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.common.sql
new file mode 100644
index 00000000000..9f4fc112407
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.common.sql
@@ -0,0 +1,39 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
+
+
+create table FLW_RU_BATCH (
+    ID_ nvarchar(64) not null,
+    REV_ int,
+    TYPE_ nvarchar(64) not null,
+    SEARCH_KEY_ nvarchar(255),
+    SEARCH_KEY2_ nvarchar(255),
+    CREATE_TIME_ datetime not null,
+    COMPLETE_TIME_ datetime,
+    STATUS_ nvarchar(255),
+    BATCH_DOC_ID_ nvarchar(64),
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+create table FLW_RU_BATCH_PART (
+    ID_ nvarchar(64) not null,
+    REV_ int,
+    BATCH_ID_ nvarchar(64),
+    TYPE_ nvarchar(64) not null,
+    SCOPE_ID_ nvarchar(64),
+    SUB_SCOPE_ID_ nvarchar(64),
+    SCOPE_TYPE_ nvarchar(64),
+    SEARCH_KEY_ nvarchar(255),
+    SEARCH_KEY2_ nvarchar(255),
+    CREATE_TIME_ datetime not null,
+    COMPLETE_TIME_ datetime,
+    STATUS_ nvarchar(255),
+    RESULT_DOC_ID_ nvarchar(64),
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.common.sql
new file mode 100644
index 00000000000..a50e881cb56
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.common.sql
@@ -0,0 +1,10 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add SUB_SCOPE_ID_ nvarchar(255);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add SUB_SCOPE_ID_ nvarchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.common.sql
new file mode 100644
index 00000000000..b53d04088ed
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add PROPAGATED_STAGE_INST_ID_ nvarchar(255);
+
+alter table ACT_HI_TASKINST add PROPAGATED_STAGE_INST_ID_ nvarchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.common.sql
new file mode 100644
index 00000000000..ce054f14977
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.common.sql
@@ -0,0 +1,11 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add ROOT_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_ENTITYLINK add ROOT_SCOPE_TYPE_ nvarchar(255);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
+alter table ACT_HI_ENTITYLINK add ROOT_SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_ENTITYLINK add ROOT_SCOPE_TYPE_ nvarchar(255);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.common.sql
new file mode 100644
index 00000000000..a184bb1d3f3
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add CATEGORY_ nvarchar(255);
+alter table ACT_RU_TIMER_JOB add CATEGORY_ nvarchar(255);
+alter table ACT_RU_SUSPENDED_JOB add CATEGORY_ nvarchar(255);
+alter table ACT_RU_DEADLETTER_JOB add CATEGORY_ nvarchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6512.to.6513.common.sql
new file mode 100644
index 00000000000..d7b1903314f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6512.to.6513.common.sql
@@ -0,0 +1,46 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
+
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ nvarchar(64) NOT NULL,
+    REV_ int,
+    CATEGORY_ varchar(255),
+    TYPE_ nvarchar(255) NOT NULL,
+    LOCK_EXP_TIME_ datetime,
+    LOCK_OWNER_ nvarchar(255),
+    EXCLUSIVE_ bit,
+    EXECUTION_ID_ nvarchar(64),
+    PROCESS_INSTANCE_ID_ nvarchar(64),
+    PROC_DEF_ID_ nvarchar(64),
+    ELEMENT_ID_ nvarchar(255),
+    ELEMENT_NAME_ nvarchar(255),
+    SCOPE_ID_ nvarchar(255),
+    SUB_SCOPE_ID_ nvarchar(255),
+    SCOPE_TYPE_ nvarchar(255),
+    SCOPE_DEFINITION_ID_ nvarchar(255),
+    RETRIES_ int,
+    EXCEPTION_STACK_ID_ nvarchar(64),
+    EXCEPTION_MSG_ nvarchar(4000),
+    DUEDATE_ datetime NULL,
+    REPEAT_ nvarchar(255),
+    HANDLER_TYPE_ nvarchar(255),
+    HANDLER_CFG_ nvarchar(4000),
+    CUSTOM_VALUES_ID_ nvarchar(64),
+    CREATE_TIME_ datetime2 NULL,
+    TENANT_ID_ nvarchar(255) default '',
+    primary key (ID_)
+);
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6513.to.6514.common.sql
new file mode 100644
index 00000000000..1e352c45c75
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6513.to.6514.common.sql
@@ -0,0 +1,14 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add CORRELATION_ID_ nvarchar(255);
+alter table ACT_RU_TIMER_JOB add CORRELATION_ID_ nvarchar(255);
+alter table ACT_RU_SUSPENDED_JOB add CORRELATION_ID_ nvarchar(255);
+alter table ACT_RU_DEADLETTER_JOB add CORRELATION_ID_ nvarchar(255);
+alter table ACT_RU_EXTERNAL_JOB add CORRELATION_ID_ nvarchar(255);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.common.sql
new file mode 100644
index 00000000000..e9422919f96
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_RU_ENTITYLINK add PARENT_ELEMENT_ID_ nvarchar(255);
+
+alter table ACT_HI_ENTITYLINK add SUB_SCOPE_ID_ nvarchar(255);
+alter table ACT_HI_ENTITYLINK add PARENT_ELEMENT_ID_ nvarchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.common.sql
new file mode 100644
index 00000000000..394c8f2a803
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.common.sql
new file mode 100644
index 00000000000..e64fb924c98
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6720.to.6721.common.sql
new file mode 100644
index 00000000000..6aa575e607b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6720.to.6721.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6721.to.6722.common.sql
new file mode 100644
index 00000000000..416d1ca0ce3
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6721.to.6722.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add LOCK_TIME_ datetime;
+alter table ACT_RU_EVENT_SUBSCR add LOCK_OWNER_ nvarchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.common.sql
new file mode 100644
index 00000000000..3b2a57bbf4a
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_VARIABLE add META_INFO_ nvarchar(4000);
+
+alter table ACT_HI_VARINST add META_INFO_ nvarchar(4000);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.common.sql
new file mode 100644
index 00000000000..795180ac9d0
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.common.sql
@@ -0,0 +1,19 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add STATE_ nvarchar(255);
+alter table ACT_RU_TASK add IN_PROGRESS_TIME_ datetime;
+alter table ACT_RU_TASK add IN_PROGRESS_STARTED_BY_ nvarchar(255);
+alter table ACT_RU_TASK add CLAIMED_BY_ nvarchar(255);
+alter table ACT_RU_TASK add SUSPENDED_TIME_ datetime;
+alter table ACT_RU_TASK add SUSPENDED_BY_ nvarchar(255);
+alter table ACT_RU_TASK add IN_PROGRESS_DUE_DATE_ datetime;
+
+alter table ACT_HI_TASKINST add STATE_ nvarchar(255);
+alter table ACT_HI_TASKINST add IN_PROGRESS_TIME_ datetime;
+alter table ACT_HI_TASKINST add IN_PROGRESS_STARTED_BY_ nvarchar(255);
+alter table ACT_HI_TASKINST add CLAIMED_BY_ nvarchar(255);
+alter table ACT_HI_TASKINST add SUSPENDED_TIME_ datetime;
+alter table ACT_HI_TASKINST add SUSPENDED_BY_ nvarchar(255);
+alter table ACT_HI_TASKINST add COMPLETED_BY_ nvarchar(255);
+alter table ACT_HI_TASKINST add IN_PROGRESS_DUE_DATE_ datetime;
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7010.to.7011.common.sql
new file mode 100644
index 00000000000..de4dc4fc6ed
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7010.to.7011.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add SCOPE_DEFINITION_KEY_ nvarchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.common.sql
new file mode 100644
index 00000000000..eebd15bbef8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
+
+
+
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.common.sql
new file mode 100644
index 00000000000..bfd5b9d8c77
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.common.sql
@@ -0,0 +1,31 @@
+insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
+
+alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+ alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
+
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.common.sql
new file mode 100644
index 00000000000..b2714006706
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.common.sql
@@ -0,0 +1,57 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.common.sql
new file mode 100644
index 00000000000..302829393ab
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.common.sql
@@ -0,0 +1,18 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.common.sql
new file mode 100644
index 00000000000..c2287f32c76
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
+
+alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.common.sql
new file mode 100644
index 00000000000..f38331a1181
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6400.to.6410.common.sql
@@ -0,0 +1,34 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'common.schema.version';
+
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    CREATE_TIME_ datetime(3),
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64),
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ datetime(3),
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.common.sql
new file mode 100644
index 00000000000..29ca76e521f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6411.to.6412.common.sql
new file mode 100644
index 00000000000..5dc6aeafe90
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6411.to.6412.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.common.sql
new file mode 100644
index 00000000000..afdd37cd95d
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
+
+
+
+create table ACT_HI_TSK_LOG (
+  ID_ bigint auto_increment,
+  TYPE_ varchar(64),
+  TASK_ID_ varchar(64) not null,
+  TIME_STAMP_ timestamp(3) not null,
+  USER_ID_ varchar(255),
+  DATA_ varchar(4000),
+  EXECUTION_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  SCOPE_ID_ varchar(255),
+  SCOPE_DEFINITION_ID_ varchar(255),
+  SUB_SCOPE_ID_ varchar(255),
+  SCOPE_TYPE_ varchar(255),
+  TENANT_ID_ varchar(255) default '',
+  primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6413.to.6500.common.sql
new file mode 100644
index 00000000000..9b63e337f26
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6413.to.6500.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6500.to.6501.common.sql
new file mode 100644
index 00000000000..31c0783a3f5
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6500.to.6501.common.sql
@@ -0,0 +1,12 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.common.sql
new file mode 100644
index 00000000000..3366fbdfdb5
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.common.sql
@@ -0,0 +1,39 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
+
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ datetime(3) not null,
+    COMPLETE_TIME_ datetime(3),
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ datetime(3) not null,
+    COMPLETE_TIME_ datetime(3),
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.common.sql
new file mode 100644
index 00000000000..bfd185c6795
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.common.sql
@@ -0,0 +1,10 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.common.sql
new file mode 100644
index 00000000000..8b1b772b64e
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
+
+alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.common.sql
new file mode 100644
index 00000000000..24085ada032
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.common.sql
@@ -0,0 +1,11 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.common.sql
new file mode 100644
index 00000000000..a2bd469cc38
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6512.to.6513.common.sql
new file mode 100644
index 00000000000..749b52be8c4
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6512.to.6513.common.sql
@@ -0,0 +1,46 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
+
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp(3) NULL,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp(3) NULL,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp(3) NULL,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6513.to.6514.common.sql
new file mode 100644
index 00000000000..440218cf602
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6513.to.6514.common.sql
@@ -0,0 +1,14 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.common.sql
new file mode 100644
index 00000000000..6f8a541d352
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.common.sql
new file mode 100644
index 00000000000..394c8f2a803
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.common.sql
new file mode 100644
index 00000000000..e64fb924c98
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6720.to.6721.common.sql
new file mode 100644
index 00000000000..6aa575e607b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6720.to.6721.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6721.to.6722.common.sql
new file mode 100644
index 00000000000..98a120f8018
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6721.to.6722.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp(3) NULL;
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.common.sql
new file mode 100644
index 00000000000..a291197e532
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
+
+alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.common.sql
new file mode 100644
index 00000000000..a7e7990c5c4
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column (
+    STATE_ varchar(255), 
+    IN_PROGRESS_TIME_ datetime(3), 
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIMED_BY_ varchar(255), 
+    SUSPENDED_TIME_ datetime(3), 
+    SUSPENDED_BY_ varchar(255), 
+    IN_PROGRESS_DUE_DATE_ datetime(3));
+
+alter table ACT_HI_TASKINST add column (
+    STATE_ varchar(255), 
+    IN_PROGRESS_TIME_ datetime(3), 
+    IN_PROGRESS_STARTED_BY_ varchar(255),
+    CLAIMED_BY_ varchar(255), 
+    SUSPENDED_TIME_ datetime(3), 
+    SUSPENDED_BY_ varchar(255), 
+    COMPLETED_BY_ varchar(255), 
+    IN_PROGRESS_DUE_DATE_ datetime(3));
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7010.to.7011.common.sql
new file mode 100644
index 00000000000..cbf2db13d97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7010.to.7011.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7011.to.7100.common.sql
new file mode 100644
index 00000000000..eebd15bbef8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.mysql.upgradestep.7011.to.7100.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
+
+
+
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.common.sql
new file mode 100644
index 00000000000..4ad2775613e
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.common.sql
@@ -0,0 +1,31 @@
+insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
+
+alter table ACT_RU_TASK add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_TASK add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_TASK add SCOPE_TYPE_ NVARCHAR2(255);
+alter table ACT_RU_TASK add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+ alter table ACT_HI_TASKINST add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_HI_TASKINST add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_HI_TASKINST add SCOPE_TYPE_ NVARCHAR2(255);
+alter table ACT_HI_TASKINST add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+alter table ACT_RU_VARIABLE add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_VARIABLE add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_VARIABLE add SCOPE_TYPE_ NVARCHAR2(255);
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_VARINST add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_HI_VARINST add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_HI_VARINST add SCOPE_TYPE_ NVARCHAR2(255);
+
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.common.sql
new file mode 100644
index 00000000000..aa8514648bf
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.common.sql
@@ -0,0 +1,57 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_JOB add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_JOB add SCOPE_TYPE_ NVARCHAR2(255);
+alter table ACT_RU_JOB add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
+alter table ACT_RU_TIMER_JOB add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_TIMER_JOB add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_TIMER_JOB add SCOPE_TYPE_ NVARCHAR2(255);
+alter table ACT_RU_TIMER_JOB add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
+alter table ACT_RU_SUSPENDED_JOB add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_SUSPENDED_JOB add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_SUSPENDED_JOB add SCOPE_TYPE_ NVARCHAR2(255);
+alter table ACT_RU_SUSPENDED_JOB add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
+alter table ACT_RU_DEADLETTER_JOB add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_DEADLETTER_JOB add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_DEADLETTER_JOB add SCOPE_TYPE_ NVARCHAR2(255);
+alter table ACT_RU_DEADLETTER_JOB add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+alter table ACT_RU_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
+alter table ACT_RU_TIMER_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
+alter table ACT_RU_SUSPENDED_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
+alter table ACT_RU_DEADLETTER_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
+alter table ACT_RU_HISTORY_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
+create index ACT_IDX_JOB_CUSTOM_VAL_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TJOB_CUSTOM_VAL_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SJOB_CUSTOM_VAL_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DJOB_CUSTOM_VAL_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.common.sql
new file mode 100644
index 00000000000..7983ef58d12
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.common.sql
@@ -0,0 +1,18 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_IDENTITYLINK add SCOPE_TYPE_ NVARCHAR2(255);
+alter table ACT_RU_IDENTITYLINK add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_HI_IDENTITYLINK add SCOPE_TYPE_ NVARCHAR2(255);
+alter table ACT_HI_IDENTITYLINK add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.common.sql
new file mode 100644
index 00000000000..9fd98bd64b3
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add TASK_DEF_ID_ NVARCHAR2(64);
+
+alter table ACT_HI_TASKINST add TASK_DEF_ID_ NVARCHAR2(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.common.sql
new file mode 100644
index 00000000000..29a517cb51a
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6400.to.6410.common.sql
@@ -0,0 +1,35 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'common.schema.version';
+
+create table ACT_RU_ENTITYLINK (
+    ID_ NVARCHAR2(64),
+    REV_ INTEGER,
+    CREATE_TIME_ TIMESTAMP(6),
+    LINK_TYPE_ NVARCHAR2(255),
+    SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    REF_SCOPE_ID_ NVARCHAR2(255),
+    REF_SCOPE_TYPE_ NVARCHAR2(255),
+    REF_SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ NVARCHAR2(64),
+    LINK_TYPE_ NVARCHAR2(255),
+    CREATE_TIME_ TIMESTAMP(6),
+    SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    REF_SCOPE_ID_ NVARCHAR2(255),
+    REF_SCOPE_TYPE_ NVARCHAR2(255),
+    REF_SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    HIERARCHY_TYPE_ NVARCHAR2(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.common.sql
new file mode 100644
index 00000000000..1724d943114
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add HIERARCHY_TYPE_ NVARCHAR2(255);
+
+alter table ACT_HI_ENTITYLINK add HIERARCHY_TYPE_ NVARCHAR2(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6411.to.6412.common.sql
new file mode 100644
index 00000000000..5dc6aeafe90
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6411.to.6412.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.common.sql
new file mode 100644
index 00000000000..615a03483ed
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.common.sql
@@ -0,0 +1,23 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
+
+
+
+create table ACT_HI_TSK_LOG (
+  ID_ NUMBER(19),
+  TYPE_ NVARCHAR2(64),
+  TASK_ID_ NVARCHAR2(64) not null,
+  TIME_STAMP_ TIMESTAMP(6) not null,
+  USER_ID_ NVARCHAR2(255),
+  DATA_ NVARCHAR2(2000),
+  EXECUTION_ID_ NVARCHAR2(64),
+  PROC_INST_ID_ NVARCHAR2(64),
+  PROC_DEF_ID_ NVARCHAR2(64),
+  SCOPE_ID_ NVARCHAR2(255),
+  SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+  SUB_SCOPE_ID_ NVARCHAR2(255),
+  SCOPE_TYPE_ NVARCHAR2(255),
+  TENANT_ID_ NVARCHAR2(255) default '',
+  primary key (ID_)
+);
+
+create sequence act_hi_task_evt_log_seq start with 1 increment by 1;
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6413.to.6500.common.sql
new file mode 100644
index 00000000000..174b82d42c9
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6413.to.6500.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add SUB_SCOPE_ID_ NVARCHAR2(64);
+alter table ACT_RU_EVENT_SUBSCR add SCOPE_ID_ NVARCHAR2(64);
+alter table ACT_RU_EVENT_SUBSCR add SCOPE_DEFINITION_ID_ NVARCHAR2(64);
+alter table ACT_RU_EVENT_SUBSCR add SCOPE_TYPE_ NVARCHAR2(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6500.to.6501.common.sql
new file mode 100644
index 00000000000..a37a184d3b8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6500.to.6501.common.sql
@@ -0,0 +1,12 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add ELEMENT_ID_ NVARCHAR2(255);
+alter table ACT_RU_JOB add ELEMENT_NAME_ NVARCHAR2(255);
+alter table ACT_RU_TIMER_JOB add ELEMENT_ID_ NVARCHAR2(255);
+alter table ACT_RU_TIMER_JOB add ELEMENT_NAME_ NVARCHAR2(255);
+alter table ACT_RU_SUSPENDED_JOB add ELEMENT_ID_ NVARCHAR2(255);
+alter table ACT_RU_SUSPENDED_JOB add ELEMENT_NAME_ NVARCHAR2(255);
+alter table ACT_RU_DEADLETTER_JOB add ELEMENT_ID_ NVARCHAR2(255);
+alter table ACT_RU_DEADLETTER_JOB add ELEMENT_NAME_ NVARCHAR2(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.common.sql
new file mode 100644
index 00000000000..48a4e0ab5c8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.common.sql
@@ -0,0 +1,39 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
+
+
+create table FLW_RU_BATCH (
+    ID_ NVARCHAR2(64) not null,
+    REV_ INTEGER,
+    TYPE_ NVARCHAR2(64) not null,
+    SEARCH_KEY_ NVARCHAR2(255),
+    SEARCH_KEY2_ NVARCHAR2(255),
+    CREATE_TIME_ TIMESTAMP(6) not null,
+    COMPLETE_TIME_ TIMESTAMP(6),
+    STATUS_ NVARCHAR2(255),
+    BATCH_DOC_ID_ NVARCHAR2(64),
+    TENANT_ID_ NVARCHAR2(255) default '',
+    primary key (ID_)
+);
+create table FLW_RU_BATCH_PART (
+    ID_ NVARCHAR2(64) not null,
+    REV_ INTEGER,
+    BATCH_ID_ NVARCHAR2(64),
+    TYPE_ NVARCHAR2(64) not null,
+    SCOPE_ID_ NVARCHAR2(64),
+    SUB_SCOPE_ID_ NVARCHAR2(64),
+    SCOPE_TYPE_ NVARCHAR2(64),
+    SEARCH_KEY_ NVARCHAR2(255),
+    SEARCH_KEY2_ NVARCHAR2(255),
+    CREATE_TIME_ TIMESTAMP(6) not null,
+    COMPLETE_TIME_ TIMESTAMP(6),
+    STATUS_ NVARCHAR2(255),
+    RESULT_DOC_ID_ NVARCHAR2(64),
+    TENANT_ID_ NVARCHAR2(255) default '',
+    primary key (ID_)
+);
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.common.sql
new file mode 100644
index 00000000000..a9b85c1d3d8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.common.sql
@@ -0,0 +1,10 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add SUB_SCOPE_ID_ NVARCHAR2(255);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add SUB_SCOPE_ID_ NVARCHAR2(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.common.sql
new file mode 100644
index 00000000000..736fb814ff1
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add PROPAGATED_STAGE_INST_ID_ NVARCHAR2(255);
+
+alter table ACT_HI_TASKINST add PROPAGATED_STAGE_INST_ID_ NVARCHAR2(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.common.sql
new file mode 100644
index 00000000000..c0e66a7119e
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.common.sql
@@ -0,0 +1,11 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add ROOT_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_ENTITYLINK add ROOT_SCOPE_TYPE_ NVARCHAR2(255);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
+alter table ACT_HI_ENTITYLINK add ROOT_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_HI_ENTITYLINK add ROOT_SCOPE_TYPE_ NVARCHAR2(255);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.common.sql
new file mode 100644
index 00000000000..79dc6258fbb
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add CATEGORY_ NVARCHAR2(255);
+alter table ACT_RU_TIMER_JOB add CATEGORY_ NVARCHAR2(255);
+alter table ACT_RU_SUSPENDED_JOB add CATEGORY_ NVARCHAR2(255);
+alter table ACT_RU_DEADLETTER_JOB add CATEGORY_ NVARCHAR2(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6512.to.6513.common.sql
new file mode 100644
index 00000000000..d44a13bacbe
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6512.to.6513.common.sql
@@ -0,0 +1,46 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
+
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ NVARCHAR2(64) NOT NULL,
+    REV_ INTEGER,
+    CATEGORY_ NVARCHAR2(255),
+    TYPE_ NVARCHAR2(255) NOT NULL,
+    LOCK_EXP_TIME_ TIMESTAMP(6),
+    LOCK_OWNER_ NVARCHAR2(255),
+    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
+    EXECUTION_ID_ NVARCHAR2(64),
+    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
+    PROC_DEF_ID_ NVARCHAR2(64),
+    ELEMENT_ID_ NVARCHAR2(255),
+    ELEMENT_NAME_ NVARCHAR2(255),
+    SCOPE_ID_ NVARCHAR2(255),
+    SUB_SCOPE_ID_ NVARCHAR2(255),
+    SCOPE_TYPE_ NVARCHAR2(255),
+    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
+    RETRIES_ INTEGER,
+    EXCEPTION_STACK_ID_ NVARCHAR2(64),
+    EXCEPTION_MSG_ NVARCHAR2(2000),
+    DUEDATE_ TIMESTAMP(6),
+    REPEAT_ NVARCHAR2(255),
+    HANDLER_TYPE_ NVARCHAR2(255),
+    HANDLER_CFG_ NVARCHAR2(2000),
+    CUSTOM_VALUES_ID_ NVARCHAR2(64),
+    CREATE_TIME_ TIMESTAMP(6),
+    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
+    primary key (ID_)
+);
+create index ACT_IDX_EJOB_EXCEPTION on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EJOB_CUSTOM_VAL_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EJOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EJOB_CUSTOM_VAL
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6513.to.6514.common.sql
new file mode 100644
index 00000000000..8434d398912
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6513.to.6514.common.sql
@@ -0,0 +1,14 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add CORRELATION_ID_ NVARCHAR2(255);
+alter table ACT_RU_TIMER_JOB add CORRELATION_ID_ NVARCHAR2(255);
+alter table ACT_RU_SUSPENDED_JOB add CORRELATION_ID_ NVARCHAR2(255);
+alter table ACT_RU_DEADLETTER_JOB add CORRELATION_ID_ NVARCHAR2(255);
+alter table ACT_RU_EXTERNAL_JOB add CORRELATION_ID_ NVARCHAR2(255);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+create index ACT_IDX_TJOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_SJOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+create index ACT_IDX_DJOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+create index ACT_IDX_EJOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.common.sql
new file mode 100644
index 00000000000..82bc02a6d33
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_RU_ENTITYLINK add PARENT_ELEMENT_ID_ NVARCHAR2(255);
+
+alter table ACT_HI_ENTITYLINK add SUB_SCOPE_ID_ NVARCHAR2(255);
+alter table ACT_HI_ENTITYLINK add PARENT_ELEMENT_ID_ NVARCHAR2(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.common.sql
new file mode 100644
index 00000000000..394c8f2a803
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.common.sql
new file mode 100644
index 00000000000..9be081b0cdf
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_TJOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6720.to.6721.common.sql
new file mode 100644
index 00000000000..6aa575e607b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6720.to.6721.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6721.to.6722.common.sql
new file mode 100644
index 00000000000..c6f689a9ead
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6721.to.6722.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add LOCK_TIME_ TIMESTAMP(6);
+alter table ACT_RU_EVENT_SUBSCR add LOCK_OWNER_ NVARCHAR2(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.common.sql
new file mode 100644
index 00000000000..9990935d50a
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_VARIABLE add META_INFO_ NVARCHAR2(2000);
+
+alter table ACT_HI_VARINST add META_INFO_ NVARCHAR2(2000);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.common.sql
new file mode 100644
index 00000000000..25485831b92
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add (
+    STATE_ NVARCHAR2(255), 
+    IN_PROGRESS_TIME_ TIMESTAMP(6), 
+    IN_PROGRESS_STARTED_BY_ NVARCHAR2(255),
+    CLAIMED_BY_ NVARCHAR2(255), 
+    SUSPENDED_TIME_ TIMESTAMP(6), 
+    SUSPENDED_BY_ NVARCHAR2(255), 
+    IN_PROGRESS_DUE_DATE_ TIMESTAMP(6));
+
+alter table ACT_HI_TASKINST add (
+    STATE_ NVARCHAR2(255), 
+    IN_PROGRESS_TIME_ TIMESTAMP(6), 
+    IN_PROGRESS_STARTED_BY_ NVARCHAR2(255),
+    CLAIMED_BY_ NVARCHAR2(255), 
+    SUSPENDED_TIME_ TIMESTAMP(6), 
+    SUSPENDED_BY_ NVARCHAR2(255), 
+    COMPLETED_BY_ NVARCHAR2(255), 
+    IN_PROGRESS_DUE_DATE_ TIMESTAMP(6));
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7010.to.7011.common.sql
new file mode 100644
index 00000000000..74a162dfd7f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7010.to.7011.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add SCOPE_DEFINITION_KEY_ NVARCHAR2(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7011.to.7100.common.sql
new file mode 100644
index 00000000000..23de5c1411c
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.oracle.upgradestep.7011.to.7100.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
+
+
+
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.common.sql
new file mode 100644
index 00000000000..0dc60fda126
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.common.sql
@@ -0,0 +1,31 @@
+insert into ACT_GE_PROPERTY values ('common.schema.version', '6.2.0.0', 1);
+
+alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
+
+create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.common.sql
new file mode 100644
index 00000000000..b2714006706
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.common.sql
@@ -0,0 +1,57 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
+create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
+alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
+create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_JOB
+    add constraint ACT_FK_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_TIMER_JOB
+    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_SUSPENDED_JOB
+    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_DEADLETTER_JOB
+    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.common.sql
new file mode 100644
index 00000000000..302829393ab
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.common.sql
@@ -0,0 +1,18 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
+alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
+update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.common.sql
new file mode 100644
index 00000000000..af26a1e6100
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
+
+alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.common.sql
new file mode 100644
index 00000000000..edc3bb187b0
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6400.to.6410.common.sql
@@ -0,0 +1,34 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'common.schema.version';
+
+create table ACT_RU_ENTITYLINK (
+    ID_ varchar(64),
+    REV_ integer,
+    CREATE_TIME_ timestamp,
+    LINK_TYPE_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
+
+create table ACT_HI_ENTITYLINK (
+    ID_ varchar(64),
+    LINK_TYPE_ varchar(255),
+    CREATE_TIME_ timestamp,
+    SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    REF_SCOPE_ID_ varchar(255),
+    REF_SCOPE_TYPE_ varchar(255),
+    REF_SCOPE_DEFINITION_ID_ varchar(255),
+    primary key (ID_)
+);
+
+create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
+create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.common.sql
new file mode 100644
index 00000000000..29ca76e521f
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6411.to.6412.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6411.to.6412.common.sql
new file mode 100644
index 00000000000..5dc6aeafe90
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6411.to.6412.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'common.schema.version';
+
+
+update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.common.sql
new file mode 100644
index 00000000000..46fed1e78f1
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.common.sql
@@ -0,0 +1,20 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'common.schema.version';
+
+
+
+create table ACT_HI_TSK_LOG (
+  ID_ SERIAL PRIMARY KEY,
+  TYPE_ varchar(64),
+  TASK_ID_ varchar(64) not null,
+  TIME_STAMP_ timestamp not null,
+  USER_ID_ varchar(255),
+  DATA_ varchar(4000),
+  EXECUTION_ID_ varchar(64),
+  PROC_INST_ID_ varchar(64),
+  PROC_DEF_ID_ varchar(64),
+  SCOPE_ID_ varchar(255),
+  SCOPE_DEFINITION_ID_ varchar(255),
+  SUB_SCOPE_ID_ varchar(255),
+  SCOPE_TYPE_ varchar(255),
+  TENANT_ID_ varchar(255) default ''
+);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6413.to.6500.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6413.to.6500.common.sql
new file mode 100644
index 00000000000..9b63e337f26
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6413.to.6500.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6500.to.6501.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6500.to.6501.common.sql
new file mode 100644
index 00000000000..31c0783a3f5
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6500.to.6501.common.sql
@@ -0,0 +1,12 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.common.sql
new file mode 100644
index 00000000000..63a0a5dd168
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.common.sql
@@ -0,0 +1,39 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'common.schema.version';
+
+
+create table FLW_RU_BATCH (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    TYPE_ varchar(64) not null,
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    BATCH_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create table FLW_RU_BATCH_PART (
+    ID_ varchar(64) not null,
+    REV_ integer,
+    BATCH_ID_ varchar(64),
+    TYPE_ varchar(64) not null,
+    SCOPE_ID_ varchar(64),
+    SUB_SCOPE_ID_ varchar(64),
+    SCOPE_TYPE_ varchar(64),
+    SEARCH_KEY_ varchar(255),
+    SEARCH_KEY2_ varchar(255),
+    CREATE_TIME_ timestamp not null,
+    COMPLETE_TIME_ timestamp,
+    STATUS_ varchar(255),
+    RESULT_DOC_ID_ varchar(64),
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create index FLW_IDX_BATCH_PART on FLW_RU_BATCH_PART(BATCH_ID_);
+alter table FLW_RU_BATCH_PART
+    add constraint FLW_FK_BATCH_PART_PARENT
+    foreign key (BATCH_ID_)
+    references FLW_RU_BATCH (ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.common.sql
new file mode 100644
index 00000000000..bfd185c6795
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.common.sql
@@ -0,0 +1,10 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
+alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+
+create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.common.sql
new file mode 100644
index 00000000000..ad6732faab7
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
+
+alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.common.sql
new file mode 100644
index 00000000000..24085ada032
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.common.sql
@@ -0,0 +1,11 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
+create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.common.sql
new file mode 100644
index 00000000000..a2bd469cc38
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.common.sql
@@ -0,0 +1,8 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6512.to.6513.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6512.to.6513.common.sql
new file mode 100644
index 00000000000..7ca6b156fda
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6512.to.6513.common.sql
@@ -0,0 +1,46 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'common.schema.version';
+
+
+create table ACT_RU_EXTERNAL_JOB (
+    ID_ varchar(64) NOT NULL,
+    REV_ integer,
+    CATEGORY_ varchar(255),
+    TYPE_ varchar(255) NOT NULL,
+    LOCK_EXP_TIME_ timestamp,
+    LOCK_OWNER_ varchar(255),
+    EXCLUSIVE_ boolean,
+    EXECUTION_ID_ varchar(64),
+    PROCESS_INSTANCE_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    ELEMENT_ID_ varchar(255),
+    ELEMENT_NAME_ varchar(255),
+    SCOPE_ID_ varchar(255),
+    SUB_SCOPE_ID_ varchar(255),
+    SCOPE_TYPE_ varchar(255),
+    SCOPE_DEFINITION_ID_ varchar(255),
+    RETRIES_ integer,
+    EXCEPTION_STACK_ID_ varchar(64),
+    EXCEPTION_MSG_ varchar(4000),
+    DUEDATE_ timestamp,
+    REPEAT_ varchar(255),
+    HANDLER_TYPE_ varchar(255),
+    HANDLER_CFG_ varchar(4000),
+    CUSTOM_VALUES_ID_ varchar(64),
+    CREATE_TIME_ timestamp,
+    TENANT_ID_ varchar(255) default '',
+    primary key (ID_)
+);
+create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
+    foreign key (EXCEPTION_STACK_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+alter table ACT_RU_EXTERNAL_JOB
+    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
+    foreign key (CUSTOM_VALUES_ID_)
+    references ACT_GE_BYTEARRAY (ID_);
+create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
+create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6513.to.6514.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6513.to.6514.common.sql
new file mode 100644
index 00000000000..440218cf602
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6513.to.6514.common.sql
@@ -0,0 +1,14 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
+alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
+create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
+create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
+create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
+create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
+create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.common.sql
new file mode 100644
index 00000000000..6f8a541d352
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.common.sql
@@ -0,0 +1,9 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
+alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
+alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.common.sql
new file mode 100644
index 00000000000..394c8f2a803
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
+create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.common.sql
new file mode 100644
index 00000000000..e64fb924c98
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6720.to.6721.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6720.to.6721.common.sql
new file mode 100644
index 00000000000..6aa575e607b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6720.to.6721.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'common.schema.version';
+
+
+create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6721.to.6722.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6721.to.6722.common.sql
new file mode 100644
index 00000000000..5bde57f5f97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6721.to.6722.common.sql
@@ -0,0 +1,6 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
+alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.common.sql
new file mode 100644
index 00000000000..a291197e532
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.common.sql
@@ -0,0 +1,7 @@
+update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
+
+alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.common.sql
new file mode 100644
index 00000000000..3e7fccafa7b
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.common.sql
@@ -0,0 +1,21 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_TASK 
+    add column STATE_ varchar(255), 
+    add column IN_PROGRESS_TIME_ timestamp, 
+    add column IN_PROGRESS_STARTED_BY_ varchar(255),
+    add column CLAIMED_BY_ varchar(255), 
+    add column SUSPENDED_TIME_ timestamp, 
+    add column SUSPENDED_BY_ varchar(255), 
+    add column IN_PROGRESS_DUE_DATE_ timestamp;
+
+alter table ACT_HI_TASKINST 
+    add column STATE_ varchar(255), 
+    add column IN_PROGRESS_TIME_ timestamp, 
+    add column IN_PROGRESS_STARTED_BY_ varchar(255),
+    add column CLAIMED_BY_ varchar(255), 
+    add column SUSPENDED_TIME_ timestamp, 
+    add column SUSPENDED_BY_ varchar(255), 
+    add column COMPLETED_BY_ varchar(255), 
+    add column IN_PROGRESS_DUE_DATE_ timestamp;
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7010.to.7011.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7010.to.7011.common.sql
new file mode 100644
index 00000000000..cbf2db13d97
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7010.to.7011.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'common.schema.version';
+
+
+alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
+
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7011.to.7100.common.sql b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7011.to.7100.common.sql
new file mode 100644
index 00000000000..eebd15bbef8
--- /dev/null
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/upgrade/flowable.postgres.upgradestep.7011.to.7100.common.sql
@@ -0,0 +1,5 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'common.schema.version';
+
+
+
+create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-engine-configurator/src/main/java/org/flowable/engine/configurator/ProcessEngineConfigurator.java b/modules/flowable-engine-configurator/src/main/java/org/flowable/engine/configurator/ProcessEngineConfigurator.java
index fe544fe97e3..235771b1384 100644
--- a/modules/flowable-engine-configurator/src/main/java/org/flowable/engine/configurator/ProcessEngineConfigurator.java
+++ b/modules/flowable-engine-configurator/src/main/java/org/flowable/engine/configurator/ProcessEngineConfigurator.java
@@ -37,7 +37,7 @@
 /**
  * @author Tijs Rademakers
  */
-public class ProcessEngineConfigurator extends AbstractEngineConfigurator {
+public class ProcessEngineConfigurator extends AbstractEngineConfigurator<ProcessEngine> {
 
     protected ProcessEngineConfiguration processEngineConfiguration;
 
@@ -64,7 +64,7 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
 
         initialiseCommonProperties(engineConfiguration, processEngineConfiguration);
 
-        initProcessEngine();
+        initEngine();
 
         JobServiceConfiguration engineJobServiceConfiguration = getJobServiceConfiguration(engineConfiguration);
         if (engineJobServiceConfiguration != null) {
@@ -113,7 +113,8 @@ protected List<Class<? extends Entity>> getEntityDeletionOrder() {
         return EntityDependencyOrder.DELETE_ORDER;
     }
 
-    protected synchronized ProcessEngine initProcessEngine() {
+    @Override
+    protected ProcessEngine buildEngine() {
         if (processEngineConfiguration == null) {
             throw new FlowableException("ProcessEngineConfiguration is required");
         }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/ManagementService.java b/modules/flowable-engine/src/main/java/org/flowable/engine/ManagementService.java
index 36357cf7b32..420d9cdaecf 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/ManagementService.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/ManagementService.java
@@ -25,6 +25,7 @@
 import org.flowable.batch.api.BatchQuery;
 import org.flowable.common.engine.api.FlowableIllegalArgumentException;
 import org.flowable.common.engine.api.FlowableObjectNotFoundException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.management.TableMetaData;
 import org.flowable.common.engine.api.management.TablePage;
 import org.flowable.common.engine.api.management.TablePageQuery;
@@ -32,7 +33,6 @@
 import org.flowable.common.engine.impl.cmd.CustomSqlExecution;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.engine.event.EventLogEntry;
 import org.flowable.engine.runtime.ExternalWorkerCompletionBuilder;
 import org.flowable.job.api.DeadLetterJobQuery;
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/ProcessEngineConfiguration.java b/modules/flowable-engine/src/main/java/org/flowable/engine/ProcessEngineConfiguration.java
index 1b839089195..40752fd6af8 100755
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/ProcessEngineConfiguration.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/ProcessEngineConfiguration.java
@@ -23,7 +23,7 @@
 
 import org.flowable.common.engine.api.async.AsyncTaskExecutor;
 import org.flowable.common.engine.api.async.AsyncTaskInvoker;
-import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.AbstractBuildableEngineConfiguration;
 import org.flowable.common.engine.impl.cfg.BeansConfigurationHelper;
 import org.flowable.common.engine.impl.cfg.mail.MailServerInfo;
 import org.flowable.common.engine.impl.history.HistoryLevel;
@@ -81,7 +81,7 @@
  * @see ProcessEngines
  * @author Tom Baeyens
  */
-public abstract class ProcessEngineConfiguration extends AbstractEngineConfiguration {
+public abstract class ProcessEngineConfiguration extends AbstractBuildableEngineConfiguration<ProcessEngine> {
 
     protected String processEngineName = ProcessEngines.NAME_DEFAULT;
     protected int idBlockSize = 2500;
@@ -160,7 +160,9 @@ public abstract class ProcessEngineConfiguration extends AbstractEngineConfigura
     protected ProcessEngineConfiguration() {
     }
 
-    public abstract ProcessEngine buildProcessEngine();
+    public ProcessEngine buildProcessEngine() {
+        return buildEngine();
+    }
 
     public static ProcessEngineConfiguration createProcessEngineConfigurationFromResourceDefault() {
         return createProcessEngineConfigurationFromResource("flowable.cfg.xml", "processEngineConfiguration");
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/ManagementServiceImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/ManagementServiceImpl.java
index d114907b066..dbb88c119e9 100755
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/ManagementServiceImpl.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/ManagementServiceImpl.java
@@ -29,6 +29,7 @@
 import org.flowable.batch.service.impl.BatchQueryImpl;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableIllegalArgumentException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.management.TableMetaData;
 import org.flowable.common.engine.api.management.TablePageQuery;
 import org.flowable.common.engine.api.tenant.ChangeTenantIdBuilder;
@@ -41,7 +42,6 @@
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.common.engine.impl.persistence.entity.TablePageQueryImpl;
 import org.flowable.common.engine.impl.service.CommonEngineServiceImpl;
@@ -403,7 +403,9 @@ public String execute(CommandContext commandContext) {
                 DbSqlSession dbSqlSession = new DbSqlSession(dbSqlSessionFactory, CommandContextUtil.getEntityCache(commandContext), connection, catalog,
                         schema);
                 commandContext.getSessions().put(DbSqlSession.class, dbSqlSession);
-                return CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager().schemaUpdate();
+                ProcessEngineConfigurationImpl engineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
+                engineConfiguration.getCommonSchemaManager().schemaUpdate();
+                return engineConfiguration.getSchemaManager().schemaUpdate();
             }
         });
     }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/ProcessEngineImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/ProcessEngineImpl.java
index 3ac19694b5b..e99085d3515 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/ProcessEngineImpl.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/ProcessEngineImpl.java
@@ -90,15 +90,6 @@ public ProcessEngineImpl(ProcessEngineConfigurationImpl processEngineConfigurati
         }
 
         ProcessEngines.registerProcessEngine(this);
-
-        if (processEngineConfiguration.getEngineLifecycleListeners() != null) {
-            for (EngineLifecycleListener engineLifecycleListener : processEngineConfiguration.getEngineLifecycleListeners()) {
-                engineLifecycleListener.onEngineBuilt(this);
-            }
-        }
-
-        processEngineConfiguration.getEventDispatcher().dispatchEvent(FlowableEventBuilder.createGlobalEvent(FlowableEngineEventType.ENGINE_CREATED), 
-                processEngineConfiguration.getEngineCfgKey());
     }
 
     @Override
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/SchemaOperationProcessEngineClose.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/SchemaOperationProcessEngineClose.java
index 3f928f0b1a3..54de3df2f0f 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/SchemaOperationProcessEngineClose.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/SchemaOperationProcessEngineClose.java
@@ -12,10 +12,10 @@
  */
 package org.flowable.engine.impl;
 
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.flowable.engine.impl.db.ProcessDbSchemaManager;
 import org.flowable.engine.impl.util.CommandContextUtil;
 
 /**
@@ -28,7 +28,10 @@ public class SchemaOperationProcessEngineClose implements Command<Void> {
     public Void execute(CommandContext commandContext) {
         ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
         if (processEngineConfiguration.isUsingRelationalDatabase()) {
-            ((ProcessDbSchemaManager) processEngineConfiguration.getSchemaManager()).performSchemaOperationsProcessEngineClose();
+            String databaseSchemaUpdate = processEngineConfiguration.getDatabaseSchemaUpdate();
+            if (org.flowable.engine.ProcessEngineConfiguration.DB_SCHEMA_UPDATE_CREATE_DROP.equals(databaseSchemaUpdate)) {
+                new SchemaOperationsEngineDropDbCmd(processEngineConfiguration.getEngineScopeType()).execute(commandContext);
+            }
         }
         return null;
     }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/SchemaOperationsProcessEngineBuild.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/SchemaOperationsProcessEngineBuild.java
deleted file mode 100644
index 1834dea5e47..00000000000
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/SchemaOperationsProcessEngineBuild.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.engine.impl;
-
-import org.flowable.common.engine.impl.db.SchemaManager;
-import org.flowable.common.engine.impl.interceptor.Command;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
-import org.flowable.engine.ProcessEngineConfiguration;
-import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.flowable.engine.impl.util.CommandContextUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Tom Baeyens
- * @author Joram Barrez
- */
-public class SchemaOperationsProcessEngineBuild implements Command<Void> {
-    
-    private static final Logger LOGGER = LoggerFactory.getLogger(SchemaOperationsProcessEngineBuild.class);
-
-    @Override
-    public Void execute(CommandContext commandContext) {
-        
-        SchemaManager schemaManager = CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager();
-        String databaseSchemaUpdate = CommandContextUtil.getProcessEngineConfiguration().getDatabaseSchemaUpdate();
-        
-        LOGGER.debug("Executing schema management with setting {}", databaseSchemaUpdate);
-        if (ProcessEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE.equals(databaseSchemaUpdate)) {
-            try {
-                schemaManager.schemaDrop();
-            } catch (RuntimeException e) {
-                // ignore
-            }
-        }
-        if (ProcessEngineConfiguration.DB_SCHEMA_UPDATE_CREATE_DROP.equals(databaseSchemaUpdate)
-                || ProcessEngineConfigurationImpl.DB_SCHEMA_UPDATE_DROP_CREATE.equals(databaseSchemaUpdate) || ProcessEngineConfigurationImpl.DB_SCHEMA_UPDATE_CREATE.equals(databaseSchemaUpdate)) {
-            schemaManager.schemaCreate();
-
-        } else if (ProcessEngineConfiguration.DB_SCHEMA_UPDATE_FALSE.equals(databaseSchemaUpdate)) {
-            schemaManager.schemaCheckVersion();
-
-        } else if (ProcessEngineConfiguration.DB_SCHEMA_UPDATE_TRUE.equals(databaseSchemaUpdate)) {
-            schemaManager.schemaUpdate();
-        }
-        
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
index adbf7cbb41b..69feae70ceb 100755
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -41,7 +42,6 @@
 import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
 import org.apache.ibatis.type.JdbcType;
 import org.flowable.batch.service.BatchServiceConfiguration;
-import org.flowable.batch.service.impl.db.BatchDbSchemaManager;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.delegate.FlowableFunctionDelegate;
 import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
@@ -88,9 +88,7 @@
 import org.flowable.common.engine.impl.el.function.VariableLowerThanOrEqualsExpressionFunction;
 import org.flowable.common.engine.impl.el.function.VariableNotEqualsExpressionFunction;
 import org.flowable.common.engine.impl.history.HistoryLevel;
-import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
 import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
 import org.flowable.common.engine.impl.interceptor.SessionFactory;
@@ -155,7 +153,6 @@
 import org.flowable.engine.impl.RepositoryServiceImpl;
 import org.flowable.engine.impl.RuntimeServiceImpl;
 import org.flowable.engine.impl.SchemaOperationProcessEngineClose;
-import org.flowable.engine.impl.SchemaOperationsProcessEngineBuild;
 import org.flowable.engine.impl.TaskServiceImpl;
 import org.flowable.engine.impl.agenda.AgendaSessionFactory;
 import org.flowable.engine.impl.agenda.DefaultFlowableEngineAgendaFactory;
@@ -358,15 +355,12 @@
 import org.flowable.engine.parse.BpmnParseHandler;
 import org.flowable.engine.repository.InternalProcessDefinitionLocalizationManager;
 import org.flowable.entitylink.service.EntityLinkServiceConfiguration;
-import org.flowable.entitylink.service.impl.db.EntityLinkDbSchemaManager;
 import org.flowable.eventregistry.api.EventRegistryEventConsumer;
 import org.flowable.eventregistry.impl.configurator.EventRegistryEngineConfigurator;
 import org.flowable.eventsubscription.service.EventSubscriptionServiceConfiguration;
-import org.flowable.eventsubscription.service.impl.db.EventSubscriptionDbSchemaManager;
 import org.flowable.form.api.FormFieldHandler;
 import org.flowable.identitylink.service.IdentityLinkEventHandler;
 import org.flowable.identitylink.service.IdentityLinkServiceConfiguration;
-import org.flowable.identitylink.service.impl.db.IdentityLinkDbSchemaManager;
 import org.flowable.idm.api.IdmEngineConfigurationApi;
 import org.flowable.idm.engine.configurator.IdmEngineConfigurator;
 import org.flowable.image.impl.DefaultProcessDiagramGenerator;
@@ -386,7 +380,6 @@
 import org.flowable.job.service.impl.asyncexecutor.ExecuteAsyncRunnableFactory;
 import org.flowable.job.service.impl.asyncexecutor.FailedJobCommandFactory;
 import org.flowable.job.service.impl.asyncexecutor.JobManager;
-import org.flowable.job.service.impl.db.JobDbSchemaManager;
 import org.flowable.task.api.TaskQueryInterceptor;
 import org.flowable.task.api.history.HistoricTaskQueryInterceptor;
 import org.flowable.task.service.InternalTaskAssignmentManager;
@@ -395,7 +388,6 @@
 import org.flowable.task.service.TaskServiceConfiguration;
 import org.flowable.task.service.history.InternalHistoryTaskManager;
 import org.flowable.task.service.impl.DefaultTaskPostProcessor;
-import org.flowable.task.service.impl.db.TaskDbSchemaManager;
 import org.flowable.task.service.impl.persistence.entity.HistoricTaskLogEntryEntityImpl;
 import org.flowable.validation.ProcessValidator;
 import org.flowable.validation.ProcessValidatorFactory;
@@ -405,7 +397,6 @@
 import org.flowable.variable.service.VariableServiceConfiguration;
 import org.flowable.variable.service.history.InternalHistoryVariableManager;
 import org.flowable.variable.service.impl.db.IbatisVariableTypeHandler;
-import org.flowable.variable.service.impl.db.VariableDbSchemaManager;
 import org.flowable.variable.service.impl.types.BooleanType;
 import org.flowable.variable.service.impl.types.ByteArrayType;
 import org.flowable.variable.service.impl.types.DateType;
@@ -838,14 +829,6 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
     protected FlowableEngineAgendaFactory agendaFactory;
     protected AgendaFutureMaxWaitTimeoutProvider agendaFutureMaxWaitTimeoutProvider;
 
-    protected SchemaManager identityLinkSchemaManager;
-    protected SchemaManager entityLinkSchemaManager;
-    protected SchemaManager eventSubscriptionSchemaManager;
-    protected SchemaManager variableSchemaManager;
-    protected SchemaManager taskSchemaManager;
-    protected SchemaManager jobSchemaManager;
-    protected SchemaManager batchSchemaManager;
-
     protected boolean handleProcessEngineExecutorsAfterEngineCreate = true;
 
     // Backwards compatibility //////////////////////////////////////////////////////////////
@@ -874,34 +857,19 @@ public ProcessEngineConfigurationImpl() {
     // ///////////////////////////////////////////////////////
 
     @Override
-    public ProcessEngine buildProcessEngine() {
-        init();
-        ProcessEngineImpl processEngine = new ProcessEngineImpl(this);
-
-        if (handleProcessEngineExecutorsAfterEngineCreate) {
-            processEngine.startExecutors();
-        }
-
-        // trigger build of Flowable 5 Engine
-        if (flowable5CompatibilityEnabled && flowable5CompatibilityHandler != null) {
-            commandExecutor.execute(new Command<Void>() {
-
-                @Override
-                public Void execute(CommandContext commandContext) {
-                    flowable5CompatibilityHandler.getRawProcessEngine();
-                    return null;
-                }
-            });
-        }
-
-        postProcessEngineInitialisation();
+    protected ProcessEngine createEngine() {
+        return new ProcessEngineImpl(this);
+    }
 
-        return processEngine;
+    @Override
+    protected Consumer<ProcessEngine> createPostEngineBuildConsumer() {
+        return new ProcessEnginePostEngineBuildConsumer();
     }
 
     // init
     // /////////////////////////////////////////////////////////////////////
 
+    @Override
     public void init() {
         initEngineConfigurations();
         initConfigurators();
@@ -1068,78 +1036,13 @@ public void initServices() {
         initService(processInstanceMigrationService);
     }
 
-    @Override
-    public void initSchemaManager() {
-        super.initSchemaManager();
-
-        initProcessSchemaManager();
-        initIdentityLinkSchemaManager();
-        initEntityLinkSchemaManager();
-        initEventSubscriptionSchemaManager();
-        initVariableSchemaManager();
-        initTaskSchemaManager();
-        initJobSchemaManager();
-        initBatchSchemaManager();
-    }
-
     public void initNonRelationalDataSource() {
         // for subclassing
     }
 
-    protected void initProcessSchemaManager() {
-        if (this.schemaManager == null) {
-            this.schemaManager = new ProcessDbSchemaManager();
-        }
-    }
-
-    protected void initVariableSchemaManager() {
-        if (this.variableSchemaManager == null) {
-            this.variableSchemaManager = new VariableDbSchemaManager();
-        }
-    }
-
-    protected void initTaskSchemaManager() {
-        if (this.taskSchemaManager == null) {
-            this.taskSchemaManager = new TaskDbSchemaManager();
-        }
-    }
-
-    protected void initIdentityLinkSchemaManager() {
-        if (this.identityLinkSchemaManager == null) {
-            this.identityLinkSchemaManager = new IdentityLinkDbSchemaManager();
-        }
-    }
-
-    protected void initEntityLinkSchemaManager() {
-        if (this.entityLinkSchemaManager == null) {
-            this.entityLinkSchemaManager = new EntityLinkDbSchemaManager();
-        }
-    }
-    
-    protected void initEventSubscriptionSchemaManager() {
-        if (this.eventSubscriptionSchemaManager == null) {
-            this.eventSubscriptionSchemaManager = new EventSubscriptionDbSchemaManager();
-        }
-    }
-
-    protected void initJobSchemaManager() {
-        if (this.jobSchemaManager == null) {
-            this.jobSchemaManager = new JobDbSchemaManager();
-        }
-    }
-    
-    protected void initBatchSchemaManager() {
-        if (this.batchSchemaManager == null) {
-            this.batchSchemaManager = new BatchDbSchemaManager();
-        }
-    }
-
-    public void initSchemaManagementCommand() {
-        if (schemaManagementCmd == null) {
-            if (usingRelationalDatabase && databaseSchemaUpdate != null) {
-                this.schemaManagementCmd = new SchemaOperationsProcessEngineBuild();
-            }
-        }
+    @Override
+    protected SchemaManager createEngineSchemaManager() {
+        return new ProcessDbSchemaManager();
     }
 
     @Override
@@ -4552,69 +4455,6 @@ public ProcessEngineConfigurationImpl setProcessInstanceMigrationCallbacks(List<
         return this;
     }
 
-    public SchemaManager getVariableSchemaManager() {
-        return variableSchemaManager;
-    }
-
-    public ProcessEngineConfigurationImpl setVariableSchemaManager(SchemaManager variableSchemaManager) {
-        this.variableSchemaManager = variableSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getTaskSchemaManager() {
-        return taskSchemaManager;
-    }
-
-    public ProcessEngineConfigurationImpl setTaskSchemaManager(SchemaManager taskSchemaManager) {
-        this.taskSchemaManager = taskSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getIdentityLinkSchemaManager() {
-        return identityLinkSchemaManager;
-    }
-
-    public ProcessEngineConfigurationImpl setIdentityLinkSchemaManager(SchemaManager identityLinkSchemaManager) {
-        this.identityLinkSchemaManager = identityLinkSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getEntityLinkSchemaManager() {
-        return entityLinkSchemaManager;
-    }
-
-    public ProcessEngineConfigurationImpl setEntityLinkSchemaManager(SchemaManager entityLinkSchemaManager) {
-        this.entityLinkSchemaManager = entityLinkSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getEventSubscriptionSchemaManager() {
-        return eventSubscriptionSchemaManager;
-    }
-
-    public ProcessEngineConfigurationImpl setEventSubscriptionSchemaManager(SchemaManager eventSubscriptionSchemaManager) {
-        this.eventSubscriptionSchemaManager = eventSubscriptionSchemaManager;
-        return this;
-    }
-
-    public SchemaManager getJobSchemaManager() {
-        return jobSchemaManager;
-    }
-
-    public ProcessEngineConfigurationImpl setJobSchemaManager(SchemaManager jobSchemaManager) {
-        this.jobSchemaManager = jobSchemaManager;
-        return this;
-    }
-    
-    public SchemaManager getBatchSchemaManager() {
-        return batchSchemaManager;
-    }
-
-    public ProcessEngineConfigurationImpl setBatchSchemaManager(SchemaManager batchSchemaManager) {
-        this.batchSchemaManager = batchSchemaManager;
-        return this;
-    }
-
     public boolean isEnableEntityLinks() {
         return enableEntityLinks;
     }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEnginePostEngineBuildConsumer.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEnginePostEngineBuildConsumer.java
new file mode 100644
index 00000000000..cc71bd22cd9
--- /dev/null
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEnginePostEngineBuildConsumer.java
@@ -0,0 +1,57 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.engine.impl.cfg;
+
+import java.util.function.Consumer;
+
+import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
+import org.flowable.common.engine.api.engine.EngineLifecycleListener;
+import org.flowable.engine.ProcessEngine;
+import org.flowable.engine.compatibility.Flowable5CompatibilityHandler;
+import org.flowable.engine.delegate.event.impl.FlowableEventBuilder;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class ProcessEnginePostEngineBuildConsumer implements Consumer<ProcessEngine> {
+
+    @Override
+    public void accept(ProcessEngine processEngine) {
+        ProcessEngineConfigurationImpl engineConfiguration = (ProcessEngineConfigurationImpl) processEngine.getProcessEngineConfiguration();
+        if (engineConfiguration.getEngineLifecycleListeners() != null) {
+            for (EngineLifecycleListener engineLifecycleListener : engineConfiguration.getEngineLifecycleListeners()) {
+                engineLifecycleListener.onEngineBuilt(processEngine);
+            }
+        }
+
+        engineConfiguration.getEventDispatcher().dispatchEvent(FlowableEventBuilder.createGlobalEvent(FlowableEngineEventType.ENGINE_CREATED),
+                engineConfiguration.getEngineCfgKey());
+
+        if (engineConfiguration.isHandleProcessEngineExecutorsAfterEngineCreate()) {
+            processEngine.startExecutors();
+        }
+
+        // trigger build of Flowable 5 Engine
+        if (engineConfiguration.isFlowable5CompatibilityEnabled()) {
+            Flowable5CompatibilityHandler flowable5CompatibilityHandler = engineConfiguration.getFlowable5CompatibilityHandler();
+            if (flowable5CompatibilityHandler != null) {
+                engineConfiguration.getCommandExecutor().execute(commandContext -> {
+                    flowable5CompatibilityHandler.getRawProcessEngine();
+                    return null;
+                });
+            }
+        }
+
+        engineConfiguration.postProcessEngineInitialisation();
+    }
+}
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/multitenant/ExecuteSchemaOperationCommand.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/multitenant/ExecuteSchemaOperationCommand.java
index adf18e2027c..34f52b0fab7 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/multitenant/ExecuteSchemaOperationCommand.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/multitenant/ExecuteSchemaOperationCommand.java
@@ -13,10 +13,9 @@
 package org.flowable.engine.impl.cfg.multitenant;
 
 import org.flowable.common.engine.impl.cfg.multitenant.TenantInfoHolder;
-import org.flowable.common.engine.impl.db.SchemaManager;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineBuild;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
-import org.flowable.engine.ProcessEngineConfiguration;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.impl.util.CommandContextUtil;
 
@@ -37,25 +36,8 @@ public ExecuteSchemaOperationCommand(String schemaOperation) {
 
     @Override
     public Void execute(CommandContext commandContext) {
-        SchemaManager processSchemaManager = CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager();
-        if (ProcessEngineConfigurationImpl.DB_SCHEMA_UPDATE_DROP_CREATE.equals(schemaOperation)) {
-            try {
-                processSchemaManager.schemaDrop();
-            } catch (RuntimeException e) {
-                // ignore
-            }
-        }
-        if (org.flowable.engine.ProcessEngineConfiguration.DB_SCHEMA_UPDATE_CREATE_DROP.equals(schemaOperation)
-                || ProcessEngineConfigurationImpl.DB_SCHEMA_UPDATE_DROP_CREATE.equals(schemaOperation)
-                || ProcessEngineConfigurationImpl.DB_SCHEMA_UPDATE_CREATE.equals(schemaOperation)) {
-            processSchemaManager.schemaCreate();
-
-        } else if (org.flowable.engine.ProcessEngineConfiguration.DB_SCHEMA_UPDATE_FALSE.equals(schemaOperation)) {
-            processSchemaManager.schemaCheckVersion();
-
-        } else if (ProcessEngineConfiguration.DB_SCHEMA_UPDATE_TRUE.equals(schemaOperation)) {
-            processSchemaManager.schemaUpdate();
-        }
+        ProcessEngineConfigurationImpl engineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
+        new SchemaOperationsEngineBuild(engineConfiguration.getEngineScopeType(), schemaOperation).execute(commandContext);
 
         return null;
     }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/multitenant/MultiSchemaMultiTenantProcessEngineConfiguration.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/multitenant/MultiSchemaMultiTenantProcessEngineConfiguration.java
index 200c4e99eb3..6f774b5ad83 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/multitenant/MultiSchemaMultiTenantProcessEngineConfiguration.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/multitenant/MultiSchemaMultiTenantProcessEngineConfiguration.java
@@ -112,7 +112,7 @@ public void initAsyncExecutor() {
     }
 
     @Override
-    public ProcessEngine buildProcessEngine() {
+    public ProcessEngine buildEngine() {
 
         // Disable schema creation/validation by setting it to null.
         // We'll do it manually, see buildProcessEngine() method (hence why it's copied first)
@@ -123,7 +123,7 @@ public ProcessEngine buildProcessEngine() {
         boolean originalIsAutoActivateAsyncExecutor = this.asyncExecutorActivate;
         this.asyncExecutorActivate = false;
 
-        ProcessEngine processEngine = super.buildProcessEngine();
+        ProcessEngine processEngine = super.buildEngine();
 
         // Reset to original values
         this.databaseSchemaUpdate = originalDatabaseSchemaUpdate;
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/DbSchemaDrop.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/DbSchemaDrop.java
index bf18d987206..f97b94d5667 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/DbSchemaDrop.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/DbSchemaDrop.java
@@ -13,13 +13,11 @@
 
 package org.flowable.engine.impl.db;
 
-import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.common.engine.impl.interceptor.CommandExecutor;
 import org.flowable.engine.ProcessEngines;
 import org.flowable.engine.impl.ProcessEngineImpl;
-import org.flowable.engine.impl.util.CommandContextUtil;
 
 /**
  * @author Tom Baeyens
@@ -30,12 +28,6 @@ public static void main(String[] args) {
         ProcessEngineImpl processEngine = (ProcessEngineImpl) ProcessEngines.getDefaultProcessEngine();
         CommandExecutor commandExecutor = processEngine.getProcessEngineConfiguration().getCommandExecutor();
         CommandConfig config = new CommandConfig().transactionNotSupported();
-        commandExecutor.execute(config, new Command<>() {
-            @Override
-            public Object execute(CommandContext commandContext) {
-                CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager().schemaDrop();
-                return null;
-            }
-        });
+        commandExecutor.execute(config, new SchemaOperationsEngineDropDbCmd(processEngine.getProcessEngineConfiguration().getEngineScopeType()));
     }
 }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/ProcessDbSchemaManager.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/ProcessDbSchemaManager.java
index 26db008ddf4..9d3d4db5da5 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/ProcessDbSchemaManager.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/db/ProcessDbSchemaManager.java
@@ -17,11 +17,10 @@
 
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableWrongDbException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.impl.FlowableVersions;
 import org.flowable.common.engine.impl.db.AbstractSqlScriptBasedDbSchemaManager;
 import org.flowable.common.engine.impl.db.DbSqlSession;
-import org.flowable.common.engine.impl.db.SchemaManager;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.common.engine.impl.persistence.entity.PropertyEntity;
 import org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl;
 import org.flowable.engine.ProcessEngine;
@@ -80,16 +79,13 @@ protected String addMissingComponent(String missingComponents, String component)
 
     protected String getDbVersion() {
         DbSqlSession dbSqlSession = CommandContextUtil.getDbSqlSession();
-        String selectSchemaVersionStatement = dbSqlSession.getDbSqlSessionFactory().mapStatement("org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl.selectDbSchemaVersion");
-        return (String) dbSqlSession.getSqlSession().selectOne(selectSchemaVersionStatement);
+        String selectSchemaVersionStatement = dbSqlSession.getDbSqlSessionFactory().mapStatement("org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl.selectPropertyValue");
+        return dbSqlSession.getSqlSession().selectOne(selectSchemaVersionStatement, "schema.version");
     }
     
     @Override
     public void schemaCreate() {
         
-        // The common schema manager is special and would handle its own locking mechanism
-        getCommonSchemaManager().schemaCreate();
-
         ProcessEngineConfigurationImpl processEngineConfiguration = getProcessEngineConfiguration();
         if (processEngineConfiguration.isUseLockForDatabaseSchemaUpdate()) {
             LockManager lockManager = processEngineConfiguration.getManagementService().getLockManager(PROCESS_DB_SCHEMA_LOCK_NAME);
@@ -103,14 +99,6 @@ public void schemaCreate() {
     }
 
     protected void schemaCreateInLock() {
-        getIdentityLinkSchemaManager().schemaCreate();
-        getEntityLinkSchemaManager().schemaCreate();
-        getEventSubscriptionSchemaManager().schemaCreate();
-        getTaskSchemaManager().schemaCreate();
-        getVariableSchemaManager().schemaCreate();
-        getJobSchemaManager().schemaCreate();
-        getBatchSchemaManager().schemaCreate();
-        
         if (isEngineTablePresent()) {
             String dbVersion = getDbVersion();
             if (!ProcessEngine.VERSION.equals(dbVersion)) {
@@ -146,53 +134,6 @@ public void schemaDrop() {
             logger.info("Error dropping engine tables", e);
         }
         
-        try {
-            getBatchSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping batch tables", e);
-        }
-        
-        try {
-            getJobSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping job tables", e);
-        }
-     
-        try {
-            getVariableSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping variable tables", e);
-        }
-        
-        try {
-            getTaskSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping task tables", e);
-        }
-        
-        try {
-            getEventSubscriptionSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping event subscription tables", e);
-        }
-        
-        try {
-            getEntityLinkSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping entity link tables", e);
-        }
-        
-        try {
-            getIdentityLinkSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping identity link tables", e);
-        }
-        
-        try {
-            getCommonSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping common tables", e);
-        }
     }
 
     public void dbSchemaPrune() {
@@ -218,9 +159,6 @@ public String schemaUpdate() {
             dbVersion = dbVersionProperty.getValue();
         }
         
-        // The common schema manager is special and would handle its own locking mechanism
-        getCommonSchemaManager().schemaUpdate(dbVersion);
-
         ProcessEngineConfigurationImpl processEngineConfiguration = getProcessEngineConfiguration();
         LockManager lockManager;
         if (processEngineConfiguration.isUseLockForDatabaseSchemaUpdate()) {
@@ -248,14 +186,6 @@ public String schemaUpdate() {
                 }
             }
 
-            getIdentityLinkSchemaManager().schemaUpdate(dbVersion);
-            getEntityLinkSchemaManager().schemaUpdate(dbVersion);
-            getEventSubscriptionSchemaManager().schemaUpdate(dbVersion);
-            getTaskSchemaManager().schemaUpdate(dbVersion);
-            getVariableSchemaManager().schemaUpdate(dbVersion);
-            getJobSchemaManager().schemaUpdate(dbVersion);
-            getBatchSchemaManager().schemaUpdate(dbVersion);
-
             if (isUpgradeNeeded) {
                 dbVersionProperty.setValue(ProcessEngine.VERSION);
 
@@ -353,45 +283,6 @@ protected boolean isMissingTablesException(Exception e) {
         return false;
     }
 
-    public void performSchemaOperationsProcessEngineClose() {
-        String databaseSchemaUpdate = CommandContextUtil.getProcessEngineConfiguration().getDatabaseSchemaUpdate();
-        if (org.flowable.engine.ProcessEngineConfiguration.DB_SCHEMA_UPDATE_CREATE_DROP.equals(databaseSchemaUpdate)) {
-            schemaDrop();
-        }
-    }
-    
-    protected SchemaManager getCommonSchemaManager() {
-        return CommandContextUtil.getProcessEngineConfiguration().getCommonSchemaManager();
-    }
-    
-    protected SchemaManager getIdentityLinkSchemaManager() {
-        return CommandContextUtil.getProcessEngineConfiguration().getIdentityLinkSchemaManager();
-    }
-    
-    protected SchemaManager getEntityLinkSchemaManager() {
-        return CommandContextUtil.getProcessEngineConfiguration().getEntityLinkSchemaManager();
-    }
-    
-    protected SchemaManager getEventSubscriptionSchemaManager() {
-        return CommandContextUtil.getProcessEngineConfiguration().getEventSubscriptionSchemaManager();
-    }
-    
-    protected SchemaManager getVariableSchemaManager() {
-        return CommandContextUtil.getProcessEngineConfiguration().getVariableSchemaManager();
-    }
-    
-    protected SchemaManager getTaskSchemaManager() {
-        return CommandContextUtil.getProcessEngineConfiguration().getTaskSchemaManager();
-    }
-    
-    protected SchemaManager getJobSchemaManager() {
-        return CommandContextUtil.getProcessEngineConfiguration().getJobSchemaManager();
-    }
-    
-    protected SchemaManager getBatchSchemaManager() {
-        return CommandContextUtil.getProcessEngineConfiguration().getBatchSchemaManager();
-    }
-    
     protected ProcessEngineConfigurationImpl getProcessEngineConfiguration() {
         return CommandContextUtil.getProcessEngineConfiguration();
     }
@@ -400,5 +291,10 @@ protected ProcessEngineConfigurationImpl getProcessEngineConfiguration() {
     protected String getResourcesRootDirectory() {
         return "org/flowable/db/";
     }
+    
+    @Override
+    public String getContext() {
+        return "bpmn";
+    }
 
 }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/eventregistry/BpmnEventRegistryEventConsumer.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/eventregistry/BpmnEventRegistryEventConsumer.java
index ad37f9ec4ee..31e0450aa85 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/eventregistry/BpmnEventRegistryEventConsumer.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/eventregistry/BpmnEventRegistryEventConsumer.java
@@ -25,8 +25,8 @@
 import org.flowable.bpmn.model.ExtensionElement;
 import org.flowable.bpmn.model.StartEvent;
 import org.flowable.common.engine.api.constant.ReferenceTypes;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.scope.ScopeTypes;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.engine.ProcessEngineConfiguration;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/test/InternalFlowableExtension.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/test/InternalFlowableExtension.java
index 3ebc2a23195..137e9360cda 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/test/InternalFlowableExtension.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/test/InternalFlowableExtension.java
@@ -170,16 +170,7 @@ protected void assertAndEnsureCleanDb(ProcessEngine processEngine, ExtensionCont
                 processEngine.getProcessEngineConfiguration(),
                 ensureCleanDb,
                 !context.getExecutionException().isPresent(),
-                new Command<>() {
-
-                    @Override
-                    public Void execute(CommandContext commandContext) {
-                        SchemaManager schemaManager = CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager();
-                        schemaManager.schemaDrop();
-                        schemaManager.schemaCreate();
-                        return null;
-                    }
-                }
+                processEngine.getProcessEngineConfiguration().getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/test/TestHelper.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/test/TestHelper.java
index ec4946308bf..dc871ad536f 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/test/TestHelper.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/test/TestHelper.java
@@ -280,15 +280,7 @@ public static void assertAndEnsureCleanDb(ProcessEngine processEngine) {
                 processEngine.getProcessEngineConfiguration(),
                 TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK,
                 true,
-                new Command<>() {
-                    @Override
-                    public Void execute(CommandContext commandContext) {
-                        SchemaManager schemaManager = CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager();
-                        schemaManager.schemaDrop();
-                        schemaManager.schemaCreate();
-                        return null;
-                    }
-                }
+                processEngine.getProcessEngineConfiguration().getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.engine.sql
index 9d399da2c2b..750181aeb98 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.cockroachdb.create.engine.sql
@@ -348,9 +348,9 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
 
 --force-commit
\ No newline at end of file
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.db2.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.db2.create.engine.sql
index e7318a7b170..74e2fc017c5 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.db2.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.db2.create.engine.sql
@@ -342,7 +342,7 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.h2.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.h2.create.engine.sql
index 159eedfb1be..21dde079ad3 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.h2.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.h2.create.engine.sql
@@ -317,7 +317,7 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
     
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.hsql.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.hsql.create.engine.sql
index b32fc9adfbd..93d3808e17d 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.hsql.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.hsql.create.engine.sql
@@ -317,7 +317,7 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mssql.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mssql.create.engine.sql
index 36704d32f3a..f606f65488b 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mssql.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mssql.create.engine.sql
@@ -337,7 +337,7 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mysql.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mysql.create.engine.sql
index 552fa84eb95..511030373fa 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mysql.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mysql.create.engine.sql
@@ -318,7 +318,7 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mysql55.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mysql55.create.engine.sql
index f2317424903..64e1d6781d6 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mysql55.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.mysql55.create.engine.sql
@@ -317,7 +317,7 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.oracle.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.oracle.create.engine.sql
index c4fd273531b..d32ccdb4eb7 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.oracle.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.oracle.create.engine.sql
@@ -348,7 +348,7 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.postgres.create.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.postgres.create.engine.sql
index 7259bacdb7f..e78a4d7e554 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.postgres.create.engine.sql
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/create/flowable.postgres.create.engine.sql
@@ -348,7 +348,7 @@ alter table ACT_PROCDEF_INFO
     unique (PROC_DEF_ID_);
 
 insert into ACT_GE_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(7.1.0.0)', 1);
+values ('schema.history', 'create(7.1.0.1)', 1);
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/upgrade/flowable.all.upgradestep.7100.to.7101.engine.sql b/modules/flowable-engine/src/main/resources/org/flowable/db/upgrade/flowable.all.upgradestep.7100.to.7101.engine.sql
new file mode 100644
index 00000000000..be9f3c72420
--- /dev/null
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/upgrade/flowable.all.upgradestep.7100.to.7101.engine.sql
@@ -0,0 +1 @@
+update ACT_GE_PROPERTY set VALUE_ = '7.1.0.1' where NAME_ = 'schema.version';
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/identity/PasswordEncoderIdmEngineConfigurator.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/identity/PasswordEncoderIdmEngineConfigurator.java
index 2feec44b201..03b48ddf948 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/identity/PasswordEncoderIdmEngineConfigurator.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/identity/PasswordEncoderIdmEngineConfigurator.java
@@ -30,7 +30,7 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
         initialiseCommonProperties(engineConfiguration, idmEngineConfiguration);
 
         idmEngineConfiguration.setPasswordEncoder(new ApacheDigester(ApacheDigester.Digester.MD5));
-        idmEngineConfiguration.buildIdmEngine();
+        initEngine();
 
         initServiceConfigurations(engineConfiguration, idmEngineConfiguration);
     }
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/mgmt/ManagementServiceTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/mgmt/ManagementServiceTest.java
index 902b3faf228..27e35676963 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/mgmt/ManagementServiceTest.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/mgmt/ManagementServiceTest.java
@@ -28,9 +28,9 @@
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableIllegalArgumentException;
 import org.flowable.common.engine.api.FlowableObjectNotFoundException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.api.management.TableMetaData;
 import org.flowable.common.engine.impl.interceptor.CommandExecutor;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.common.engine.impl.persistence.entity.PropertyEntity;
 import org.flowable.common.engine.impl.persistence.entity.PropertyEntityManager;
diff --git a/modules/flowable-engine/src/test/java/org/flowable/examples/mgmt/ManagementServiceTest.java b/modules/flowable-engine/src/test/java/org/flowable/examples/mgmt/ManagementServiceTest.java
index a49a9510e31..f27369b8d52 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/examples/mgmt/ManagementServiceTest.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/examples/mgmt/ManagementServiceTest.java
@@ -67,7 +67,7 @@ public Void execute(CommandContext commandContext) {
             
         });
 
-        assertThat(tableCount).containsEntry(tablePrefix + "ACT_GE_PROPERTY", Long.valueOf(13));
+        assertThat(tableCount).containsEntry(tablePrefix + "ACT_GE_PROPERTY", 7L);
         assertThat(tableCount.get(tablePrefix + "ACT_GE_BYTEARRAY")).isZero();
         assertThat(tableCount.get(tablePrefix + "ACT_RE_DEPLOYMENT")).isZero();
         assertThat(tableCount.get(tablePrefix + "ACT_RU_EXECUTION")).isZero();
diff --git a/modules/flowable-entitylink-service/src/main/java/org/flowable/entitylink/service/impl/db/EntityLinkDbSchemaManager.java b/modules/flowable-entitylink-service/src/main/java/org/flowable/entitylink/service/impl/db/EntityLinkDbSchemaManager.java
deleted file mode 100644
index 96cc3272053..00000000000
--- a/modules/flowable-entitylink-service/src/main/java/org/flowable/entitylink/service/impl/db/EntityLinkDbSchemaManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.entitylink.service.impl.db;
-
-import org.flowable.common.engine.impl.db.ServiceSqlScriptBasedDbSchemaManager;
-
-/**
- * @author Tijs Rademakers
- */
-public class EntityLinkDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
-    
-    private static final String TABLE = "ACT_RU_ENTITYLINK";
-    private static final String VERSION_PROPERTY = "entitylink.schema.version";
-    private static final String SCHEMA_COMPONENT = "entitylink";
-    private static final String SCHEMA_COMPONENT_HISTORY = "entitylink.history";
-    
-    public EntityLinkDbSchemaManager() {
-        super(TABLE, SCHEMA_COMPONENT, SCHEMA_COMPONENT_HISTORY, VERSION_PROPERTY);
-    }
-
-    @Override
-    protected String getResourcesRootDirectory() {
-        return "org/flowable/entitylink/service/db/";
-    }
-
-}
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.history.sql
deleted file mode 100644
index 3d9df23194b..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.history.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-    ID_ varchar(64),
-    LINK_TYPE_ varchar(255),
-    CREATE_TIME_ timestamp,
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.sql
deleted file mode 100644
index e11069bca44..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.cockroachdb.create.entitylink.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    CREATE_TIME_ timestamp,
-    LINK_TYPE_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.db2.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.db2.create.entitylink.history.sql
deleted file mode 100644
index 3f31b53bcc6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.db2.create.entitylink.history.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-    ID_ varchar(64) not null,
-    LINK_TYPE_ varchar(255),
-    CREATE_TIME_ timestamp,
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.db2.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.db2.create.entitylink.sql
deleted file mode 100644
index 1ff47642177..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.db2.create.entitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CREATE_TIME_ timestamp,
-    LINK_TYPE_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.h2.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.h2.create.entitylink.history.sql
deleted file mode 100644
index d321140a620..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.h2.create.entitylink.history.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-    ID_ varchar(64),
-    LINK_TYPE_ varchar(255),
-    CREATE_TIME_ timestamp,
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.h2.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.h2.create.entitylink.sql
deleted file mode 100644
index 78a31f57fb6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.h2.create.entitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    CREATE_TIME_ timestamp,
-    LINK_TYPE_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.hsql.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.hsql.create.entitylink.history.sql
deleted file mode 100644
index 99c3376cde4..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.hsql.create.entitylink.history.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-  ID_ varchar(64),
-  LINK_TYPE_ varchar(255),
-  CREATE_TIME_ timestamp,
-  SCOPE_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  PARENT_ELEMENT_ID_ varchar(255),
-  REF_SCOPE_ID_ varchar(255),
-  REF_SCOPE_TYPE_ varchar(255),
-  REF_SCOPE_DEFINITION_ID_ varchar(255),
-  ROOT_SCOPE_ID_ varchar(255),
-  ROOT_SCOPE_TYPE_ varchar(255),
-  HIERARCHY_TYPE_ varchar(255),
-  primary key (ID_)
-);
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.hsql.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.hsql.create.entitylink.sql
deleted file mode 100644
index 78a31f57fb6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.hsql.create.entitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    CREATE_TIME_ timestamp,
-    LINK_TYPE_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mssql.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mssql.create.entitylink.history.sql
deleted file mode 100644
index 952becda8ee..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mssql.create.entitylink.history.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-    ID_ nvarchar(64),
-    LINK_TYPE_ nvarchar(255),
-    CREATE_TIME_ datetime,
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    PARENT_ELEMENT_ID_ nvarchar(255),
-    REF_SCOPE_ID_ nvarchar(255),
-    REF_SCOPE_TYPE_ nvarchar(255),
-    REF_SCOPE_DEFINITION_ID_ nvarchar(255),
-    ROOT_SCOPE_ID_ nvarchar(255),
-    ROOT_SCOPE_TYPE_ nvarchar(255),
-    HIERARCHY_TYPE_ nvarchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mssql.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mssql.create.entitylink.sql
deleted file mode 100644
index e6a5912a61b..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mssql.create.entitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ nvarchar(64),
-    REV_ int,
-    CREATE_TIME_ datetime,
-    LINK_TYPE_ nvarchar(255),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    PARENT_ELEMENT_ID_ nvarchar(255),
-    REF_SCOPE_ID_ nvarchar(255),
-    REF_SCOPE_TYPE_ nvarchar(255),
-    REF_SCOPE_DEFINITION_ID_ nvarchar(255),
-    ROOT_SCOPE_ID_ nvarchar(255),
-    ROOT_SCOPE_TYPE_ nvarchar(255),
-    HIERARCHY_TYPE_ nvarchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql.create.entitylink.history.sql
deleted file mode 100644
index 481639a8449..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql.create.entitylink.history.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-    ID_ varchar(64),
-    LINK_TYPE_ varchar(255),
-    CREATE_TIME_ datetime(3),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql.create.entitylink.sql
deleted file mode 100644
index e02ee776583..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql.create.entitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    CREATE_TIME_ datetime(3),
-    LINK_TYPE_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql55.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql55.create.entitylink.history.sql
deleted file mode 100644
index 75be5e24860..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql55.create.entitylink.history.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-    ID_ varchar(64),
-    LINK_TYPE_ varchar(255),
-    CREATE_TIME_ datetime,
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql55.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql55.create.entitylink.sql
deleted file mode 100644
index 4305d4a29a2..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.mysql55.create.entitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    CREATE_TIME_ datetime,
-    LINK_TYPE_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.oracle.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.oracle.create.entitylink.history.sql
deleted file mode 100644
index e457601784d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.oracle.create.entitylink.history.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-    ID_ NVARCHAR2(64),
-    LINK_TYPE_ NVARCHAR2(255),
-    CREATE_TIME_ TIMESTAMP(6),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    PARENT_ELEMENT_ID_ NVARCHAR2(255),
-    REF_SCOPE_ID_ NVARCHAR2(255),
-    REF_SCOPE_TYPE_ NVARCHAR2(255),
-    REF_SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    ROOT_SCOPE_ID_ NVARCHAR2(255),
-    ROOT_SCOPE_TYPE_ NVARCHAR2(255),
-    HIERARCHY_TYPE_ NVARCHAR2(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.oracle.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.oracle.create.entitylink.sql
deleted file mode 100644
index 416a3a3d1a8..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.oracle.create.entitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ NVARCHAR2(64),
-    REV_ INTEGER,
-    CREATE_TIME_ TIMESTAMP(6),
-    LINK_TYPE_ NVARCHAR2(255),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    PARENT_ELEMENT_ID_ NVARCHAR2(255),
-    REF_SCOPE_ID_ NVARCHAR2(255),
-    REF_SCOPE_TYPE_ NVARCHAR2(255),
-    REF_SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    ROOT_SCOPE_ID_ NVARCHAR2(255),
-    ROOT_SCOPE_TYPE_ NVARCHAR2(255),
-    HIERARCHY_TYPE_ NVARCHAR2(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.postgres.create.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.postgres.create.entitylink.history.sql
deleted file mode 100644
index d321140a620..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.postgres.create.entitylink.history.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-create table ACT_HI_ENTITYLINK (
-    ID_ varchar(64),
-    LINK_TYPE_ varchar(255),
-    CREATE_TIME_ timestamp,
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.postgres.create.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.postgres.create.entitylink.sql
deleted file mode 100644
index 78a31f57fb6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/create/flowable.postgres.create.entitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_ENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    CREATE_TIME_ timestamp,
-    LINK_TYPE_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PARENT_ELEMENT_ID_ varchar(255),
-    REF_SCOPE_ID_ varchar(255),
-    REF_SCOPE_TYPE_ varchar(255),
-    REF_SCOPE_DEFINITION_ID_ varchar(255),
-    ROOT_SCOPE_ID_ varchar(255),
-    ROOT_SCOPE_TYPE_ varchar(255),
-    HIERARCHY_TYPE_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK(SCOPE_ID_, SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.history.sql
deleted file mode 100644
index a4a54604f4f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists act_hi_entitylink cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.sql
deleted file mode 100644
index cb994fa7c50..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.cockroachdb.drop.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists act_ru_entitylink cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.db2.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.db2.drop.entitylink.history.sql
deleted file mode 100644
index 609dc2dd0cb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.db2.drop.entitylink.history.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index ACT_IDX_HI_ENT_LNK_SCOPE;
-drop index ACT_IDX_HI_ENT_LNK_SCOPE_DEF;
-
-drop table ACT_HI_ENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.db2.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.db2.drop.entitylink.sql
deleted file mode 100644
index 7e80b6805a1..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.db2.drop.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index ACT_IDX_ENT_LNK_SCOPE;
-drop index ACT_IDX_ENT_LNK_SCOPE_DEF;
-
-drop table ACT_RU_ENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.h2.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.h2.drop.entitylink.history.sql
deleted file mode 100644
index 951678bc3bb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.h2.drop.entitylink.history.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists ACT_HI_ENTITYLINK cascade constraints;
-
-drop index if exists ACT_IDX_HI_ENT_LNK_SCOPE;
-drop index if exists ACT_IDX_HI_ENT_LNK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.h2.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.h2.drop.entitylink.sql
deleted file mode 100644
index 87ca62f9671..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.h2.drop.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists ACT_RU_ENTITYLINK cascade constraints;
-
-drop index if exists ACT_IDX_ENT_LNK_SCOPE;
-drop index if exists ACT_IDX_ENT_LNK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.hsql.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.hsql.drop.entitylink.history.sql
deleted file mode 100644
index 5e48a7c98dc..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.hsql.drop.entitylink.history.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists ACT_HI_ENTITYLINK cascade;
-
-drop index if exists ACT_IDX_HI_ENT_LNK_SCOPE;
-drop index if exists ACT_IDX_HI_ENT_LNK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.hsql.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.hsql.drop.entitylink.sql
deleted file mode 100644
index 9aefc92fe63..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.hsql.drop.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists ACT_RU_ENTITYLINK cascade;
-
-drop index if exists ACT_IDX_ENT_LNK_SCOPE;
-drop index if exists ACT_IDX_ENT_LNK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mssql.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mssql.drop.entitylink.history.sql
deleted file mode 100644
index a480965341e..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mssql.drop.entitylink.history.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_ENT_LNK_SCOPE') drop index ACT_HI_ENTITYLINK.ACT_IDX_HI_ENT_LNK_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_ENT_LNK_SCOPE_DEF') drop index ACT_HI_ENTITYLINK.ACT_IDX_HI_ENT_LNK_SCOPE_DEF;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_ENTITYLINK') drop table ACT_HI_ENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mssql.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mssql.drop.entitylink.sql
deleted file mode 100644
index a9a097d6939..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mssql.drop.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_ENT_LNK_SCOPE') drop index ACT_RU_ENTITYLINK.ACT_IDX_ENT_LNK_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_ENT_LNK_SCOPE_DEF') drop index ACT_RU_ENTITYLINK.ACT_IDX_ENT_LNK_SCOPE_DEF;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_ENTITYLINK') drop table ACT_RU_ENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mysql.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mysql.drop.entitylink.history.sql
deleted file mode 100644
index 9675eb84b25..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mysql.drop.entitylink.history.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index ACT_IDX_HI_ENT_LNK_SCOPE on ACT_HI_ENTITYLINK;
-drop index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK;
-
-drop table if exists ACT_HI_ENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mysql.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mysql.drop.entitylink.sql
deleted file mode 100644
index d34dcd00c35..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.mysql.drop.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index ACT_IDX_ENT_LNK_SCOPE on ACT_RU_ENTITYLINK;
-drop index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK;
-
-drop table if exists ACT_RU_ENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.oracle.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.oracle.drop.entitylink.history.sql
deleted file mode 100644
index 609dc2dd0cb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.oracle.drop.entitylink.history.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index ACT_IDX_HI_ENT_LNK_SCOPE;
-drop index ACT_IDX_HI_ENT_LNK_SCOPE_DEF;
-
-drop table ACT_HI_ENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.oracle.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.oracle.drop.entitylink.sql
deleted file mode 100644
index 7e80b6805a1..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.oracle.drop.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index ACT_IDX_ENT_LNK_SCOPE;
-drop index ACT_IDX_ENT_LNK_SCOPE_DEF;
-
-drop table ACT_RU_ENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.postgres.drop.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.postgres.drop.entitylink.history.sql
deleted file mode 100644
index 9bb4931e363..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.postgres.drop.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_HI_ENTITYLINK cascade;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.postgres.drop.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.postgres.drop.entitylink.sql
deleted file mode 100644
index 51bfd35bd94..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/drop/flowable.postgres.drop.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_RU_ENTITYLINK cascade;
\ No newline at end of file
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.entitylink.sql
deleted file mode 100644
index 038f0e6bfde..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.entitylink.sql
deleted file mode 100644
index 35e38dff29d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.entitylink.sql
deleted file mode 100644
index 16875eb9bd6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.entitylink.sql
deleted file mode 100644
index 9bb82171a8d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.entitylink.sql
deleted file mode 100644
index 6e29a25215f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.entitylink.sql
deleted file mode 100644
index cec9afbddca..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.entitylink.sql
deleted file mode 100644
index e6539308c85..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.4' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.entitylink.sql
deleted file mode 100644
index d6e1f7856c3..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.entitylink.sql
deleted file mode 100644
index 00a6ff95158..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.entitylink.sql
deleted file mode 100644
index f87fc9a1e3e..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.entitylink.sql
deleted file mode 100644
index 0136436a5ca..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.entitylink.sql
deleted file mode 100644
index c2eff4d2847..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.entitylink.sql
deleted file mode 100644
index 0b02b5c354b..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.entitylink.sql
deleted file mode 100644
index 1f3bf8a3e4a..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.5' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.entitylink.sql
deleted file mode 100644
index 50a0224cfd9..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.entitylink.sql
deleted file mode 100644
index fd795f232ad..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.entitylink.sql
deleted file mode 100644
index 6fbc43756ae..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.entitylink.sql
deleted file mode 100644
index b44f4ebdc35..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.entitylink.sql
deleted file mode 100644
index 05ba45f4fc7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.entitylink.sql
deleted file mode 100644
index 94e185d1852..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.entitylink.sql
deleted file mode 100644
index c9ac906cf19..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.1.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.entitylink.sql
deleted file mode 100644
index 7e421959537..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.entitylink.sql
deleted file mode 100644
index e1a7a824291..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.entitylink.sql
deleted file mode 100644
index 8774f947af5..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.entitylink.sql
deleted file mode 100644
index 70eb05544c3..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.3' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.entitylink.sql
deleted file mode 100644
index 769962f8c68..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.0.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.entitylink.sql
deleted file mode 100644
index 16fd4224aa3..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.entitylink.sql
deleted file mode 100644
index 2962a00163f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.0.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.entitylink.sql
deleted file mode 100644
index ea2dc948324..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.entitylink.sql
deleted file mode 100644
index d017ad36d0e..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.entitylink.sql
deleted file mode 100644
index f304ea44a19..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.entitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index df5c2b37a2f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 379eac3e2fb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index 1c531538d56..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 421b00b0edb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.cockroachdb.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6410.to.6411.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6410.to.6411.entitylink.history.sql
deleted file mode 100644
index 61a11e1ef44..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6410.to.6411.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6410.to.6411.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6410.to.6411.entitylink.sql
deleted file mode 100644
index 419da25732d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6410.to.6411.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index df5c2b37a2f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 379eac3e2fb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index 1c531538d56..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 421b00b0edb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.db2.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6410.to.6411.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6410.to.6411.entitylink.history.sql
deleted file mode 100644
index 61a11e1ef44..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6410.to.6411.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6410.to.6411.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6410.to.6411.entitylink.sql
deleted file mode 100644
index 419da25732d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6410.to.6411.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index df5c2b37a2f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 379eac3e2fb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index 1c531538d56..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 421b00b0edb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.h2.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.entitylink.history.sql
deleted file mode 100644
index 61a11e1ef44..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.entitylink.sql
deleted file mode 100644
index 419da25732d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6410.to.6411.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index df5c2b37a2f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 379eac3e2fb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index 1c531538d56..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 421b00b0edb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.hsql.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.entitylink.history.sql
deleted file mode 100644
index 4b5ee75c604..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_ENTITYLINK add HIERARCHY_TYPE_ nvarchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.entitylink.sql
deleted file mode 100644
index 967e57ac6df..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6410.to.6411.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_ENTITYLINK add HIERARCHY_TYPE_ nvarchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index 9f43b98f787..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add ROOT_SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_ENTITYLINK add ROOT_SCOPE_TYPE_ nvarchar(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 575a279047a..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add ROOT_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_ENTITYLINK add ROOT_SCOPE_TYPE_ nvarchar(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index 1250e3c4a12..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_ENTITYLINK add PARENT_ELEMENT_ID_ nvarchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 8c28f0bb749..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_ENTITYLINK add PARENT_ELEMENT_ID_ nvarchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mssql.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.entitylink.history.sql
deleted file mode 100644
index 61a11e1ef44..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.entitylink.sql
deleted file mode 100644
index 419da25732d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6410.to.6411.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index df5c2b37a2f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 379eac3e2fb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index 1c531538d56..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 421b00b0edb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6410.to.6411.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6410.to.6411.entitylink.history.sql
deleted file mode 100644
index 61a11e1ef44..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6410.to.6411.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6410.to.6411.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6410.to.6411.entitylink.sql
deleted file mode 100644
index 419da25732d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6410.to.6411.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index df5c2b37a2f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 379eac3e2fb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index 1c531538d56..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 421b00b0edb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.mysql55.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.entitylink.history.sql
deleted file mode 100644
index 09599643745..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_ENTITYLINK add HIERARCHY_TYPE_ NVARCHAR2(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.entitylink.sql
deleted file mode 100644
index 40b1a28a177..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6410.to.6411.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_ENTITYLINK add HIERARCHY_TYPE_ NVARCHAR2(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index e5d908b607d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add ROOT_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_HI_ENTITYLINK add ROOT_SCOPE_TYPE_ NVARCHAR2(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 508c21909a5..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add ROOT_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_ENTITYLINK add ROOT_SCOPE_TYPE_ NVARCHAR2(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index c2b51495ec9..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_HI_ENTITYLINK add PARENT_ELEMENT_ID_ NVARCHAR2(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 33252936546..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_ENTITYLINK add PARENT_ELEMENT_ID_ NVARCHAR2(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.oracle.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.entitylink.history.sql
deleted file mode 100644
index 61a11e1ef44..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.entitylink.sql
deleted file mode 100644
index 419da25732d..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6410.to.6411.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column HIERARCHY_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.entitylink.history.sql
deleted file mode 100644
index df5c2b37a2f..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.entitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.entitylink.sql
deleted file mode 100644
index 379eac3e2fb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6510.to.6511.entitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column ROOT_SCOPE_TYPE_ varchar(255);
-create index ACT_IDX_ENT_LNK_ROOT_SCOPE on ACT_RU_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.entitylink.history.sql
deleted file mode 100644
index 1c531538d56..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.entitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table ACT_HI_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.entitylink.sql
deleted file mode 100644
index 421b00b0edb..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6515.to.6516.entitylink.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_ENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_ENTITYLINK add column PARENT_ELEMENT_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.entitylink.history.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.entitylink.history.sql
deleted file mode 100644
index 3643d56e5e7..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.entitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
diff --git a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.entitylink.sql b/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.entitylink.sql
deleted file mode 100644
index 2fe372db6a6..00000000000
--- a/modules/flowable-entitylink-service/src/main/resources/org/flowable/entitylink/service/db/upgrade/flowable.postgres.upgradestep.6600.to.6601.entitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_ENT_LNK_REF_SCOPE on ACT_RU_ENTITYLINK(REF_SCOPE_ID_, REF_SCOPE_TYPE_, LINK_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'entitylink.schema.version';
diff --git a/modules/flowable-event-registry-api/src/main/java/org/flowable/eventregistry/api/EventManagementService.java b/modules/flowable-event-registry-api/src/main/java/org/flowable/eventregistry/api/EventManagementService.java
index 967942cc57f..0536c7c549e 100644
--- a/modules/flowable-event-registry-api/src/main/java/org/flowable/eventregistry/api/EventManagementService.java
+++ b/modules/flowable-event-registry-api/src/main/java/org/flowable/eventregistry/api/EventManagementService.java
@@ -15,6 +15,8 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.flowable.common.engine.api.lock.LockManager;
+
 public interface EventManagementService {
 
     /**
@@ -34,4 +36,15 @@ public interface EventManagementService {
      */
     void executeEventRegistryChangeDetection();
 
+    /**
+     * Acquire a lock manager for the requested lock.
+     * This is a stateless call, this means that every time a lock manager
+     * is requested a new one would be created. Make sure that you release the lock
+     * once you are done.
+     *
+     * @param lockName the name of the lock that is being requested
+     *
+     * @return the lock manager for the given lock
+     */
+    LockManager getLockManager(String lockName);
 }
diff --git a/modules/flowable-event-registry-configurator/src/main/java/org/flowable/eventregistry/impl/configurator/EventRegistryEngineConfigurator.java b/modules/flowable-event-registry-configurator/src/main/java/org/flowable/eventregistry/impl/configurator/EventRegistryEngineConfigurator.java
index 8f110196319..abac71899d7 100644
--- a/modules/flowable-event-registry-configurator/src/main/java/org/flowable/eventregistry/impl/configurator/EventRegistryEngineConfigurator.java
+++ b/modules/flowable-event-registry-configurator/src/main/java/org/flowable/eventregistry/impl/configurator/EventRegistryEngineConfigurator.java
@@ -31,9 +31,8 @@
  * @author Tijs Rademakers
  * @author Joram Barrez
  */
-public class EventRegistryEngineConfigurator extends AbstractEngineConfigurator {
+public class EventRegistryEngineConfigurator extends AbstractEngineConfigurator<EventRegistryEngine> {
 
-    protected EventRegistryEngine eventRegistryEngine;
     protected EventRegistryEngineConfiguration eventEngineConfiguration;
 
     @Override
@@ -61,7 +60,7 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
 
         initialiseEventRegistryEngineConfiguration(eventEngineConfiguration);
         initialiseCommonProperties(engineConfiguration, eventEngineConfiguration);
-        this.eventRegistryEngine = initEventRegistryEngine();
+        initEngine();
         initServiceConfigurations(engineConfiguration, eventEngineConfiguration);
     }
 
@@ -79,7 +78,8 @@ protected List<Class<? extends Entity>> getEntityDeletionOrder() {
         return EntityDependencyOrder.DELETE_ORDER;
     }
 
-    protected synchronized EventRegistryEngine initEventRegistryEngine() {
+    @Override
+    protected EventRegistryEngine buildEngine() {
         if (eventEngineConfiguration == null) {
             throw new FlowableException("EventRegistryEngineConfiguration is required");
         }
@@ -97,10 +97,10 @@ public EventRegistryEngineConfigurator setEventEngineConfiguration(EventRegistry
     }
 
     public EventRegistryEngine getEventRegistryEngine() {
-        return eventRegistryEngine;
+        return buildEngine;
     }
 
     public void setEventRegistryEngine(EventRegistryEngine eventRegistryEngine) {
-        this.eventRegistryEngine = eventRegistryEngine;
+        this.buildEngine = eventRegistryEngine;
     }
 }
\ No newline at end of file
diff --git a/modules/flowable-event-registry-rest/src/test/java/org/flowable/eventregistry/rest/service/BaseSpringRestTestCase.java b/modules/flowable-event-registry-rest/src/test/java/org/flowable/eventregistry/rest/service/BaseSpringRestTestCase.java
index 691cb3ee0e1..0ee32e4a056 100644
--- a/modules/flowable-event-registry-rest/src/test/java/org/flowable/eventregistry/rest/service/BaseSpringRestTestCase.java
+++ b/modules/flowable-event-registry-rest/src/test/java/org/flowable/eventregistry/rest/service/BaseSpringRestTestCase.java
@@ -318,12 +318,7 @@ protected void assertAndEnsureCleanDb() throws Throwable {
                 eventRegistryEngineConfiguration,
                 TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK,
                 exception == null,
-                commandContext -> {
-                    SchemaManager schemaManager = CommandContextUtil.getEventRegistryConfiguration(commandContext).getSchemaManager();
-                    schemaManager.schemaDrop();
-                    schemaManager.schemaCreate();
-                    return null;
-                }
+                eventRegistryEngineConfiguration.getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-event-registry-spring-configurator/src/main/java/org/flowable/eventregistry/spring/configurator/SpringEventRegistryConfigurator.java b/modules/flowable-event-registry-spring-configurator/src/main/java/org/flowable/eventregistry/spring/configurator/SpringEventRegistryConfigurator.java
index 22418b83411..ff5502139cd 100644
--- a/modules/flowable-event-registry-spring-configurator/src/main/java/org/flowable/eventregistry/spring/configurator/SpringEventRegistryConfigurator.java
+++ b/modules/flowable-event-registry-spring-configurator/src/main/java/org/flowable/eventregistry/spring/configurator/SpringEventRegistryConfigurator.java
@@ -12,10 +12,8 @@
  */
 package org.flowable.eventregistry.spring.configurator;
 
-import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.spring.SpringEngineConfiguration;
-import org.flowable.eventregistry.impl.EventRegistryEngine;
 import org.flowable.eventregistry.impl.configurator.EventRegistryEngineConfigurator;
 import org.flowable.eventregistry.spring.SpringEventRegistryEngineConfiguration;
 
@@ -44,16 +42,8 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
             eventEngineConfiguration.setBeans(engineConfiguration.getBeans());
         }
 
-        initEventRegistryEngine();
+        initEngine();
         initServiceConfigurations(engineConfiguration, eventEngineConfiguration);
     }
 
-    @Override
-    protected synchronized EventRegistryEngine initEventRegistryEngine() {
-        if (eventEngineConfiguration == null) {
-            throw new FlowableException("EventRegistryEngineConfiguration is required");
-        }
-
-        return eventEngineConfiguration.buildEventRegistryEngine();
-    }
 }
diff --git a/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/SpringEventRegistryEngineConfiguration.java b/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/SpringEventRegistryEngineConfiguration.java
index 54d3799a80e..96c718ac877 100644
--- a/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/SpringEventRegistryEngineConfiguration.java
+++ b/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/SpringEventRegistryEngineConfiguration.java
@@ -69,8 +69,8 @@ public SpringEventRegistryEngineConfiguration() {
     }
     
     @Override
-    public EventRegistryEngine buildEventRegistryEngine() {
-        EventRegistryEngine eventRegistryEngine = super.buildEventRegistryEngine();
+    public EventRegistryEngine buildEngine() {
+        EventRegistryEngine eventRegistryEngine = super.buildEngine();
         EventRegistryEngines.setInitialized(true);
         enginesBuild.add(eventRegistryEngine.getName());
         return eventRegistryEngine;
diff --git a/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/autodeployment/AbstractEventAutoDeploymentStrategy.java b/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/autodeployment/AbstractEventAutoDeploymentStrategy.java
index 4a973ded995..d795ae1ee51 100644
--- a/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/autodeployment/AbstractEventAutoDeploymentStrategy.java
+++ b/modules/flowable-event-registry-spring/src/main/java/org/flowable/eventregistry/spring/autodeployment/AbstractEventAutoDeploymentStrategy.java
@@ -17,7 +17,7 @@
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 
-import org.flowable.common.engine.impl.lock.LockManager;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.spring.CommonAutoDeploymentProperties;
 import org.flowable.common.spring.CommonAutoDeploymentStrategy;
 import org.flowable.eventregistry.api.EventDeploymentBuilder;
diff --git a/modules/flowable-event-registry/pom.xml b/modules/flowable-event-registry/pom.xml
index 8455842fb72..2138c6f08a7 100644
--- a/modules/flowable-event-registry/pom.xml
+++ b/modules/flowable-event-registry/pom.xml
@@ -69,10 +69,6 @@
         </dependency>
 
         <!-- DATABASE -->
-        <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.h2database</groupId>
@@ -128,7 +124,8 @@
             org.flowable.eventregistry.impl
         </flowable.artifact>
         <flowable.osgi.export.additional>
-            org.flowable.eventregistry.db.liquibase,
+            org.flowable.eventregistry.db.create,
+            org.flowable.eventregistry.db.upgrade,
             org.flowable.eventregistry.db.mapping.entity,
         </flowable.osgi.export.additional>
         <flowable.osgi.import.additional>
@@ -136,7 +133,6 @@
             org.junit*;resolution:=optional,
             org.junit.jupiter*;resolution:=optional,
             com.sun*;resolution:=optional,
-            liquibase*;resolution:=optional,
             jakarta.activation*;resolution:=optional,
             jakarta.persistence*;resolution:=optional,
             jakarta.mail*;resolution:=optional,
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventManagementServiceImpl.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventManagementServiceImpl.java
index abbe355f8c8..1271507f75d 100644
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventManagementServiceImpl.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventManagementServiceImpl.java
@@ -15,7 +15,9 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.impl.cmd.GetTableCountCmd;
+import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.common.engine.impl.service.CommonEngineServiceImpl;
 import org.flowable.eventregistry.api.EventManagementService;
 import org.flowable.eventregistry.impl.cmd.GetTableNamesCmd;
@@ -43,5 +45,10 @@ public Collection<String> getTableNames() {
     public void executeEventRegistryChangeDetection() {
         configuration.getEventRegistryChangeDetectionManager().detectChanges();
     }
+    
+    @Override
+    public LockManager getLockManager(String lockName) {
+        return new LockManagerImpl(commandExecutor, lockName, getConfiguration().getLockPollRate(), configuration.getEngineCfgKey());
+    }
 
 }
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineConfiguration.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineConfiguration.java
index 894d2f6c12d..adaee476f96 100755
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineConfiguration.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineConfiguration.java
@@ -21,10 +21,12 @@
 import java.util.function.Consumer;
 
 import org.flowable.common.engine.api.scope.ScopeTypes;
+import org.flowable.common.engine.impl.AbstractBuildableEngineConfiguration;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.HasExpressionManagerEngineConfiguration;
 import org.flowable.common.engine.impl.cfg.BeansConfigurationHelper;
 import org.flowable.common.engine.impl.db.DbSqlSessionFactory;
+import org.flowable.common.engine.impl.db.SchemaManager;
 import org.flowable.common.engine.impl.el.DefaultExpressionManager;
 import org.flowable.common.engine.impl.el.ExpressionManager;
 import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
@@ -48,7 +50,6 @@
 import org.flowable.eventregistry.api.management.EventRegistryChangeDetectionManager;
 import org.flowable.eventregistry.impl.cfg.StandaloneEventRegistryEngineConfiguration;
 import org.flowable.eventregistry.impl.cfg.StandaloneInMemEventRegistryEngineConfiguration;
-import org.flowable.eventregistry.impl.cmd.SchemaOperationsEventRegistryEngineBuild;
 import org.flowable.eventregistry.impl.db.EntityDependencyOrder;
 import org.flowable.eventregistry.impl.db.EventDbSchemaManager;
 import org.flowable.eventregistry.impl.deployer.CachingAndArtifactsManager;
@@ -91,17 +92,11 @@
 import org.flowable.eventregistry.json.converter.ChannelJsonConverter;
 import org.flowable.eventregistry.json.converter.EventJsonConverter;
 
-import liquibase.Liquibase;
-import liquibase.database.Database;
-import liquibase.exception.DatabaseException;
-
-public class EventRegistryEngineConfiguration extends AbstractEngineConfiguration
+public class EventRegistryEngineConfiguration extends AbstractBuildableEngineConfiguration<EventRegistryEngine>
         implements EventRegistryConfigurationApi, HasExpressionManagerEngineConfiguration {
 
     public static final String DEFAULT_MYBATIS_MAPPING_FILE = "org/flowable/eventregistry/db/mapping/mappings.xml";
 
-    public static final String LIQUIBASE_CHANGELOG_PREFIX = "FLW_EV_";
-
     protected String eventRegistryEngineName = EventRegistryEngines.NAME_DEFAULT;
 
     // SERVICES
@@ -205,25 +200,24 @@ public static EventRegistryEngineConfiguration createStandaloneInMemEventRegistr
     // buildEventRegistryEngine
     // ///////////////////////////////////////////////////////
 
-    public EventRegistryEngine buildEventRegistryEngine() {
-        init();
-        EventRegistryEngineImpl eventRegistryEngine = new EventRegistryEngineImpl(this);
-
-        if (enableEventRegistryChangeDetectionAfterEngineCreate) {
-
-            eventRegistryEngine.handleDeployedChannelDefinitions();
+    @Override
+    protected EventRegistryEngine createEngine() {
+        return new EventRegistryEngineImpl(this);
+    }
 
-            if (enableEventRegistryChangeDetection) {
-                eventRegistryChangeDetectionExecutor.initialize();
-            }
-        }
+    @Override
+    protected Consumer<EventRegistryEngine> createPostEngineBuildConsumer() {
+        return new EventRegistryEnginePostEngineBuildConsumer();
+    }
 
-        return eventRegistryEngine;
+    public EventRegistryEngine buildEventRegistryEngine() {
+        return buildEngine();
     }
 
     // init
     // /////////////////////////////////////////////////////////////////////
 
+    @Override
     protected void init() {
         initEngineConfigurations();
         initConfigurators();
@@ -341,32 +335,8 @@ public void initEntityManagers() {
     // data model ///////////////////////////////////////////////////////////////
 
     @Override
-    public void initSchemaManager() {
-        super.initSchemaManager();
-        if (this.schemaManager == null) {
-            this.schemaManager = new EventDbSchemaManager();
-        }
-    }
-    
-    public void initSchemaManagementCommand() {
-        if (schemaManagementCmd == null) {
-            if (usingRelationalDatabase && databaseSchemaUpdate != null) {
-                this.schemaManagementCmd = new SchemaOperationsEventRegistryEngineBuild();
-            }
-        }
-    }
-
-    private void closeDatabase(Liquibase liquibase) {
-        if (liquibase != null) {
-            Database database = liquibase.getDatabase();
-            if (database != null) {
-                try {
-                    database.close();
-                } catch (DatabaseException e) {
-                    logger.warn("Error closing database", e);
-                }
-            }
-        }
+    protected SchemaManager createEngineSchemaManager() {
+        return new EventDbSchemaManager();
     }
 
     // session factories ////////////////////////////////////////////////////////
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineImpl.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineImpl.java
index 57b32eb7258..44c305a7aa4 100644
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineImpl.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineImpl.java
@@ -54,12 +54,6 @@ public EventRegistryEngineImpl(EventRegistryEngineConfiguration engineConfigurat
         }
 
         EventRegistryEngines.registerEventRegistryEngine(this);
-
-        if (engineConfiguration.getEngineLifecycleListeners() != null) {
-            for (EngineLifecycleListener engineLifecycleListener : engineConfiguration.getEngineLifecycleListeners()) {
-                engineLifecycleListener.onEngineBuilt(this);
-            }
-        }
     }
     
     @Override
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEnginePostEngineBuildConsumer.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEnginePostEngineBuildConsumer.java
new file mode 100644
index 00000000000..cf609dad7ef
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEnginePostEngineBuildConsumer.java
@@ -0,0 +1,42 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.eventregistry.impl;
+
+import java.util.function.Consumer;
+
+import org.flowable.common.engine.api.engine.EngineLifecycleListener;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class EventRegistryEnginePostEngineBuildConsumer implements Consumer<EventRegistryEngine> {
+
+    @Override
+    public void accept(EventRegistryEngine eventRegistryEngine) {
+        EventRegistryEngineConfiguration engineConfiguration = eventRegistryEngine.getEventRegistryEngineConfiguration();
+        if (engineConfiguration.getEngineLifecycleListeners() != null) {
+            for (EngineLifecycleListener engineLifecycleListener : engineConfiguration.getEngineLifecycleListeners()) {
+                engineLifecycleListener.onEngineBuilt(eventRegistryEngine);
+            }
+        }
+
+        if (engineConfiguration.isEnableEventRegistryChangeDetectionAfterEngineCreate()) {
+
+            eventRegistryEngine.handleDeployedChannelDefinitions();
+
+            if (engineConfiguration.isEnableEventRegistryChangeDetection()) {
+                engineConfiguration.getEventRegistryChangeDetectionExecutor().initialize();
+            }
+        }
+    }
+}
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/aot/FlowableEventRegistryRuntimeHints.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/aot/FlowableEventRegistryRuntimeHints.java
index 772beee6752..84f92b4fb30 100644
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/aot/FlowableEventRegistryRuntimeHints.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/aot/FlowableEventRegistryRuntimeHints.java
@@ -12,14 +12,7 @@
  */
 package org.flowable.eventregistry.impl.aot;
 
-import java.util.Collections;
-
 import org.flowable.common.engine.impl.aot.FlowableMyBatisResourceHintsRegistrar;
-import org.flowable.eventregistry.impl.db.SetChannelDefinitionTypeAndImplementationCustomChange;
-import org.flowable.eventregistry.impl.persistence.ResourceRefTypeHandler;
-import org.springframework.aot.hint.ExecutableMode;
-import org.springframework.aot.hint.MemberCategory;
-import org.springframework.aot.hint.ResourceHints;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 
@@ -30,12 +23,6 @@ public class FlowableEventRegistryRuntimeHints implements RuntimeHintsRegistrar
 
     @Override
     public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-        ResourceHints resourceHints = hints.resources();
         FlowableMyBatisResourceHintsRegistrar.registerMappingResources("org/flowable/eventregistry/db/mapping", hints, classLoader);
-        resourceHints.registerPattern("org/flowable/eventregistry/db/liquibase/flowable-eventregistry-db-changelog.xml");
-        hints.reflection()
-                .registerType(SetChannelDefinitionTypeAndImplementationCustomChange.class,
-                        hint -> hint.withConstructor(Collections.emptyList(), ExecutableMode.INVOKE))
-                .registerType(ResourceRefTypeHandler.class, MemberCategory.values());
     }
 }
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/cmd/SchemaOperationsEventRegistryEngineBuild.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/cmd/SchemaOperationsEventRegistryEngineBuild.java
deleted file mode 100644
index dbcdc6a2b47..00000000000
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/cmd/SchemaOperationsEventRegistryEngineBuild.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.eventregistry.impl.cmd;
-
-import org.flowable.common.engine.impl.interceptor.Command;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
-import org.flowable.eventregistry.impl.EventRegistryEngineConfiguration;
-import org.flowable.eventregistry.impl.db.EventDbSchemaManager;
-import org.flowable.eventregistry.impl.util.CommandContextUtil;
-
-/**
- * @author Joram Barrez
- */
-public class SchemaOperationsEventRegistryEngineBuild implements Command<Void> {
-
-    @Override
-    public Void execute(CommandContext commandContext) {
-        EventRegistryEngineConfiguration configuration = CommandContextUtil.getEventRegistryConfiguration(commandContext);
-        ((EventDbSchemaManager) configuration.getSchemaManager()).initSchema(configuration);
-        return null;
-    }
-
-}
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/DbSchemaDrop.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/DbSchemaDrop.java
index 270c4258302..a285bc30b4c 100644
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/DbSchemaDrop.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/DbSchemaDrop.java
@@ -13,52 +13,21 @@
 
 package org.flowable.eventregistry.impl.db;
 
-import javax.sql.DataSource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.flowable.eventregistry.impl.EventRegistryEngine;
-import org.flowable.eventregistry.impl.EventRegistryEngineConfiguration;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
+import org.flowable.common.engine.impl.interceptor.CommandConfig;
+import org.flowable.common.engine.impl.interceptor.CommandExecutor;
+import org.flowable.eventregistry.impl.EventRegistryEngineImpl;
 import org.flowable.eventregistry.impl.EventRegistryEngines;
 
-import liquibase.Liquibase;
-import liquibase.database.Database;
-import liquibase.database.DatabaseConnection;
-import liquibase.database.DatabaseFactory;
-import liquibase.database.jvm.JdbcConnection;
-import liquibase.resource.ClassLoaderResourceAccessor;
-
 /**
  * @author Tijs Rademakers
  */
 public class DbSchemaDrop {
 
     public static void main(String[] args) {
-        try {
-            EventRegistryEngine eventRegistryEngine = EventRegistryEngines.getDefaultEventRegistryEngine();
-            EventRegistryEngineConfiguration eventRegistryEngineConfiguration = eventRegistryEngine.getEventRegistryEngineConfiguration();
-            DataSource dataSource = eventRegistryEngineConfiguration.getDataSource();
-
-            DatabaseConnection connection = new JdbcConnection(dataSource.getConnection());
-            Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(connection);
-            database.setDatabaseChangeLogTableName(EventRegistryEngineConfiguration.LIQUIBASE_CHANGELOG_PREFIX + database.getDatabaseChangeLogTableName());
-            database.setDatabaseChangeLogLockTableName(EventRegistryEngineConfiguration.LIQUIBASE_CHANGELOG_PREFIX + database.getDatabaseChangeLogLockTableName());
-
-            if (StringUtils.isNotEmpty(eventRegistryEngineConfiguration.getDatabaseSchema())) {
-                database.setDefaultSchemaName(eventRegistryEngineConfiguration.getDatabaseSchema());
-                database.setLiquibaseSchemaName(eventRegistryEngineConfiguration.getDatabaseSchema());
-            }
-
-            if (StringUtils.isNotEmpty(eventRegistryEngineConfiguration.getDatabaseCatalog())) {
-                database.setDefaultCatalogName(eventRegistryEngineConfiguration.getDatabaseCatalog());
-                database.setLiquibaseCatalogName(eventRegistryEngineConfiguration.getDatabaseCatalog());
-            }
-
-            Liquibase liquibase = new Liquibase("org/flowable/eventregistry/db/liquibase/flowable-eventregistry-db-changelog.xml", new ClassLoaderResourceAccessor(), database);
-            liquibase.dropAll();
-            liquibase.getDatabase().close();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        EventRegistryEngineImpl eventRegistryEngine = (EventRegistryEngineImpl) EventRegistryEngines.getDefaultEventRegistryEngine();
+        CommandExecutor commandExecutor = eventRegistryEngine.getEventRegistryEngineConfiguration().getCommandExecutor();
+        CommandConfig config = new CommandConfig().transactionNotSupported();
+        commandExecutor.execute(config, new SchemaOperationsEngineDropDbCmd(eventRegistryEngine.getEventRegistryEngineConfiguration().getEngineScopeType()));
     }
 }
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/EventDbSchemaManager.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/EventDbSchemaManager.java
index 99c06f32cbd..8ab96d07722 100644
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/EventDbSchemaManager.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/EventDbSchemaManager.java
@@ -12,59 +12,85 @@
  */
 package org.flowable.eventregistry.impl.db;
 
-import org.flowable.common.engine.impl.db.EngineDatabaseConfiguration;
-import org.flowable.common.engine.impl.db.LiquibaseBasedSchemaManager;
-import org.flowable.common.engine.impl.db.LiquibaseDatabaseConfiguration;
-import org.flowable.common.engine.impl.db.SchemaManager;
-import org.flowable.eventregistry.impl.EventRegistryEngineConfiguration;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.db.EngineSqlScriptBasedDbSchemaManager;
+import org.flowable.eventregistry.impl.EventRegistryEngine;
+import org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd;
 import org.flowable.eventregistry.impl.util.CommandContextUtil;
 
-public class EventDbSchemaManager extends LiquibaseBasedSchemaManager {
-    
-    public static final String LIQUIBASE_CHANGELOG = "org/flowable/eventregistry/db/liquibase/flowable-eventregistry-db-changelog.xml";
+public class EventDbSchemaManager extends EngineSqlScriptBasedDbSchemaManager {
+
+    protected static final String EVENTREGISTRY_DB_SCHEMA_LOCK_NAME = "eventRegistryDbSchemaLock";
+
+    protected static final Map<String, String> changeLogVersionMap = Map.ofEntries(
+            Map.entry("1", "6.5.0.6"),
+            Map.entry("2", "6.7.2.0"),
+            Map.entry("3", "6.7.2.0"),
+            Map.entry("4", "7.1.0.0"),
+            Map.entry("5", "7.1.0.0")
+    );
 
     public EventDbSchemaManager() {
-        super("eventregistry", LIQUIBASE_CHANGELOG, EventRegistryEngineConfiguration.LIQUIBASE_CHANGELOG_PREFIX);
+        super("eventregistry");
     }
 
     @Override
-    protected LiquibaseDatabaseConfiguration getDatabaseConfiguration() {
-        return new EngineDatabaseConfiguration(CommandContextUtil.getEventRegistryConfiguration());
+    protected String getEngineVersion() {
+        return EventRegistryEngine.VERSION;
     }
 
-    public void initSchema(EventRegistryEngineConfiguration eventRegistryConfiguration) {
-        initSchema(eventRegistryConfiguration.getDatabaseSchemaUpdate());
+    @Override
+    protected String getSchemaVersionPropertyName() {
+        return "eventregistry.schema.version";
     }
 
     @Override
-    public void schemaCreate() {
-        getCommonSchemaManager().schemaCreate();
-        super.schemaCreate();
+    protected String getDbSchemaLockName() {
+        return EVENTREGISTRY_DB_SCHEMA_LOCK_NAME;
     }
 
     @Override
-    public void schemaDrop() {
-        try {
-            super.schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping event registry engine tables", e);
-        }
+    protected String getEngineTableName() {
+        return "FLW_EVENT_DEFINITION";
+    }
 
-        try {
-            getCommonSchemaManager().schemaDrop();
-        } catch (Exception e) {
-            logger.info("Error dropping common tables", e);
+    @Override
+    protected String getChangeLogTableName() {
+        return "FLW_EV_DATABASECHANGELOG";
+    }
+    
+    @Override
+    protected String getChangeLogTablePrefixName() {
+        return "FLW_EV";
+    }
+
+    @Override
+    protected String getDbVersionForChangelogVersion(String changeLogVersion) {
+        if (StringUtils.isNotEmpty(changeLogVersion) && changeLogVersionMap.containsKey(changeLogVersion)) {
+            return changeLogVersionMap.get(changeLogVersion);
         }
+        return "6.5.0.0";
     }
 
     @Override
-    public String schemaUpdate() {
-        getCommonSchemaManager().schemaUpdate();
-        return super.schemaUpdate();
+    protected AbstractEngineConfiguration getEngineConfiguration() {
+        return CommandContextUtil.getEventRegistryConfiguration();
+    }
+    
+    @Override
+    protected void dbSchemaUpgraded(ChangeLogVersion changeLogVersion) {
+        String version = changeLogVersion.version();
+        if ("1".equals(version) || "2".equals(version)) {
+            getEngineConfiguration().getCommandExecutor().execute(new UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd());
+        }
     }
 
-    protected SchemaManager getCommonSchemaManager() {
-        return CommandContextUtil.getEventRegistryConfiguration().getCommonSchemaManager();
+    @Override
+    protected String getResourcesRootDirectory() {
+        return "org/flowable/eventregistry/db/";
     }
 
 }
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/SetChannelDefinitionTypeAndImplementationCustomChange.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/SetChannelDefinitionTypeAndImplementationCustomChange.java
deleted file mode 100644
index 63d8f6a05f2..00000000000
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/SetChannelDefinitionTypeAndImplementationCustomChange.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.eventregistry.impl.db;
-
-import org.flowable.common.engine.impl.context.Context;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
-import org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd;
-
-import liquibase.change.custom.CustomTaskChange;
-import liquibase.database.Database;
-import liquibase.exception.CustomChangeException;
-import liquibase.exception.SetupException;
-import liquibase.exception.ValidationErrors;
-import liquibase.resource.ResourceAccessor;
-
-/**
- * @author Filip Hrisafov
- */
-public class SetChannelDefinitionTypeAndImplementationCustomChange implements CustomTaskChange {
-
-    @Override
-    public void execute(Database database) throws CustomChangeException {
-
-        CommandContext commandContext = Context.getCommandContext();
-        if (commandContext != null) {
-            new UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd().execute(commandContext);
-        }
-    }
-
-    @Override
-    public String getConfirmationMessage() {
-        return "Set Channel Definition type and implementation columns";
-    }
-
-    @Override
-    public void setUp() throws SetupException {
-
-    }
-
-    @Override
-    public void setFileOpener(ResourceAccessor resourceAccessor) {
-
-    }
-
-    @Override
-    public ValidationErrors validate(Database database) {
-        return new ValidationErrors();
-    }
-}
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/test/FlowableEventExtension.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/test/FlowableEventExtension.java
index f7213a3947c..95ea56fdf81 100644
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/test/FlowableEventExtension.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/test/FlowableEventExtension.java
@@ -169,16 +169,7 @@ protected void assertAndEnsureCleanDb(EventRegistryEngine eventRegistryEngine, E
                 eventRegistryEngine.getEventRegistryEngineConfiguration(),
                 ensureCleanDb,
                 !context.getExecutionException().isPresent(),
-                new Command<>() {
-
-                    @Override
-                    public Void execute(CommandContext commandContext) {
-                        SchemaManager schemaManager = CommandContextUtil.getEventRegistryConfiguration(commandContext).getSchemaManager();
-                        schemaManager.schemaDrop();
-                        schemaManager.schemaCreate();
-                        return null;
-                    }
-                }
+                eventRegistryEngine.getEventRegistryEngineConfiguration().getSchemaManagementCmd()
 
         );
     }
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.db2.create.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.db2.create.eventregistry.sql
new file mode 100644
index 00000000000..87cba89e1a7
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.db2.create.eventregistry.sql
@@ -0,0 +1,22 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP(3), TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_FLW_EVENT_DEPL PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_FLW_EVENT_RESO PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_FLW_EVENT_DEFI PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), CREATE_TIME_ TIMESTAMP(3), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_FLW_CHANNEL_DE PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE FLW_CHANNEL_DEFINITION');
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE FLW_CHANNEL_DEFINITION');
+
+insert into ACT_GE_PROPERTY
+values ('eventregistry.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.h2.create.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.h2.create.eventregistry.sql
new file mode 100644
index 00000000000..944a2d46998
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.h2.create.eventregistry.sql
@@ -0,0 +1,18 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INT, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INT, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), CREATE_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
+
+insert into ACT_GE_PROPERTY
+values ('eventregistry.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.mssql.create.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.mssql.create.eventregistry.sql
new file mode 100644
index 00000000000..2e345e94933
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.mssql.create.eventregistry.sql
@@ -0,0 +1,38 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ varchar(255) NOT NULL, NAME_ varchar(255), CATEGORY_ varchar(255), DEPLOY_TIME_ datetime, TENANT_ID_ varchar(255), PARENT_DEPLOYMENT_ID_ varchar(255), CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ varchar(255) NOT NULL, NAME_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_BYTES_ varbinary(MAX), CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ varchar(255) NOT NULL, NAME_ varchar(255), VERSION_ int, KEY_ varchar(255), CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), TENANT_ID_ varchar(255), RESOURCE_NAME_ varchar(255), DESCRIPTION_ varchar(255), CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ varchar(255) NOT NULL, NAME_ varchar(255), VERSION_ int, KEY_ varchar(255), CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), CREATE_TIME_ datetime, TENANT_ID_ varchar(255), RESOURCE_NAME_ varchar(255), DESCRIPTION_ varchar(255), CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ varchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ varchar(255);
+
+ALTER TABLE FLW_EVENT_DEPLOYMENT ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_RESOURCE ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ALTER COLUMN CATEGORY_ nvarchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ALTER COLUMN RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_DEFINITION ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_DEFINITION ALTER COLUMN CATEGORY_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_DEFINITION ALTER COLUMN RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ALTER COLUMN DESCRIPTION_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_DEFINITION ALTER COLUMN DESCRIPTION_ nvarchar(255);
+
+insert into ACT_GE_PROPERTY
+values ('eventregistry.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.mysql.create.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.mysql.create.eventregistry.sql
new file mode 100644
index 00000000000..f29c1f82634
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.mysql.create.eventregistry.sql
@@ -0,0 +1,18 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime(3) NULL, TENANT_ID_ VARCHAR(255) NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, VERSION_ INT NULL, KEY_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(255) NULL, DESCRIPTION_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, VERSION_ INT NULL, KEY_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, CREATE_TIME_ datetime(3) NULL, TENANT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(255) NULL, DESCRIPTION_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255) NULL;
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255) NULL;
+
+insert into ACT_GE_PROPERTY
+values ('eventregistry.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.oracle.create.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.oracle.create.eventregistry.sql
new file mode 100644
index 00000000000..7e0dcc9908f
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.oracle.create.eventregistry.sql
@@ -0,0 +1,18 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP(3), TENANT_ID_ VARCHAR2(255), PARENT_DEPLOYMENT_ID_ VARCHAR2(255), CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), VERSION_ INTEGER, KEY_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(255), DESCRIPTION_ VARCHAR2(255), CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), VERSION_ INTEGER, KEY_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), CREATE_TIME_ TIMESTAMP(3), TENANT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(255), DESCRIPTION_ VARCHAR2(255), CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR2(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR2(255);
+
+insert into ACT_GE_PROPERTY
+values ('eventregistry.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.postgres.create.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.postgres.create.eventregistry.sql
new file mode 100644
index 00000000000..09d5af96d6a
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/create/flowable.postgres.create.eventregistry.sql
@@ -0,0 +1,18 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT "FLW_EVENT_DEPLOYMENT_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT "FLW_EVENT_RESOURCE_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT "FLW_EVENT_DEFINITION_pkey" PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), CREATE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE, TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT "FLW_CHANNEL_DEFINITION_pkey" PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
+
+insert into ACT_GE_PROPERTY
+values ('eventregistry.schema.version', '7.1.0.1', 1);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.h2.drop.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.h2.drop.eventregistry.sql
new file mode 100644
index 00000000000..eeaa7dbb273
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.h2.drop.eventregistry.sql
@@ -0,0 +1,7 @@
+drop index if exists ACT_IDX_CHANNEL_DEF_UNIQ;
+drop index if exists ACT_IDX_EVENT_DEF_UNIQ;
+
+drop table if exists FLW_CHANNEL_DEFINITION cascade constraints;
+drop table if exists FLW_EVENT_DEFINITION cascade constraints;
+drop table if exists FLW_EVENT_RESOURCE cascade constraints;
+drop table if exists FLW_EVENT_DEPLOYMENT cascade constraints;
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.mysql.drop.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.mysql.drop.eventregistry.sql
new file mode 100644
index 00000000000..f837b4f15b5
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.mysql.drop.eventregistry.sql
@@ -0,0 +1,7 @@
+drop index ACT_IDX_CHANNEL_DEF_UNIQ on FLW_CHANNEL_DEFINITION;
+drop index ACT_IDX_EVENT_DEF_UNIQ on FLW_EVENT_DEFINITION;
+
+drop table if exists FLW_CHANNEL_DEFINITION;
+drop table if exists FLW_EVENT_DEFINITION;
+drop table if exists FLW_EVENT_RESOURCE;
+drop table if exists FLW_EVENT_DEPLOYMENT;
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.postgres.drop.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.postgres.drop.eventregistry.sql
new file mode 100644
index 00000000000..cf02564069d
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/drop/flowable.postgres.drop.eventregistry.sql
@@ -0,0 +1,4 @@
+drop table if exists FLW_CHANNEL_DEFINITION cascade;
+drop table if exists FLW_EVENT_DEFINITION cascade;
+drop table if exists FLW_EVENT_RESOURCE cascade;
+drop table if exists FLW_EVENT_DEPLOYMENT cascade;
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/liquibase/flowable-eventregistry-db-changelog.xml b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/liquibase/flowable-eventregistry-db-changelog.xml
deleted file mode 100644
index 1aa53c383ad..00000000000
--- a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/liquibase/flowable-eventregistry-db-changelog.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd
-        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
-    <changeSet id="1" author="flowable">
-
-        <createTable tableName="FLW_EVENT_DEPLOYMENT">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="CATEGORY_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="DEPLOY_TIME_" type="datetime(3)">
-                <constraints nullable="true" />
-            </column>
-            <column name="TENANT_ID_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="PARENT_DEPLOYMENT_ID_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <createTable tableName="FLW_EVENT_RESOURCE">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="RESOURCE_BYTES_" type="longblob">
-                <constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <createTable tableName="FLW_EVENT_DEFINITION">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="VERSION_" type="int" />
-            <column name="KEY_" type="varchar(255)" />
-            <column name="CATEGORY_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="TENANT_ID_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-            <column name="RESOURCE_NAME_" type="varchar(255)" />
-            <column name="DESCRIPTION_" type="varchar(255)">
-            	<constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <createIndex tableName="FLW_EVENT_DEFINITION" indexName="ACT_IDX_EVENT_DEF_UNIQ" unique="true">
-            <column name="KEY_" />
-            <column name="VERSION_" />
-            <column name="TENANT_ID_" />
-        </createIndex>
-        
-        <createTable tableName="FLW_CHANNEL_DEFINITION">
-            <column name="ID_" type="varchar(255)">
-                <constraints primaryKey="true" nullable="false" />
-            </column>
-            <column name="NAME_" type="varchar(255)" />
-            <column name="VERSION_" type="int" />
-            <column name="KEY_" type="varchar(255)" />
-            <column name="CATEGORY_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="DEPLOYMENT_ID_" type="varchar(255)" />
-            <column name="CREATE_TIME_" type="datetime(3)">
-                <constraints nullable="true" />
-            </column>
-            <column name="TENANT_ID_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-            <column name="RESOURCE_NAME_" type="varchar(255)" />
-            <column name="DESCRIPTION_" type="varchar(255)">
-                <constraints nullable="true" />
-            </column>
-        </createTable>
-        
-        <createIndex tableName="FLW_CHANNEL_DEFINITION" indexName="ACT_IDX_CHANNEL_DEF_UNIQ" unique="true">
-            <column name="KEY_" />
-            <column name="VERSION_" />
-            <column name="TENANT_ID_" />
-        </createIndex>
-
-    </changeSet>
-
-    <changeSet id="2" author="flowable">
-        <addColumn tableName="FLW_CHANNEL_DEFINITION">
-            <column name="TYPE_" type="varchar(255)"/>
-        </addColumn>
-        <addColumn tableName="FLW_CHANNEL_DEFINITION">
-            <column name="IMPLEMENTATION_" type="varchar(255)"/>
-        </addColumn>
-    </changeSet>
-    
-    <changeSet id="3" author="flowable">
-        <customChange class="org.flowable.eventregistry.impl.db.SetChannelDefinitionTypeAndImplementationCustomChange" />
-    </changeSet>
-    
-    <changeSet id="4" author="flowable" dbms="mssql">
-        <modifyDataType tableName="FLW_EVENT_DEPLOYMENT" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="FLW_EVENT_RESOURCE" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="FLW_CHANNEL_DEFINITION" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="FLW_CHANNEL_DEFINITION" columnName="CATEGORY_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="FLW_CHANNEL_DEFINITION" columnName="RESOURCE_NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="FLW_EVENT_DEFINITION" columnName="NAME_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="FLW_EVENT_DEFINITION" columnName="CATEGORY_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="FLW_EVENT_DEFINITION" columnName="RESOURCE_NAME_" newDataType="nvarchar(255)" />
-    </changeSet>
-    
-    <changeSet id="5" author="flowable" dbms="mssql">
-        <modifyDataType tableName="FLW_CHANNEL_DEFINITION" columnName="DESCRIPTION_" newDataType="nvarchar(255)" />
-        <modifyDataType tableName="FLW_EVENT_DEFINITION" columnName="DESCRIPTION_" newDataType="nvarchar(255)" />
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml
index afd26fcafe7..93f594dda49 100644
--- a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/mapping/mappings.xml
@@ -18,6 +18,7 @@
     <!-- Common mappers -->
     <mapper resource="org/flowable/common/db/mapping/entity/Property.xml" />
     <mapper resource="org/flowable/common/db/mapping/entity/TableData.xml" />
+    <mapper resource="org/flowable/common/db/mapping/ChangeLog.xml" />
     <mapper resource="org/flowable/common/db/mapping/common.xml" />
 
     <!-- Engine mappers -->
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.all.upgradestep.7100.to.7101.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.all.upgradestep.7100.to.7101.eventregistry.sql
new file mode 100644
index 00000000000..447fc20a3b2
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.all.upgradestep.7100.to.7101.eventregistry.sql
@@ -0,0 +1,5 @@
+insert into ACT_GE_PROPERTY
+values ('eventregistry.schema.version', '7.1.0.1', 1);
+
+drop table FLW_EV_DATABASECHANGELOG;
+drop table FLW_EV_DATABASECHANGELOGLOCK;
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.db2.upgradestep.6501.to.6502.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.db2.upgradestep.6501.to.6502.eventregistry.sql
new file mode 100644
index 00000000000..4059d377428
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.db2.upgradestep.6501.to.6502.eventregistry.sql
@@ -0,0 +1,13 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP(3), TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_FLW_EVENT_DEPL PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_FLW_EVENT_RESO PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_FLW_EVENT_DEFI PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), CREATE_TIME_ TIMESTAMP(3), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_FLW_CHANNEL_DE PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.db2.upgradestep.6710.to.6720.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.db2.upgradestep.6710.to.6720.eventregistry.sql
new file mode 100644
index 00000000000..15bc8cba12c
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.db2.upgradestep.6710.to.6720.eventregistry.sql
@@ -0,0 +1,9 @@
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE FLW_CHANNEL_DEFINITION');
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
+
+CALL SYSPROC.ADMIN_CMD ('REORG TABLE FLW_CHANNEL_DEFINITION');
+
+
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.h2.upgradestep.6501.to.6502.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.h2.upgradestep.6501.to.6502.eventregistry.sql
new file mode 100644
index 00000000000..54e6fbd12df
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.h2.upgradestep.6501.to.6502.eventregistry.sql
@@ -0,0 +1,11 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INT, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INT, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), CREATE_TIME_ TIMESTAMP, TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.h2.upgradestep.6710.to.6720.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.h2.upgradestep.6710.to.6720.eventregistry.sql
new file mode 100644
index 00000000000..c8f873af992
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.h2.upgradestep.6710.to.6720.eventregistry.sql
@@ -0,0 +1,3 @@
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.eventregistry.sql
new file mode 100644
index 00000000000..61a851d6f9d
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.6501.to.6502.eventregistry.sql
@@ -0,0 +1,11 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ varchar(255) NOT NULL, NAME_ varchar(255), CATEGORY_ varchar(255), DEPLOY_TIME_ datetime, TENANT_ID_ varchar(255), PARENT_DEPLOYMENT_ID_ varchar(255), CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ varchar(255) NOT NULL, NAME_ varchar(255), DEPLOYMENT_ID_ varchar(255), RESOURCE_BYTES_ varbinary(MAX), CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ varchar(255) NOT NULL, NAME_ varchar(255), VERSION_ int, KEY_ varchar(255), CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), TENANT_ID_ varchar(255), RESOURCE_NAME_ varchar(255), DESCRIPTION_ varchar(255), CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ varchar(255) NOT NULL, NAME_ varchar(255), VERSION_ int, KEY_ varchar(255), CATEGORY_ varchar(255), DEPLOYMENT_ID_ varchar(255), CREATE_TIME_ datetime, TENANT_ID_ varchar(255), RESOURCE_NAME_ varchar(255), DESCRIPTION_ varchar(255), CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE NONCLUSTERED INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.6710.to.6720.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.6710.to.6720.eventregistry.sql
new file mode 100644
index 00000000000..dc8157e895f
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.6710.to.6720.eventregistry.sql
@@ -0,0 +1,3 @@
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ varchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ varchar(255);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.eventregistry.sql
new file mode 100644
index 00000000000..dd7a77d6c83
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.eventregistry.sql
@@ -0,0 +1,19 @@
+ALTER TABLE FLW_EVENT_DEPLOYMENT ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_RESOURCE ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ALTER COLUMN CATEGORY_ nvarchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ALTER COLUMN RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_DEFINITION ALTER COLUMN NAME_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_DEFINITION ALTER COLUMN CATEGORY_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_DEFINITION ALTER COLUMN RESOURCE_NAME_ nvarchar(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ALTER COLUMN DESCRIPTION_ nvarchar(255);
+
+ALTER TABLE FLW_EVENT_DEFINITION ALTER COLUMN DESCRIPTION_ nvarchar(255);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.eventregistry.sql
new file mode 100644
index 00000000000..bc7f8cc359a
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mysql.upgradestep.6501.to.6502.eventregistry.sql
@@ -0,0 +1,11 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOY_TIME_ datetime(3) NULL, TENANT_ID_ VARCHAR(255) NULL, PARENT_DEPLOYMENT_ID_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, RESOURCE_BYTES_ LONGBLOB NULL, CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, VERSION_ INT NULL, KEY_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, TENANT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(255) NULL, DESCRIPTION_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255) NULL, VERSION_ INT NULL, KEY_ VARCHAR(255) NULL, CATEGORY_ VARCHAR(255) NULL, DEPLOYMENT_ID_ VARCHAR(255) NULL, CREATE_TIME_ datetime(3) NULL, TENANT_ID_ VARCHAR(255) NULL, RESOURCE_NAME_ VARCHAR(255) NULL, DESCRIPTION_ VARCHAR(255) NULL, CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mysql.upgradestep.6710.to.6720.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mysql.upgradestep.6710.to.6720.eventregistry.sql
new file mode 100644
index 00000000000..5d1773b3101
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.mysql.upgradestep.6710.to.6720.eventregistry.sql
@@ -0,0 +1,3 @@
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255) NULL;
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255) NULL;
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.eventregistry.sql
new file mode 100644
index 00000000000..54ebbf729b7
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.oracle.upgradestep.6501.to.6502.eventregistry.sql
@@ -0,0 +1,11 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOY_TIME_ TIMESTAMP(3), TENANT_ID_ VARCHAR2(255), PARENT_DEPLOYMENT_ID_ VARCHAR2(255), CONSTRAINT PK_FLW_EVENT_DEPLOYMENT PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), RESOURCE_BYTES_ BLOB, CONSTRAINT PK_FLW_EVENT_RESOURCE PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), VERSION_ INTEGER, KEY_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), TENANT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(255), DESCRIPTION_ VARCHAR2(255), CONSTRAINT PK_FLW_EVENT_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR2(255) NOT NULL, NAME_ VARCHAR2(255), VERSION_ INTEGER, KEY_ VARCHAR2(255), CATEGORY_ VARCHAR2(255), DEPLOYMENT_ID_ VARCHAR2(255), CREATE_TIME_ TIMESTAMP(3), TENANT_ID_ VARCHAR2(255), RESOURCE_NAME_ VARCHAR2(255), DESCRIPTION_ VARCHAR2(255), CONSTRAINT PK_FLW_CHANNEL_DEFINITION PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.oracle.upgradestep.6710.to.6720.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.oracle.upgradestep.6710.to.6720.eventregistry.sql
new file mode 100644
index 00000000000..fb191dc4024
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.oracle.upgradestep.6710.to.6720.eventregistry.sql
@@ -0,0 +1,3 @@
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR2(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR2(255);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.eventregistry.sql
new file mode 100644
index 00000000000..151353e89a1
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.postgres.upgradestep.6501.to.6502.eventregistry.sql
@@ -0,0 +1,11 @@
+CREATE TABLE FLW_EVENT_DEPLOYMENT (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOY_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE, TENANT_ID_ VARCHAR(255), PARENT_DEPLOYMENT_ID_ VARCHAR(255), CONSTRAINT "FLW_EVENT_DEPLOYMENT_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_RESOURCE (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), RESOURCE_BYTES_ BYTEA, CONSTRAINT "FLW_EVENT_RESOURCE_pkey" PRIMARY KEY (ID_));
+
+CREATE TABLE FLW_EVENT_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT "FLW_EVENT_DEFINITION_pkey" PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_EVENT_DEF_UNIQ ON FLW_EVENT_DEFINITION(KEY_, VERSION_, TENANT_ID_);
+
+CREATE TABLE FLW_CHANNEL_DEFINITION (ID_ VARCHAR(255) NOT NULL, NAME_ VARCHAR(255), VERSION_ INTEGER, KEY_ VARCHAR(255), CATEGORY_ VARCHAR(255), DEPLOYMENT_ID_ VARCHAR(255), CREATE_TIME_ TIMESTAMP(3) WITHOUT TIME ZONE, TENANT_ID_ VARCHAR(255), RESOURCE_NAME_ VARCHAR(255), DESCRIPTION_ VARCHAR(255), CONSTRAINT "FLW_CHANNEL_DEFINITION_pkey" PRIMARY KEY (ID_));
+
+CREATE UNIQUE INDEX ACT_IDX_CHANNEL_DEF_UNIQ ON FLW_CHANNEL_DEFINITION(KEY_, VERSION_, TENANT_ID_);
diff --git a/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.postgres.upgradestep.6710.to.6720.eventregistry.sql b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.postgres.upgradestep.6710.to.6720.eventregistry.sql
new file mode 100644
index 00000000000..c8f873af992
--- /dev/null
+++ b/modules/flowable-event-registry/src/main/resources/org/flowable/eventregistry/db/upgrade/flowable.postgres.upgradestep.6710.to.6720.eventregistry.sql
@@ -0,0 +1,3 @@
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255);
+
+ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
diff --git a/modules/flowable-event-registry/src/test/resources/flowable.eventregistry.cfg.xml b/modules/flowable-event-registry/src/test/resources/flowable.eventregistry.cfg.xml
index e8d2acd34c6..172b3dbb677 100644
--- a/modules/flowable-event-registry/src/test/resources/flowable.eventregistry.cfg.xml
+++ b/modules/flowable-event-registry/src/test/resources/flowable.eventregistry.cfg.xml
@@ -28,6 +28,8 @@
                 <ref bean="dataSource"/>
             </list>
         </property>
+        
+        <property name="databaseSchemaUpdate" value="drop-create" />
 
         <property name="enableEventRegistryChangeDetection" value="false" />
         <property name="enableEventRegistryChangeDetectionAfterEngineCreate" value="false" />
diff --git a/modules/flowable-event-registry/src/test/resources/flowableChangeDetector.eventregistry.cfg.xml b/modules/flowable-event-registry/src/test/resources/flowableChangeDetector.eventregistry.cfg.xml
index 3f9095e9cbd..1275ea823be 100644
--- a/modules/flowable-event-registry/src/test/resources/flowableChangeDetector.eventregistry.cfg.xml
+++ b/modules/flowable-event-registry/src/test/resources/flowableChangeDetector.eventregistry.cfg.xml
@@ -28,6 +28,8 @@
                 <ref bean="dataSource"/>
             </list>
         </property>
+        
+        <property name="databaseSchemaUpdate" value="drop-create" />
 
         <property name="enableEventRegistryChangeDetection" value="true" />
     </bean>
diff --git a/modules/flowable-eventsubscription-service/src/main/java/org/flowable/eventsubscription/service/impl/db/EventSubscriptionDbSchemaManager.java b/modules/flowable-eventsubscription-service/src/main/java/org/flowable/eventsubscription/service/impl/db/EventSubscriptionDbSchemaManager.java
deleted file mode 100644
index 8d4e7d46ffa..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/java/org/flowable/eventsubscription/service/impl/db/EventSubscriptionDbSchemaManager.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.eventsubscription.service.impl.db;
-
-import org.flowable.common.engine.impl.db.ServiceSqlScriptBasedDbSchemaManager;
-
-/**
- * @author Joram Barrez
- */
-public class EventSubscriptionDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
-    
-    private static final String TABLE = "ACT_RU_EVENT_SUBSCR";
-    private static final String VERSION_PROPERTY = "eventsubscription.schema.version";
-    private static final String SCHEMA_COMPONENT = "eventsubscription";
-    
-    public EventSubscriptionDbSchemaManager() {
-        super(TABLE, SCHEMA_COMPONENT, null, VERSION_PROPERTY);
-    }
-
-    @Override
-    protected String getResourcesRootDirectory() {
-        return "org/flowable/eventsubscription/service/db/";
-    }
-
-}
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.cockroachdb.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.cockroachdb.create.eventsubscription.sql
deleted file mode 100644
index 79d9fcba3f2..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.cockroachdb.create.eventsubscription.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ varchar(255) not null,
-    EVENT_NAME_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
-    CONFIGURATION_ varchar(255),
-    CREATED_ timestamp not null,
-    PROC_DEF_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_ID_ varchar(64),
-    SCOPE_DEFINITION_ID_ varchar(64),
-    SCOPE_DEFINITION_KEY_ varchar(255),
-    SCOPE_TYPE_ varchar(64),
-    LOCK_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.db2.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.db2.create.eventsubscription.sql
deleted file mode 100644
index 57f34a39199..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.db2.create.eventsubscription.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ varchar(255) not null,
-    EVENT_NAME_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
-    CONFIGURATION_ varchar(255),
-    CREATED_ timestamp not null,
-    PROC_DEF_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_ID_ varchar(64),
-    SCOPE_DEFINITION_ID_ varchar(64),
-    SCOPE_DEFINITION_KEY_ varchar(255),
-    SCOPE_TYPE_ varchar(64),
-    LOCK_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR_EXEC_ID on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.h2.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.h2.create.eventsubscription.sql
deleted file mode 100644
index 873bb0bf292..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.h2.create.eventsubscription.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ varchar(255) not null,
-    EVENT_NAME_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
-    CONFIGURATION_ varchar(255),
-    CREATED_ timestamp not null,
-    PROC_DEF_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_ID_ varchar(64),
-    SCOPE_DEFINITION_ID_ varchar(64),
-    SCOPE_DEFINITION_KEY_ varchar(255),
-    SCOPE_TYPE_ varchar(64),
-    LOCK_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.hsql.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.hsql.create.eventsubscription.sql
deleted file mode 100644
index 873bb0bf292..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.hsql.create.eventsubscription.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ varchar(255) not null,
-    EVENT_NAME_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
-    CONFIGURATION_ varchar(255),
-    CREATED_ timestamp not null,
-    PROC_DEF_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_ID_ varchar(64),
-    SCOPE_DEFINITION_ID_ varchar(64),
-    SCOPE_DEFINITION_KEY_ varchar(255),
-    SCOPE_TYPE_ varchar(64),
-    LOCK_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mssql.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mssql.create.eventsubscription.sql
deleted file mode 100644
index b71bf8d7ca0..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mssql.create.eventsubscription.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ nvarchar(64) not null,
-    REV_ int,
-    EVENT_TYPE_ nvarchar(255) not null,
-    EVENT_NAME_ nvarchar(255),
-    EXECUTION_ID_ nvarchar(64),
-    PROC_INST_ID_ nvarchar(64),
-    ACTIVITY_ID_ nvarchar(64),
-    CONFIGURATION_ nvarchar(255),
-    CREATED_ datetime not null,
-    PROC_DEF_ID_ nvarchar(64),
-    SUB_SCOPE_ID_ nvarchar(64),
-    SCOPE_ID_ nvarchar(64),
-    SCOPE_DEFINITION_ID_ nvarchar(64),
-    SCOPE_DEFINITION_KEY_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(64),
-    LOCK_TIME_ datetime,
-    LOCK_OWNER_ nvarchar(255),
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR_EXEC_ID on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mysql.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mysql.create.eventsubscription.sql
deleted file mode 100644
index f08b3828317..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mysql.create.eventsubscription.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ varchar(255) not null,
-    EVENT_NAME_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
-    CONFIGURATION_ varchar(255),
-    CREATED_ timestamp(3) not null DEFAULT CURRENT_TIMESTAMP(3),
-    PROC_DEF_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_ID_ varchar(64),
-    SCOPE_DEFINITION_ID_ varchar(64),
-    SCOPE_DEFINITION_KEY_ varchar(255),
-    SCOPE_TYPE_ varchar(64),
-    LOCK_TIME_ timestamp(3) NULL,
-    LOCK_OWNER_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mysql55.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mysql55.create.eventsubscription.sql
deleted file mode 100644
index 54efcbf3577..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.mysql55.create.eventsubscription.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ varchar(255) not null,
-    EVENT_NAME_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
-    CONFIGURATION_ varchar(255),
-    CREATED_ timestamp not null DEFAULT CURRENT_TIMESTAMP,
-    PROC_DEF_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_ID_ varchar(64),
-    SCOPE_DEFINITION_ID_ varchar(64),
-    SCOPE_DEFINITION_KEY_ varchar(255),
-    SCOPE_TYPE_ varchar(64),
-    LOCK_TIME_ timestamp(3) NULL,
-    LOCK_OWNER_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.oracle.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.oracle.create.eventsubscription.sql
deleted file mode 100644
index 26371662a49..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.oracle.create.eventsubscription.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ NVARCHAR2(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ NVARCHAR2(255) not null,
-    EVENT_NAME_ NVARCHAR2(255),
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROC_INST_ID_ NVARCHAR2(64),
-    ACTIVITY_ID_ NVARCHAR2(64),
-    CONFIGURATION_ NVARCHAR2(255),
-    CREATED_ TIMESTAMP(6) not null,
-    PROC_DEF_ID_ NVARCHAR2(64),
-    SUB_SCOPE_ID_ NVARCHAR2(64),
-    SCOPE_ID_ NVARCHAR2(64),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(64),
-    SCOPE_DEFINITION_KEY_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(64),
-    LOCK_TIME_ TIMESTAMP(6),
-    LOCK_OWNER_ NVARCHAR2(255),
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.postgres.create.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.postgres.create.eventsubscription.sql
deleted file mode 100644
index 79d9fcba3f2..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/create/flowable.postgres.create.eventsubscription.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ varchar(255) not null,
-    EVENT_NAME_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
-    CONFIGURATION_ varchar(255),
-    CREATED_ timestamp not null,
-    PROC_DEF_ID_ varchar(64),
-    SUB_SCOPE_ID_ varchar(64),
-    SCOPE_ID_ varchar(64),
-    SCOPE_DEFINITION_ID_ varchar(64),
-    SCOPE_DEFINITION_KEY_ varchar(255),
-    SCOPE_TYPE_ varchar(64),
-    LOCK_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_EVENT_SUBSCR on ACT_RU_EVENT_SUBSCR(EXECUTION_ID_);
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.cockroachdb.drop.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.cockroachdb.drop.eventsubscription.sql
deleted file mode 100644
index b36a479af6a..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.cockroachdb.drop.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_RU_EVENT_SUBSCR cascade;
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.db2.drop.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.db2.drop.eventsubscription.sql
deleted file mode 100644
index 59260a8acd2..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.db2.drop.eventsubscription.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop index ACT_IDX_EVENT_SUBSCR_CONFIG_;
-drop index ACT_IDX_EVENT_SUBSCR_EXEC_ID;
-drop index ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
-
-drop table ACT_RU_EVENT_SUBSCR;
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.h2.drop.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.h2.drop.eventsubscription.sql
deleted file mode 100644
index 3639bf58299..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.h2.drop.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists ACT_RU_EVENT_SUBSCR cascade constraints;
-
-drop index if exists ACT_IDX_EVENT_SUBSCR_CONFIG_;
-drop index if exists ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.hsql.drop.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.hsql.drop.eventsubscription.sql
deleted file mode 100644
index 5f5df645d65..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.hsql.drop.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists ACT_RU_EVENT_SUBSCR cascade;
-
-drop index if exists ACT_IDX_EVENT_SUBSCR_CONFIG_;
-drop index if exists ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.mssql.drop.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.mssql.drop.eventsubscription.sql
deleted file mode 100644
index d3f2c97d1a0..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.mssql.drop.eventsubscription.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EVENT_SUBSCR_CONFIG_') drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_CONFIG_;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EVENT_SUBSCR_EXEC_ID') drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_EXEC_ID;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EVENT_SUBSCR_SCOPEREF_') drop index ACT_RU_EVENT_SUBSCR.ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EVENT_SUBSCR') drop table ACT_RU_EVENT_SUBSCR;
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.mysql.drop.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.mysql.drop.eventsubscription.sql
deleted file mode 100644
index fef93c02512..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.mysql.drop.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR;
-drop index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR;
-
-drop table if exists ACT_RU_EVENT_SUBSCR;
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.oracle.drop.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.oracle.drop.eventsubscription.sql
deleted file mode 100644
index 0d027a27d66..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.oracle.drop.eventsubscription.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop index ACT_IDX_EVENT_SUBSCR_CONFIG_;
-drop index ACT_IDX_EVENT_SUBSCR;
-drop index ACT_IDX_EVENT_SUBSCR_SCOPEREF_;
-
-drop table ACT_RU_EVENT_SUBSCR;
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.postgres.drop.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.postgres.drop.eventsubscription.sql
deleted file mode 100644
index b36a479af6a..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/drop/flowable.postgres.drop.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_RU_EVENT_SUBSCR cascade;
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.eventsubscription.sql
deleted file mode 100644
index ab76654567c..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.eventsubscription.sql
deleted file mode 100644
index 6d8125bfe0c..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.eventsubscription.sql
deleted file mode 100644
index 6ee30ab0d44..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.eventsubscription.sql
deleted file mode 100644
index 34950503887..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.4' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.eventsubscription.sql
deleted file mode 100644
index bdf11479eb5..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.eventsubscription.sql
deleted file mode 100644
index 29419490c56..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.6' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.eventsubscription.sql
deleted file mode 100644
index 6ba82056132..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.eventsubscription.sql
deleted file mode 100644
index ebd0aff43c0..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.eventsubscription.sql
deleted file mode 100644
index 45ac743458a..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.eventsubscription.sql
deleted file mode 100644
index cb824cbcecd..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.eventsubscription.sql
deleted file mode 100644
index f7aec701f95..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.eventsubscription.sql
deleted file mode 100644
index e2aec8f8c21..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.5' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.eventsubscription.sql
deleted file mode 100644
index eac6b414725..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.eventsubscription.sql
deleted file mode 100644
index 2ae3eb85205..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.eventsubscription.sql
deleted file mode 100644
index 66c2ce75103..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.eventsubscription.sql
deleted file mode 100644
index 65276e038fe..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.eventsubscription.sql
deleted file mode 100644
index 5823773011c..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.eventsubscription.sql
deleted file mode 100644
index eb12d56bdd9..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.eventsubscription.sql
deleted file mode 100644
index ad14c179059..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.eventsubscription.sql
deleted file mode 100644
index 79d505c03b9..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.eventsubscription.sql
deleted file mode 100644
index 322d098b4b6..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.1.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.eventsubscription.sql
deleted file mode 100644
index 7838f9e8b98..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.eventsubscription.sql
deleted file mode 100644
index deb2eee3db9..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_EVENT_SUBSCR_SCOPEREF_ on ACT_RU_EVENT_SUBSCR(SCOPE_ID_, SCOPE_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.eventsubscription.sql
deleted file mode 100644
index 97dd728add7..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.3' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.eventsubscription.sql
deleted file mode 100644
index 2df327bbcb4..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.0.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.eventsubscription.sql
deleted file mode 100644
index 739877b904c..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.eventsubscription.sql
deleted file mode 100644
index 5d7ee4950a6..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.0.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.eventsubscription.sql
deleted file mode 100644
index 00daf12c0dc..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.eventsubscription.sql
deleted file mode 100644
index 1ead1cd9cc7..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.eventsubscription.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.cockroachdb.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.cockroachdb.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index ca2bcc8228e..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.cockroachdb.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.6413.to.6500.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.6413.to.6500.eventsubscription.sql
deleted file mode 100644
index 5e1067f0479..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.6413.to.6500.eventsubscription.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '6.5.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index ca2bcc8228e..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.7010.to.7011.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.7010.to.7011.eventsubscription.sql
deleted file mode 100644
index 4d86f560f61..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.db2.upgradestep.7010.to.7011.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.6413.to.6500.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.6413.to.6500.eventsubscription.sql
deleted file mode 100644
index 0f52fce6961..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.6413.to.6500.eventsubscription.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '6.5.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index ca2bcc8228e..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.7010.to.7011.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.7010.to.7011.eventsubscription.sql
deleted file mode 100644
index 4d86f560f61..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.h2.upgradestep.7010.to.7011.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.6413.to.6500.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.6413.to.6500.eventsubscription.sql
deleted file mode 100644
index 0f52fce6961..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.6413.to.6500.eventsubscription.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '6.5.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index ca2bcc8228e..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.7010.to.7011.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.7010.to.7011.eventsubscription.sql
deleted file mode 100644
index 4d86f560f61..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.hsql.upgradestep.7010.to.7011.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.6413.to.6500.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.6413.to.6500.eventsubscription.sql
deleted file mode 100644
index 7f3315ad8a5..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.6413.to.6500.eventsubscription.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add SUB_SCOPE_ID_ nvarchar(64);
-alter table ACT_RU_EVENT_SUBSCR add SCOPE_ID_ nvarchar(64);
-alter table ACT_RU_EVENT_SUBSCR add SCOPE_DEFINITION_ID_ nvarchar(64);
-alter table ACT_RU_EVENT_SUBSCR add SCOPE_TYPE_ nvarchar(64);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '6.5.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index 4a92632506a..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add LOCK_TIME_ datetime;
-alter table ACT_RU_EVENT_SUBSCR add LOCK_OWNER_ nvarchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.7010.to.7011.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.7010.to.7011.eventsubscription.sql
deleted file mode 100644
index 975d894804f..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mssql.upgradestep.7010.to.7011.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add SCOPE_DEFINITION_KEY_ nvarchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.6413.to.6500.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.6413.to.6500.eventsubscription.sql
deleted file mode 100644
index 0f52fce6961..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.6413.to.6500.eventsubscription.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '6.5.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index 2e21f31f2fe..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp(3) NULL;
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.7010.to.7011.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.7010.to.7011.eventsubscription.sql
deleted file mode 100644
index 4d86f560f61..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql.upgradestep.7010.to.7011.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.6413.to.6500.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.6413.to.6500.eventsubscription.sql
deleted file mode 100644
index 0f52fce6961..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.6413.to.6500.eventsubscription.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '6.5.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index 2e21f31f2fe..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp(3) NULL;
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.7010.to.7011.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.7010.to.7011.eventsubscription.sql
deleted file mode 100644
index 4d86f560f61..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.mysql55.upgradestep.7010.to.7011.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.6413.to.6500.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.6413.to.6500.eventsubscription.sql
deleted file mode 100644
index 386a22253d6..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.6413.to.6500.eventsubscription.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add SUB_SCOPE_ID_ NVARCHAR2(64);
-alter table ACT_RU_EVENT_SUBSCR add SCOPE_ID_ NVARCHAR2(64);
-alter table ACT_RU_EVENT_SUBSCR add SCOPE_DEFINITION_ID_ NVARCHAR2(64);
-alter table ACT_RU_EVENT_SUBSCR add SCOPE_TYPE_ NVARCHAR2(64);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '6.5.0.0', 1);
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index 723a694b503..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add LOCK_TIME_ TIMESTAMP(6);
-alter table ACT_RU_EVENT_SUBSCR add LOCK_OWNER_ NVARCHAR2(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.7010.to.7011.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.7010.to.7011.eventsubscription.sql
deleted file mode 100644
index e931396ddd6..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.oracle.upgradestep.7010.to.7011.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add SCOPE_DEFINITION_KEY_ NVARCHAR2(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.6413.to.6500.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.6413.to.6500.eventsubscription.sql
deleted file mode 100644
index 0f52fce6961..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.6413.to.6500.eventsubscription.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SUB_SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_ID_ varchar(64);
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_TYPE_ varchar(64);
-
-insert into ACT_GE_PROPERTY values ('eventsubscription.schema.version', '6.5.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.6721.to.6722.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.6721.to.6722.eventsubscription.sql
deleted file mode 100644
index ca2bcc8228e..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.6721.to.6722.eventsubscription.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_TIME_ timestamp;
-alter table ACT_RU_EVENT_SUBSCR add column LOCK_OWNER_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.7010.to.7011.eventsubscription.sql b/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.7010.to.7011.eventsubscription.sql
deleted file mode 100644
index 4d86f560f61..00000000000
--- a/modules/flowable-eventsubscription-service/src/main/resources/org/flowable/eventsubscription/service/db/upgrade/flowable.postgres.upgradestep.7010.to.7011.eventsubscription.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_EVENT_SUBSCR add column SCOPE_DEFINITION_KEY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'eventsubscription.schema.version';
diff --git a/modules/flowable-external-job-rest/src/test/resources/application.properties b/modules/flowable-external-job-rest/src/test/resources/application.properties
index 8c1c686ff60..b2c37351d5a 100644
--- a/modules/flowable-external-job-rest/src/test/resources/application.properties
+++ b/modules/flowable-external-job-rest/src/test/resources/application.properties
@@ -1,6 +1,5 @@
 spring.datasource.url=${jdbc.url:jdbc:h2:mem:flowable;DB_CLOSE_DELAY=1000}
 spring.datasource.username=${jdbc.username:sa}
 spring.datasource.password=${jdbc.password:}
-spring.liquibase.enabled=false
 debug=true
 logging.level.web=trace
diff --git a/modules/flowable-identitylink-service/src/main/java/org/flowable/identitylink/service/impl/db/IdentityLinkDbSchemaManager.java b/modules/flowable-identitylink-service/src/main/java/org/flowable/identitylink/service/impl/db/IdentityLinkDbSchemaManager.java
deleted file mode 100644
index 7b6fa7f55f2..00000000000
--- a/modules/flowable-identitylink-service/src/main/java/org/flowable/identitylink/service/impl/db/IdentityLinkDbSchemaManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.identitylink.service.impl.db;
-
-import org.flowable.common.engine.impl.db.ServiceSqlScriptBasedDbSchemaManager;
-
-/**
- * @author Joram Barrez
- */
-public class IdentityLinkDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
-    
-    private static final String TABLE = "ACT_RU_IDENTITYLINK";
-    private static final String VERSION_PROPERTY = "identitylink.schema.version";
-    private static final String SCHEMA_COMPONENT = "identitylink";
-    private static final String SCHEMA_COMPONENT_HISTORY = "identitylink.history";
-    
-    public IdentityLinkDbSchemaManager() {
-        super(TABLE, SCHEMA_COMPONENT, SCHEMA_COMPONENT_HISTORY, VERSION_PROPERTY);
-    }
-
-    @Override
-    protected String getResourcesRootDirectory() {
-        return "org/flowable/identitylink/service/db/";
-    }
-
-}
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.history.sql
deleted file mode 100644
index 03ba93cab94..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.history.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-CREATE TABLE ACT_HI_IDENTITYLINK (
-    ID_ varchar(64),
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    PROC_INST_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.sql
deleted file mode 100644
index edbc6f89d7e..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.cockroachdb.create.identitylink.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar (64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.db2.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.db2.create.identitylink.history.sql
deleted file mode 100644
index 65e0aa948b5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.db2.create.identitylink.history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table ACT_HI_IDENTITYLINK (
-    ID_ varchar(64) not null,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    PROC_INST_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.db2.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.db2.create.identitylink.sql
deleted file mode 100644
index b4ba495c060..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.db2.create.identitylink.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.h2.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.h2.create.identitylink.history.sql
deleted file mode 100644
index 026e6eddcb5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.h2.create.identitylink.history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table ACT_HI_IDENTITYLINK (
-    ID_ varchar(64),
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    PROC_INST_ID_ varchar(64) null,
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.h2.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.h2.create.identitylink.sql
deleted file mode 100644
index ec165ee5896..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.h2.create.identitylink.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64) null,
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.hsql.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.hsql.create.identitylink.history.sql
deleted file mode 100644
index b8f6fce23d7..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.hsql.create.identitylink.history.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-create table ACT_HI_IDENTITYLINK (
-  ID_ varchar(64),
-  GROUP_ID_ varchar(255),
-  TYPE_ varchar(255),
-  USER_ID_ varchar(255),
-  TASK_ID_ varchar(64),
-  CREATE_TIME_ timestamp,
-  PROC_INST_ID_ varchar(64) null,
-  SCOPE_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  primary key (ID_)
-);
-
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.hsql.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.hsql.create.identitylink.sql
deleted file mode 100644
index ec165ee5896..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.hsql.create.identitylink.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64) null,
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mssql.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mssql.create.identitylink.history.sql
deleted file mode 100644
index 4912e3e705b..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mssql.create.identitylink.history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table ACT_HI_IDENTITYLINK (
-    ID_ nvarchar(64),
-    GROUP_ID_ nvarchar(255),
-    TYPE_ nvarchar(255),
-    USER_ID_ nvarchar(255),
-    TASK_ID_ nvarchar(64),
-    CREATE_TIME_ datetime,
-    PROC_INST_ID_ nvarchar(64),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mssql.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mssql.create.identitylink.sql
deleted file mode 100644
index f3a8959f8d4..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mssql.create.identitylink.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ nvarchar(64),
-    REV_ int,
-    GROUP_ID_ nvarchar(255),
-    TYPE_ nvarchar(255),
-    USER_ID_ nvarchar(255),
-    TASK_ID_ nvarchar(64),
-    PROC_INST_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql.create.identitylink.history.sql
deleted file mode 100644
index deae8bf1176..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql.create.identitylink.history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table ACT_HI_IDENTITYLINK (
-    ID_ varchar(64),
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    CREATE_TIME_ datetime(3),
-    PROC_INST_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql.create.identitylink.sql
deleted file mode 100644
index d80d38ec04d..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql.create.identitylink.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql55.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql55.create.identitylink.history.sql
deleted file mode 100644
index 28a8def7b8b..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql55.create.identitylink.history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table ACT_HI_IDENTITYLINK (
-    ID_ varchar(64),
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    CREATE_TIME_ datetime,
-    PROC_INST_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql55.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql55.create.identitylink.sql
deleted file mode 100644
index d80d38ec04d..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.mysql55.create.identitylink.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.oracle.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.oracle.create.identitylink.history.sql
deleted file mode 100644
index 5192322023b..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.oracle.create.identitylink.history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table ACT_HI_IDENTITYLINK (
-    ID_ NVARCHAR2(64),
-    GROUP_ID_ NVARCHAR2(255),
-    TYPE_ NVARCHAR2(255),
-    USER_ID_ NVARCHAR2(255),
-    TASK_ID_ NVARCHAR2(64),
-    CREATE_TIME_ TIMESTAMP(6),
-    PROC_INST_ID_ NVARCHAR2(64),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.oracle.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.oracle.create.identitylink.sql
deleted file mode 100644
index 8958e9ac4ef..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.oracle.create.identitylink.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ NVARCHAR2(64),
-    REV_ INTEGER,
-    GROUP_ID_ NVARCHAR2(255),
-    TYPE_ NVARCHAR2(255),
-    USER_ID_ NVARCHAR2(255),
-    TASK_ID_ NVARCHAR2(64),
-    PROC_INST_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.postgres.create.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.postgres.create.identitylink.history.sql
deleted file mode 100644
index e61df98fd1f..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.postgres.create.identitylink.history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table ACT_HI_IDENTITYLINK (
-    ID_ varchar(64),
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    PROC_INST_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.postgres.create.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.postgres.create.identitylink.sql
deleted file mode 100644
index f7d0778b800..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/create/flowable.postgres.create.identitylink.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-create table ACT_RU_IDENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar (64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    primary key (ID_)
-);
-
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.history.sql
deleted file mode 100644
index b5b6f2da29b..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists act_hi_identitylink cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.sql
deleted file mode 100644
index b86ebb33620..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.cockroachdb.drop.identitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists act_ru_identitylink cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.db2.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.db2.drop.identitylink.history.sql
deleted file mode 100644
index 2bc03868639..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.db2.drop.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop index ACT_IDX_HI_IDENT_LNK_USER;
-drop index ACT_IDX_HI_IDENT_LNK_SCOPE;
-drop index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE;
-drop index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF;
-
-drop table ACT_HI_IDENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.db2.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.db2.drop.identitylink.sql
deleted file mode 100644
index 979ebb2439b..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.db2.drop.identitylink.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-drop index ACT_IDX_IDENT_LNK_USER;
-drop index ACT_IDX_IDENT_LNK_GROUP;
-drop index ACT_IDX_IDENT_LNK_SCOPE;
-drop index ACT_IDX_IDENT_LNK_SUB_SCOPE;
-drop index ACT_IDX_IDENT_LNK_SCOPE_DEF;
-
-drop table ACT_RU_IDENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.h2.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.h2.drop.identitylink.history.sql
deleted file mode 100644
index 06a80767905..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.h2.drop.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table if exists ACT_HI_IDENTITYLINK cascade constraints;
-
-drop index if exists ACT_IDX_HI_IDENT_LNK_USER;
-drop index if exists ACT_IDX_HI_IDENT_LNK_SCOPE;
-drop index if exists ACT_IDX_HI_IDENT_LNK_SUB_SCOPE;
-drop index if exists ACT_IDX_HI_IDENT_LNK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.h2.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.h2.drop.identitylink.sql
deleted file mode 100644
index 5b88f5e8910..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.h2.drop.identitylink.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-drop table if exists ACT_RU_IDENTITYLINK cascade constraints;
-
-drop index if exists ACT_IDX_IDENT_LNK_USER;
-drop index if exists ACT_IDX_IDENT_LNK_GROUP;
-drop index if exists ACT_IDX_IDENT_LNK_SCOPE;
-drop index if exists ACT_IDX_IDENT_LNK_SUB_SCOPE;
-drop index if exists ACT_IDX_IDENT_LNK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.hsql.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.hsql.drop.identitylink.history.sql
deleted file mode 100644
index 8db436518ca..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.hsql.drop.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table if exists ACT_HI_IDENTITYLINK cascade;
-
-drop index if exists ACT_IDX_HI_IDENT_LNK_USER;
-drop index if exists ACT_IDX_HI_IDENT_LNK_SCOPE;
-drop index if exists ACT_IDX_HI_IDENT_LNK_SUB_SCOPE;
-drop index if exists ACT_IDX_HI_IDENT_LNK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.hsql.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.hsql.drop.identitylink.sql
deleted file mode 100644
index 2659517a307..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.hsql.drop.identitylink.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-drop table if exists ACT_RU_IDENTITYLINK cascade;
-
-drop index if exists ACT_IDX_IDENT_LNK_USER;
-drop index if exists ACT_IDX_IDENT_LNK_GROUP;
-drop index if exists ACT_IDX_IDENT_LNK_SCOPE;
-drop index if exists ACT_IDX_IDENT_LNK_SUB_SCOPE;
-drop index if exists ACT_IDX_IDENT_LNK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mssql.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mssql.drop.identitylink.history.sql
deleted file mode 100644
index 65fd96baadb..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mssql.drop.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_IDENT_LNK_USER') drop index ACT_HI_IDENTITYLINK.ACT_IDX_HI_IDENT_LNK_USER;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_IDENT_LNK_SCOPE') drop index ACT_HI_IDENTITYLINK.ACT_IDX_HI_IDENT_LNK_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_IDENT_LNK_SUB_SCOPE') drop index ACT_HI_IDENTITYLINK.ACT_IDX_HI_IDENT_LNK_SUB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_IDENT_LNK_SCOPE_DEF') drop index ACT_HI_IDENTITYLINK.ACT_IDX_HI_IDENT_LNK_SCOPE_DEF;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_IDENTITYLINK') drop table ACT_HI_IDENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mssql.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mssql.drop.identitylink.sql
deleted file mode 100644
index c56d08dd81a..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mssql.drop.identitylink.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_USER') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_USER;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_GROUP') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_GROUP;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_SCOPE') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_SUB_SCOPE') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_SUB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_IDENT_LNK_SCOPE_DEF') drop index ACT_RU_IDENTITYLINK.ACT_IDX_IDENT_LNK_SCOPE_DEF;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_IDENTITYLINK') drop table ACT_RU_IDENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mysql.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mysql.drop.identitylink.history.sql
deleted file mode 100644
index cc3d7576fe2..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mysql.drop.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK;
-drop index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK;
-drop index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK;
-drop index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK;
-
-drop table if exists ACT_HI_IDENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mysql.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mysql.drop.identitylink.sql
deleted file mode 100644
index 066373b4a5d..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.mysql.drop.identitylink.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-drop index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK;
-drop index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK;
-drop index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK;
-drop index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK;
-drop index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK;
-
-drop table if exists ACT_RU_IDENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.oracle.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.oracle.drop.identitylink.history.sql
deleted file mode 100644
index 2bc03868639..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.oracle.drop.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop index ACT_IDX_HI_IDENT_LNK_USER;
-drop index ACT_IDX_HI_IDENT_LNK_SCOPE;
-drop index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE;
-drop index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF;
-
-drop table ACT_HI_IDENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.oracle.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.oracle.drop.identitylink.sql
deleted file mode 100644
index 979ebb2439b..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.oracle.drop.identitylink.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-drop index ACT_IDX_IDENT_LNK_USER;
-drop index ACT_IDX_IDENT_LNK_GROUP;
-drop index ACT_IDX_IDENT_LNK_SCOPE;
-drop index ACT_IDX_IDENT_LNK_SUB_SCOPE;
-drop index ACT_IDX_IDENT_LNK_SCOPE_DEF;
-
-drop table ACT_RU_IDENTITYLINK;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.postgres.drop.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.postgres.drop.identitylink.history.sql
deleted file mode 100644
index 4472d3a0cb5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.postgres.drop.identitylink.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_HI_IDENTITYLINK cascade;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.postgres.drop.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.postgres.drop.identitylink.sql
deleted file mode 100644
index f71af376db8..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/drop/flowable.postgres.drop.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_RU_IDENTITYLINK cascade;
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6120.to.6200.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6120.to.6200.identitylink.sql
deleted file mode 100644
index 2dedba8c440..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6120.to.6200.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.identitylink.sql
deleted file mode 100644
index 3d8f67312bc..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.identitylink.sql
deleted file mode 100644
index 45421676fa2..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.identitylink.sql
deleted file mode 100644
index 6c2ce2954c7..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.identitylink.sql
deleted file mode 100644
index 94345275e9c..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.2.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.identitylink.sql
deleted file mode 100644
index c54f451c3b7..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.0.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.identitylink.sql
deleted file mode 100644
index 718b2296f61..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.identitylink.sql
deleted file mode 100644
index ddce22359e1..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.identitylink.history.sql
deleted file mode 100644
index d40b18a5c51..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.identitylink.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-update ACT_HI_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
-
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.identitylink.sql
deleted file mode 100644
index 251cb58fd85..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.identitylink.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-update ACT_RU_IDENTITYLINK set SCOPE_DEFINITION_ID_ = null where SCOPE_ID_ is not null and SCOPE_DEFINITION_ID_ is not null;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.identitylink.sql
deleted file mode 100644
index 1ae143dbd00..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.identitylink.sql
deleted file mode 100644
index 3caa0af8651..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.identitylink.sql
deleted file mode 100644
index 2aad659be98..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.identitylink.sql
deleted file mode 100644
index c54b0510994..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.identitylink.sql
deleted file mode 100644
index 1dcfac8fc66..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.4' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.identitylink.sql
deleted file mode 100644
index 8b9bf1c2b95..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.identitylink.sql
deleted file mode 100644
index 577a1406840..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.6' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.identitylink.sql
deleted file mode 100644
index 75be8aec0d4..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.identitylink.sql
deleted file mode 100644
index 12495a30bc0..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.identitylink.sql
deleted file mode 100644
index 70f1a65f932..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.identitylink.sql
deleted file mode 100644
index 90073233cda..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.identitylink.sql
deleted file mode 100644
index d3cea641a71..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.identitylink.sql
deleted file mode 100644
index 21b9fc64855..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.5' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.identitylink.sql
deleted file mode 100644
index e4b2d8563ba..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.identitylink.sql
deleted file mode 100644
index 700eca3d51e..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.identitylink.sql
deleted file mode 100644
index 2d8df6ab1a1..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.identitylink.sql
deleted file mode 100644
index 30b57239e14..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.identitylink.sql
deleted file mode 100644
index e354b32c039..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.identitylink.sql
deleted file mode 100644
index e66b56db69e..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.identitylink.sql
deleted file mode 100644
index edf889400ad..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.identitylink.sql
deleted file mode 100644
index e6387b9ac2b..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.identitylink.sql
deleted file mode 100644
index 09fad6c0125..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.1.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.identitylink.sql
deleted file mode 100644
index 8e2dec89f86..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.identitylink.sql
deleted file mode 100644
index 13698fcbd26..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.identitylink.sql
deleted file mode 100644
index 0b72f2d6f19..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.identitylink.sql
deleted file mode 100644
index bf5ee879d77..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.3' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.identitylink.sql
deleted file mode 100644
index 2fbe1042f42..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.0.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.identitylink.sql
deleted file mode 100644
index a862bddc808..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.identitylink.sql
deleted file mode 100644
index b738672367f..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.0.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.identitylink.sql
deleted file mode 100644
index 9ad56369414..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.identitylink.sql
deleted file mode 100644
index fff15ef60f9..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.identitylink.sql
deleted file mode 100644
index 15812286b26..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.identitylink.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'identitylink.schema.version';
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.identitylink.history.sql
deleted file mode 100644
index c42ddb32f38..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.identitylink.sql
deleted file mode 100644
index a944cc77a90..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.identitylink.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6502.to.6503.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6502.to.6503.identitylink.history.sql
deleted file mode 100644
index 4c4565e8ad4..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6502.to.6503.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6502.to.6503.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6502.to.6503.identitylink.sql
deleted file mode 100644
index 7f8c226a1f5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.db2.upgradestep.6502.to.6503.identitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.identitylink.history.sql
deleted file mode 100644
index c42ddb32f38..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.identitylink.sql
deleted file mode 100644
index a944cc77a90..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.identitylink.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6502.to.6503.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6502.to.6503.identitylink.history.sql
deleted file mode 100644
index 4c4565e8ad4..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6502.to.6503.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6502.to.6503.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6502.to.6503.identitylink.sql
deleted file mode 100644
index 7f8c226a1f5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.h2.upgradestep.6502.to.6503.identitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.identitylink.history.sql
deleted file mode 100644
index c42ddb32f38..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.identitylink.sql
deleted file mode 100644
index a944cc77a90..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.identitylink.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.identitylink.history.sql
deleted file mode 100644
index 4c4565e8ad4..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.identitylink.sql
deleted file mode 100644
index 7f8c226a1f5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.hsql.upgradestep.6502.to.6503.identitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.identitylink.history.sql
deleted file mode 100644
index 3cb73ad5545..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_IDENTITYLINK add SCOPE_TYPE_ nvarchar(255);
-alter table ACT_HI_IDENTITYLINK add SCOPE_DEFINITION_ID_ nvarchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.identitylink.sql
deleted file mode 100644
index 17e1aa23ea2..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.identitylink.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_IDENTITYLINK add SCOPE_TYPE_ nvarchar(255);
-alter table ACT_RU_IDENTITYLINK add SCOPE_DEFINITION_ID_ nvarchar(255);
-
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.identitylink.history.sql
deleted file mode 100644
index 7a80e975be3..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add SUB_SCOPE_ID_ nvarchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.identitylink.sql
deleted file mode 100644
index 84fc90d4921..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mssql.upgradestep.6502.to.6503.identitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add SUB_SCOPE_ID_ nvarchar(255);
-
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.identitylink.history.sql
deleted file mode 100644
index c42ddb32f38..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.identitylink.sql
deleted file mode 100644
index a944cc77a90..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.identitylink.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.identitylink.history.sql
deleted file mode 100644
index 4c4565e8ad4..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.identitylink.sql
deleted file mode 100644
index 7f8c226a1f5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql.upgradestep.6502.to.6503.identitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.identitylink.history.sql
deleted file mode 100644
index c42ddb32f38..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.identitylink.sql
deleted file mode 100644
index a944cc77a90..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.identitylink.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6502.to.6503.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6502.to.6503.identitylink.history.sql
deleted file mode 100644
index 4c4565e8ad4..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6502.to.6503.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6502.to.6503.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6502.to.6503.identitylink.sql
deleted file mode 100644
index 7f8c226a1f5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.mysql55.upgradestep.6502.to.6503.identitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.identitylink.history.sql
deleted file mode 100644
index f58c8e5d7cd..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_HI_IDENTITYLINK add SCOPE_TYPE_ NVARCHAR2(255);
-alter table ACT_HI_IDENTITYLINK add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.identitylink.sql
deleted file mode 100644
index ffacfc4b550..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.identitylink.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_IDENTITYLINK add SCOPE_TYPE_ NVARCHAR2(255);
-alter table ACT_RU_IDENTITYLINK add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
-
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.identitylink.history.sql
deleted file mode 100644
index 16887a6c1ee..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add SUB_SCOPE_ID_ NVARCHAR2(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.identitylink.sql
deleted file mode 100644
index 774262368fc..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.oracle.upgradestep.6502.to.6503.identitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add SUB_SCOPE_ID_ NVARCHAR2(255);
-
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.identitylink.history.sql
deleted file mode 100644
index c42ddb32f38..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.identitylink.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.identitylink.sql
deleted file mode 100644
index a944cc77a90..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.identitylink.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_IDENTITYLINK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SCOPE on ACT_RU_IDENTITYLINK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.identitylink.history.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.identitylink.history.sql
deleted file mode 100644
index 4c4565e8ad4..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.identitylink.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_HI_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.identitylink.sql b/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.identitylink.sql
deleted file mode 100644
index 7f8c226a1f5..00000000000
--- a/modules/flowable-identitylink-service/src/main/resources/org/flowable/identitylink/service/db/upgrade/flowable.postgres.upgradestep.6502.to.6503.identitylink.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'identitylink.schema.version';
-
-alter table ACT_RU_IDENTITYLINK add column SUB_SCOPE_ID_ varchar(255);
-
-create index ACT_IDX_IDENT_LNK_SUB_SCOPE on ACT_RU_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-idm-engine-configurator/src/main/java/org/flowable/idm/engine/configurator/IdmEngineConfigurator.java b/modules/flowable-idm-engine-configurator/src/main/java/org/flowable/idm/engine/configurator/IdmEngineConfigurator.java
index 5b9ae87e347..936b38ab57a 100644
--- a/modules/flowable-idm-engine-configurator/src/main/java/org/flowable/idm/engine/configurator/IdmEngineConfigurator.java
+++ b/modules/flowable-idm-engine-configurator/src/main/java/org/flowable/idm/engine/configurator/IdmEngineConfigurator.java
@@ -19,6 +19,7 @@
 import org.flowable.common.engine.impl.EngineDeployer;
 import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
 import org.flowable.common.engine.impl.persistence.entity.Entity;
+import org.flowable.idm.engine.IdmEngine;
 import org.flowable.idm.engine.IdmEngineConfiguration;
 import org.flowable.idm.engine.impl.cfg.StandaloneIdmEngineConfiguration;
 import org.flowable.idm.engine.impl.db.EntityDependencyOrder;
@@ -27,7 +28,7 @@
  * @author Tijs Rademakers
  * @author Joram Barrez
  */
-public class IdmEngineConfigurator extends AbstractEngineConfigurator {
+public class IdmEngineConfigurator extends AbstractEngineConfigurator<IdmEngine> {
 
     protected IdmEngineConfiguration idmEngineConfiguration;
 
@@ -54,11 +55,16 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
 
         initialiseCommonProperties(engineConfiguration, idmEngineConfiguration);
 
-        idmEngineConfiguration.buildIdmEngine();
+        initEngine();
 
         initServiceConfigurations(engineConfiguration, idmEngineConfiguration);
     }
 
+    @Override
+    protected IdmEngine buildEngine() {
+        return idmEngineConfiguration.buildEngine();
+    }
+
     @Override
     protected List<Class<? extends Entity>> getEntityInsertionOrder() {
         return EntityDependencyOrder.INSERT_ORDER;
diff --git a/modules/flowable-idm-engine/pom.xml b/modules/flowable-idm-engine/pom.xml
index a731827f2d2..5b9da9298d0 100755
--- a/modules/flowable-idm-engine/pom.xml
+++ b/modules/flowable-idm-engine/pom.xml
@@ -20,7 +20,7 @@
 		</flowable.artifact>
         <flowable.osgi.export.additional>
             org.flowable.idm.db.create,
-            org.flowable.idm.db.update,
+            org.flowable.idm.db.upgrade,
             org.flowable.idm.db.mapping,
             org.flowable.idm.db.mapping.entity,
         </flowable.osgi.export.additional>
diff --git a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/IdmEngineConfiguration.java b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/IdmEngineConfiguration.java
index 6a80d69dc3b..a271ef03011 100755
--- a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/IdmEngineConfiguration.java
+++ b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/IdmEngineConfiguration.java
@@ -18,15 +18,17 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.transaction.TransactionFactory;
 import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
 import org.flowable.common.engine.api.delegate.event.FlowableEventListener;
-import org.flowable.common.engine.impl.AbstractEngineConfiguration;
+import org.flowable.common.engine.impl.AbstractBuildableEngineConfiguration;
 import org.flowable.common.engine.impl.cfg.BeansConfigurationHelper;
 import org.flowable.common.engine.impl.cfg.IdGenerator;
 import org.flowable.common.engine.impl.db.DbSqlSessionFactory;
+import org.flowable.common.engine.impl.db.SchemaManager;
 import org.flowable.common.engine.impl.event.FlowableEventDispatcherImpl;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
 import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
@@ -41,9 +43,9 @@
 import org.flowable.idm.api.PasswordSalt;
 import org.flowable.idm.api.event.FlowableIdmEventType;
 import org.flowable.idm.engine.impl.IdmEngineImpl;
+import org.flowable.idm.engine.impl.IdmEnginePostEngineBuildConsumer;
 import org.flowable.idm.engine.impl.IdmIdentityServiceImpl;
 import org.flowable.idm.engine.impl.IdmManagementServiceImpl;
-import org.flowable.idm.engine.impl.SchemaOperationsIdmEngineBuild;
 import org.flowable.idm.engine.impl.authentication.BlankSalt;
 import org.flowable.idm.engine.impl.authentication.ClearTextPasswordEncoder;
 import org.flowable.idm.engine.impl.cfg.StandaloneIdmEngineConfiguration;
@@ -87,7 +89,7 @@
 import org.flowable.idm.engine.impl.persistence.entity.data.impl.MybatisTokenDataManager;
 import org.flowable.idm.engine.impl.persistence.entity.data.impl.MybatisUserDataManager;
 
-public class IdmEngineConfiguration extends AbstractEngineConfiguration implements IdmEngineConfigurationApi {
+public class IdmEngineConfiguration extends AbstractBuildableEngineConfiguration<IdmEngine> implements IdmEngineConfigurationApi {
 
     public static final String DEFAULT_MYBATIS_MAPPING_FILE = "org/flowable/idm/db/mapping/mappings.xml";
 
@@ -159,14 +161,24 @@ public IdmEngineConfiguration() {
     // buildProcessEngine
     // ///////////////////////////////////////////////////////
 
-    public IdmEngine buildIdmEngine() {
-        init();
+    @Override
+    protected IdmEngine createEngine() {
         return new IdmEngineImpl(this);
     }
 
+    @Override
+    protected Consumer<IdmEngine> createPostEngineBuildConsumer() {
+        return new IdmEnginePostEngineBuildConsumer();
+    }
+
+    public IdmEngine buildIdmEngine() {
+        return buildEngine();
+    }
+
     // init
     // /////////////////////////////////////////////////////////////////////
 
+    @Override
     protected void init() {
         initEngineConfigurations();
         initClock();
@@ -201,19 +213,8 @@ protected void init() {
     }
 
     @Override
-    public void initSchemaManager() {
-        super.initSchemaManager();
-        if (this.schemaManager == null) {
-            this.schemaManager = new IdmDbSchemaManager();
-        }
-    }
-    
-    public void initSchemaManagementCommand() {
-        if (schemaManagementCmd == null) {
-            if (usingRelationalDatabase && databaseSchemaUpdate != null) {
-                this.schemaManagementCmd = new SchemaOperationsIdmEngineBuild();
-            }
-        }
+    protected SchemaManager createEngineSchemaManager() {
+        return new IdmDbSchemaManager();
     }
 
     // services
diff --git a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/IdmEnginePostEngineBuildConsumer.java b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/IdmEnginePostEngineBuildConsumer.java
new file mode 100644
index 00000000000..81fa1bf9883
--- /dev/null
+++ b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/IdmEnginePostEngineBuildConsumer.java
@@ -0,0 +1,35 @@
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.flowable.idm.engine.impl;
+
+import java.util.function.Consumer;
+
+import org.flowable.common.engine.api.engine.EngineLifecycleListener;
+import org.flowable.idm.engine.IdmEngine;
+import org.flowable.idm.engine.IdmEngineConfiguration;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class IdmEnginePostEngineBuildConsumer implements Consumer<IdmEngine> {
+
+    @Override
+    public void accept(IdmEngine idmEngine) {
+        IdmEngineConfiguration engineConfiguration = idmEngine.getIdmEngineConfiguration();
+        if (engineConfiguration.getEngineLifecycleListeners() != null) {
+            for (EngineLifecycleListener engineLifecycleListener : engineConfiguration.getEngineLifecycleListeners()) {
+                engineLifecycleListener.onEngineBuilt(idmEngine);
+            }
+        }
+    }
+}
diff --git a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/SchemaOperationsIdmEngineBuild.java b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/SchemaOperationsIdmEngineBuild.java
deleted file mode 100644
index 1c9c5a23708..00000000000
--- a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/SchemaOperationsIdmEngineBuild.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.idm.engine.impl;
-
-import org.flowable.common.engine.impl.interceptor.Command;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
-import org.flowable.idm.engine.impl.db.IdmDbSchemaManager;
-import org.flowable.idm.engine.impl.util.CommandContextUtil;
-
-/**
- * @author Tijs Rademakers
- * @author Joram Barrez
- */
-public final class SchemaOperationsIdmEngineBuild implements Command<Void> {
-
-    @Override
-    public Void execute(CommandContext commandContext) {
-        IdmDbSchemaManager idmDbSchemaManager = (IdmDbSchemaManager) CommandContextUtil.getIdmEngineConfiguration(commandContext).getSchemaManager();
-        idmDbSchemaManager.performSchemaOperationsIdmEngineBuild();
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/DbSchemaDrop.java b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/DbSchemaDrop.java
index 1f1d8920884..030843ea5cc 100644
--- a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/DbSchemaDrop.java
+++ b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/DbSchemaDrop.java
@@ -13,13 +13,11 @@
 
 package org.flowable.idm.engine.impl.db;
 
-import org.flowable.common.engine.impl.interceptor.Command;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
-import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.common.engine.impl.interceptor.CommandExecutor;
 import org.flowable.idm.engine.IdmEngine;
 import org.flowable.idm.engine.IdmEngines;
-import org.flowable.idm.engine.impl.util.CommandContextUtil;
 
 /**
  * @author Tijs Rademakers
@@ -30,12 +28,6 @@ public static void main(String[] args) {
         IdmEngine idmEngine = IdmEngines.getDefaultIdmEngine();
         CommandExecutor commandExecutor = idmEngine.getIdmEngineConfiguration().getCommandExecutor();
         CommandConfig config = new CommandConfig().transactionNotSupported();
-        commandExecutor.execute(config, new Command<>() {
-            @Override
-            public Object execute(CommandContext commandContext) {
-                CommandContextUtil.getIdmEngineConfiguration(commandContext).getSchemaManager().schemaDrop();
-                return null;
-            }
-        });
+        commandExecutor.execute(config, new SchemaOperationsEngineDropDbCmd(idmEngine.getIdmEngineConfiguration().getEngineScopeType()));
     }
 }
diff --git a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/IdmDbSchemaManager.java b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/IdmDbSchemaManager.java
index c1e4419e66f..1f2e86818ae 100644
--- a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/IdmDbSchemaManager.java
+++ b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/db/IdmDbSchemaManager.java
@@ -16,8 +16,6 @@
 import org.flowable.common.engine.api.FlowableWrongDbException;
 import org.flowable.common.engine.impl.db.ServiceSqlScriptBasedDbSchemaManager;
 import org.flowable.idm.engine.IdmEngine;
-import org.flowable.idm.engine.IdmEngineConfiguration;
-import org.flowable.idm.engine.impl.util.CommandContextUtil;
 
 public class IdmDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
     
@@ -27,7 +25,7 @@ public class IdmDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
     
    public IdmDbSchemaManager() {
        // note; no schema property set, managed by this class itself as it has (for historical reasons) it's own property table
-       super(IDM_PROPERTY_TABLE, SCHEMA_COMPONENT, null, VERSION_PROPERTY); 
+       super(IDM_PROPERTY_TABLE, SCHEMA_COMPONENT, VERSION_PROPERTY); 
    }
    
    @Override
@@ -131,26 +129,8 @@ protected boolean isMissingTablesException(Exception e) {
        return false;
    }
    
-   public void performSchemaOperationsIdmEngineBuild() {
-       String databaseSchemaUpdate = CommandContextUtil.getIdmEngineConfiguration().getDatabaseSchemaUpdate();
-       if (IdmEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE.equals(databaseSchemaUpdate)) {
-           try {
-               schemaDrop();
-           } catch (RuntimeException e) {
-               // ignore
-           }
-       }
-       if (IdmEngineConfiguration.DB_SCHEMA_UPDATE_CREATE_DROP.equals(databaseSchemaUpdate) || IdmEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE.equals(databaseSchemaUpdate)
-               || IdmEngineConfiguration.DB_SCHEMA_UPDATE_CREATE.equals(databaseSchemaUpdate)) {
-           schemaCreate();
-
-       } else if (IdmEngineConfiguration.DB_SCHEMA_UPDATE_FALSE.equals(databaseSchemaUpdate)) {
-           schemaCheckVersion();
-
-       } else if (IdmEngineConfiguration.DB_SCHEMA_UPDATE_TRUE.equals(databaseSchemaUpdate)) {
-           schemaUpdate();
-       }
+   @Override
+   public String getContext() {
+       return SCHEMA_COMPONENT;
    }
-
-
 }
diff --git a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/test/InternalFlowableIdmExtension.java b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/test/InternalFlowableIdmExtension.java
index 8e3668cc371..6519a9192a1 100644
--- a/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/test/InternalFlowableIdmExtension.java
+++ b/modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/test/InternalFlowableIdmExtension.java
@@ -92,16 +92,7 @@ protected void assertAndEnsureCleanDb(IdmEngine idmEngine, ExtensionContext cont
                 idmEngine.getIdmEngineConfiguration(),
                 ensureCleanDb,
                 !context.getExecutionException().isPresent(),
-                new Command<>() {
-
-                    @Override
-                    public Void execute(CommandContext commandContext) {
-                        SchemaManager schemaManager = CommandContextUtil.getIdmEngineConfiguration(commandContext).getSchemaManager();
-                        schemaManager.schemaDrop();
-                        schemaManager.schemaCreate();
-                        return null;
-                    }
-                }
+                idmEngine.getIdmEngineConfiguration().getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.cockroachdb.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.cockroachdb.create.identity.sql
index aaa86d5ca57..bafc54c6909 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.cockroachdb.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.cockroachdb.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 );
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ varchar(64),
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.db2.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.db2.create.identity.sql
index 33cfd2a22cb..2fcea67663e 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.db2.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.db2.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 );
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ varchar(64) not null,
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.h2.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.h2.create.identity.sql
index 20be7bbfadf..b7a87980dd7 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.h2.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.h2.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 );
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ varchar(64),
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.hsql.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.hsql.create.identity.sql
index 9e3c5134d2f..ec69af6b76f 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.hsql.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.hsql.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 );
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ varchar(64),
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mssql.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mssql.create.identity.sql
index 35db6657c1c..d3f093cedab 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mssql.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mssql.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 );
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ nvarchar(64),
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mysql.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mysql.create.identity.sql
index de9906ff6fc..333336f8d15 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mysql.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mysql.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ varchar(64),
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mysql55.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mysql55.create.identity.sql
index 93fd7aa6dc7..f7277b37879 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mysql55.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.mysql55.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ varchar(64),
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.oracle.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.oracle.create.identity.sql
index 11153c1a5fb..e7c2a366d14 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.oracle.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.oracle.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 );
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ NVARCHAR2(64),
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.postgres.create.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.postgres.create.identity.sql
index 7f8c0cc6c5a..a3d79991af6 100644
--- a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.postgres.create.identity.sql
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/create/flowable.postgres.create.identity.sql
@@ -6,7 +6,7 @@ create table ACT_ID_PROPERTY (
 );
 
 insert into ACT_ID_PROPERTY
-values ('schema.version', '7.1.0.0', 1);
+values ('schema.version', '7.1.0.1', 1);
 
 create table ACT_ID_BYTEARRAY (
     ID_ varchar(64),
diff --git a/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/upgrade/flowable.all.upgradestep.7100.to.7101.identity.sql b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/upgrade/flowable.all.upgradestep.7100.to.7101.identity.sql
new file mode 100644
index 00000000000..09287db1907
--- /dev/null
+++ b/modules/flowable-idm-engine/src/main/resources/org/flowable/idm/db/upgrade/flowable.all.upgradestep.7100.to.7101.identity.sql
@@ -0,0 +1 @@
+update ACT_ID_PROPERTY set VALUE_ = '7.1.0.1' where NAME_ = 'schema.version';
diff --git a/modules/flowable-idm-spring-configurator/src/main/java/org/flowable/idm/spring/configurator/SpringIdmEngineConfigurator.java b/modules/flowable-idm-spring-configurator/src/main/java/org/flowable/idm/spring/configurator/SpringIdmEngineConfigurator.java
index a184004fd54..25c4a74530f 100644
--- a/modules/flowable-idm-spring-configurator/src/main/java/org/flowable/idm/spring/configurator/SpringIdmEngineConfigurator.java
+++ b/modules/flowable-idm-spring-configurator/src/main/java/org/flowable/idm/spring/configurator/SpringIdmEngineConfigurator.java
@@ -34,7 +34,7 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
         SpringEngineConfiguration springEngineConfiguration = (SpringEngineConfiguration) engineConfiguration;
         ((SpringIdmEngineConfiguration) idmEngineConfiguration).setTransactionManager(springEngineConfiguration.getTransactionManager());
 
-        idmEngineConfiguration.buildIdmEngine();
+        initEngine();
 
         initServiceConfigurations(engineConfiguration, idmEngineConfiguration);
     }
diff --git a/modules/flowable-idm-spring/src/main/java/org/flowable/idm/spring/SpringIdmEngineConfiguration.java b/modules/flowable-idm-spring/src/main/java/org/flowable/idm/spring/SpringIdmEngineConfiguration.java
index 513a55c0c42..f8dc9d56bca 100644
--- a/modules/flowable-idm-spring/src/main/java/org/flowable/idm/spring/SpringIdmEngineConfiguration.java
+++ b/modules/flowable-idm-spring/src/main/java/org/flowable/idm/spring/SpringIdmEngineConfiguration.java
@@ -46,8 +46,8 @@ public SpringIdmEngineConfiguration() {
     }
 
     @Override
-    public IdmEngine buildIdmEngine() {
-        IdmEngine idmEngine = super.buildIdmEngine();
+    public IdmEngine buildEngine() {
+        IdmEngine idmEngine = super.buildEngine();
         IdmEngines.setInitialized(true);
         return idmEngine;
     }
diff --git a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/asyncexecutor/AcquireAsyncJobsDueRunnable.java b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/asyncexecutor/AcquireAsyncJobsDueRunnable.java
index 8d32e60b04e..a97c1d3e4e9 100644
--- a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/asyncexecutor/AcquireAsyncJobsDueRunnable.java
+++ b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/asyncexecutor/AcquireAsyncJobsDueRunnable.java
@@ -18,8 +18,8 @@
 
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableOptimisticLockingException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.impl.interceptor.CommandExecutor;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.job.service.impl.cmd.AcquireJobsCmd;
 import org.flowable.job.service.impl.cmd.AcquireJobsWithGlobalAcquireLockCmd;
diff --git a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/asyncexecutor/AcquireTimerJobsRunnable.java b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/asyncexecutor/AcquireTimerJobsRunnable.java
index f78a5499609..977ff5c3d81 100644
--- a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/asyncexecutor/AcquireTimerJobsRunnable.java
+++ b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/asyncexecutor/AcquireTimerJobsRunnable.java
@@ -24,8 +24,8 @@
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.api.FlowableOptimisticLockingException;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.engine.impl.interceptor.CommandExecutor;
-import org.flowable.common.engine.impl.lock.LockManager;
 import org.flowable.common.engine.impl.lock.LockManagerImpl;
 import org.flowable.job.service.impl.cmd.AcquireTimerJobsCmd;
 import org.flowable.job.service.impl.cmd.AcquireTimerJobsWithGlobalAcquireLockCmd;
diff --git a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/db/JobDbSchemaManager.java b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/db/JobDbSchemaManager.java
deleted file mode 100644
index 93dad28bde6..00000000000
--- a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/db/JobDbSchemaManager.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.job.service.impl.db;
-
-import org.flowable.common.engine.impl.db.ServiceSqlScriptBasedDbSchemaManager;
-
-/**
- * @author Joram Barrez 
- */
-public class JobDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
-    
-    private static final String JOB_TABLE = "ACT_RU_JOB";
-    private static final String JOB_VERSION_PROPERTY = "job.schema.version";
-    private static final String SCHEMA_COMPONENT = "job";
-    
-    public JobDbSchemaManager() {
-        super(JOB_TABLE, SCHEMA_COMPONENT, null, JOB_VERSION_PROPERTY);
-    }
-
-    @Override
-    protected String getResourcesRootDirectory() {
-        return "org/flowable/job/service/db/";
-    }
-
-}
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.cockroachdb.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.cockroachdb.create.job.sql
deleted file mode 100644
index d6f213e9b69..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.cockroachdb.create.job.sql
+++ /dev/null
@@ -1,264 +0,0 @@
-CREATE TABLE ACT_RU_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-CREATE TABLE ACT_RU_TIMER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-CREATE TABLE ACT_RU_SUSPENDED_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-CREATE TABLE ACT_RU_DEADLETTER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-CREATE TABLE ACT_RU_HISTORY_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    ADV_HANDLER_CFG_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-CREATE TABLE ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_);
-
-create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
--- force-commit
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.db2.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.db2.create.job.sql
deleted file mode 100644
index 1c666e523d3..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.db2.create.job.sql
+++ /dev/null
@@ -1,260 +0,0 @@
-create table ACT_RU_JOB (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) not null,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_TIMER_JOB (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) not null,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_SUSPENDED_JOB (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) not null,
-    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_DEADLETTER_JOB (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) not null,
-    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_HISTORY_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    ADV_HANDLER_CFG_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) not null,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_JOB_EXCEPTION_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VAL_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TJOB_EXCEPTION_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TJOB_CUSTOM_VAL_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TJOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TJOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-create index ACT_IDX_SJOB_EXCEPTION_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SJOB_CUSTOM_VAL_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SJOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DJOB_EXCEPTION_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DJOB_CUSTOM_VAL_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DJOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EJOB_EXCEPTION_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EJOB_CUSTOM_VAL_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EJOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.h2.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.h2.create.job.sql
deleted file mode 100644
index ac9fc25ed96..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.h2.create.job.sql
+++ /dev/null
@@ -1,260 +0,0 @@
-create table ACT_RU_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_TIMER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_SUSPENDED_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_DEADLETTER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_HISTORY_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    ADV_HANDLER_CFG_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.hsql.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.hsql.create.job.sql
deleted file mode 100644
index f4842df8fba..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.hsql.create.job.sql
+++ /dev/null
@@ -1,260 +0,0 @@
-create table ACT_RU_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_TIMER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_SUSPENDED_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_DEADLETTER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_HISTORY_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    ADV_HANDLER_CFG_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mssql.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mssql.create.job.sql
deleted file mode 100644
index 983cec73446..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mssql.create.job.sql
+++ /dev/null
@@ -1,260 +0,0 @@
-create table ACT_RU_JOB (
-    ID_ nvarchar(64) NOT NULL,
-    REV_ int,
-    CATEGORY_ varchar(255),
-    TYPE_ nvarchar(255) NOT NULL,
-    LOCK_EXP_TIME_ datetime,
-    LOCK_OWNER_ nvarchar(255),
-    EXCLUSIVE_ bit,
-    EXECUTION_ID_ nvarchar(64),
-    PROCESS_INSTANCE_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    ELEMENT_ID_ nvarchar(255),
-    ELEMENT_NAME_ nvarchar(255),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    CORRELATION_ID_ nvarchar(255),
-    RETRIES_ int,
-    EXCEPTION_STACK_ID_ nvarchar(64),
-    EXCEPTION_MSG_ nvarchar(4000),
-    DUEDATE_ datetime NULL,
-    REPEAT_ nvarchar(255),
-    HANDLER_TYPE_ nvarchar(255),
-    HANDLER_CFG_ nvarchar(4000),
-    CUSTOM_VALUES_ID_ nvarchar(64),
-    CREATE_TIME_ datetime2 NULL,
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_TIMER_JOB (
-    ID_ nvarchar(64) NOT NULL,
-    REV_ int,
-    CATEGORY_ varchar(255),
-    TYPE_ nvarchar(255) NOT NULL,
-    LOCK_EXP_TIME_ datetime,
-    LOCK_OWNER_ nvarchar(255),
-    EXCLUSIVE_ bit,
-    EXECUTION_ID_ nvarchar(64),
-    PROCESS_INSTANCE_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    ELEMENT_ID_ nvarchar(255),
-    ELEMENT_NAME_ nvarchar(255),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    CORRELATION_ID_ nvarchar(255),
-    RETRIES_ int,
-    EXCEPTION_STACK_ID_ nvarchar(64),
-    EXCEPTION_MSG_ nvarchar(4000),
-    DUEDATE_ datetime NULL,
-    REPEAT_ nvarchar(255),
-    HANDLER_TYPE_ nvarchar(255),
-    HANDLER_CFG_ nvarchar(4000),
-    CUSTOM_VALUES_ID_ nvarchar(64),
-    CREATE_TIME_ datetime2 NULL,
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_SUSPENDED_JOB (
-    ID_ nvarchar(64) NOT NULL,
-    REV_ int,
-    CATEGORY_ varchar(255),
-    TYPE_ nvarchar(255) NOT NULL,
-    EXCLUSIVE_ bit,
-    EXECUTION_ID_ nvarchar(64),
-    PROCESS_INSTANCE_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    ELEMENT_ID_ nvarchar(255),
-    ELEMENT_NAME_ nvarchar(255),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    CORRELATION_ID_ nvarchar(255),
-    RETRIES_ int,
-    EXCEPTION_STACK_ID_ nvarchar(64),
-    EXCEPTION_MSG_ nvarchar(4000),
-    DUEDATE_ datetime NULL,
-    REPEAT_ nvarchar(255),
-    HANDLER_TYPE_ nvarchar(255),
-    HANDLER_CFG_ nvarchar(4000),
-    CUSTOM_VALUES_ID_ nvarchar(64),
-    CREATE_TIME_ datetime2 NULL,
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_DEADLETTER_JOB (
-    ID_ nvarchar(64) NOT NULL,
-    REV_ int,
-    CATEGORY_ varchar(255),
-    TYPE_ nvarchar(255) NOT NULL,
-    EXCLUSIVE_ bit,
-    EXECUTION_ID_ nvarchar(64),
-    PROCESS_INSTANCE_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    ELEMENT_ID_ nvarchar(255),
-    ELEMENT_NAME_ nvarchar(255),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    CORRELATION_ID_ nvarchar(255),
-    EXCEPTION_STACK_ID_ nvarchar(64),
-    EXCEPTION_MSG_ nvarchar(4000),
-    DUEDATE_ datetime NULL,
-    REPEAT_ nvarchar(255),
-    HANDLER_TYPE_ nvarchar(255),
-    HANDLER_CFG_ nvarchar(4000),
-    CUSTOM_VALUES_ID_ nvarchar(64),
-    CREATE_TIME_ datetime2 NULL,
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_HISTORY_JOB (
-    ID_ nvarchar(64) NOT NULL,
-    REV_ int,
-    LOCK_EXP_TIME_ datetime NULL,
-    LOCK_OWNER_ nvarchar(255),
-    RETRIES_ int,
-    EXCEPTION_STACK_ID_ nvarchar(64),
-    EXCEPTION_MSG_ nvarchar(4000),
-    HANDLER_TYPE_ nvarchar(255),
-    HANDLER_CFG_ nvarchar(4000),
-    CUSTOM_VALUES_ID_ nvarchar(64),
-    ADV_HANDLER_CFG_ID_ nvarchar(64),
-    CREATE_TIME_ datetime2 NULL,
-    SCOPE_TYPE_ nvarchar(255),
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ nvarchar(64) NOT NULL,
-    REV_ int,
-    CATEGORY_ varchar(255),
-    TYPE_ nvarchar(255) NOT NULL,
-    LOCK_EXP_TIME_ datetime,
-    LOCK_OWNER_ nvarchar(255),
-    EXCLUSIVE_ bit,
-    EXECUTION_ID_ nvarchar(64),
-    PROCESS_INSTANCE_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    ELEMENT_ID_ nvarchar(255),
-    ELEMENT_NAME_ nvarchar(255),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    CORRELATION_ID_ nvarchar(255),
-    RETRIES_ int,
-    EXCEPTION_STACK_ID_ nvarchar(64),
-    EXCEPTION_MSG_ nvarchar(4000),
-    DUEDATE_ datetime NULL,
-    REPEAT_ nvarchar(255),
-    HANDLER_TYPE_ nvarchar(255),
-    HANDLER_CFG_ nvarchar(4000),
-    CUSTOM_VALUES_ID_ nvarchar(64),
-    CREATE_TIME_ datetime2 NULL,
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mysql.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mysql.create.job.sql
deleted file mode 100644
index bfc95754613..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mysql.create.job.sql
+++ /dev/null
@@ -1,260 +0,0 @@
-create table ACT_RU_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp(3) NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp(3) NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp(3) NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_TIMER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp(3) NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp(3) NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp(3) NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_SUSPENDED_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp(3) NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp(3) NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_DEADLETTER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp(3) NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp(3) NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_HISTORY_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    LOCK_EXP_TIME_ timestamp(3) NULL,
-    LOCK_OWNER_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    ADV_HANDLER_CFG_ID_ varchar(64),
-    CREATE_TIME_ timestamp(3) NULL,
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp(3) NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp(3) NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp(3) NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mysql55.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mysql55.create.job.sql
deleted file mode 100644
index 1e75050208a..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.mysql55.create.job.sql
+++ /dev/null
@@ -1,260 +0,0 @@
-create table ACT_RU_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_TIMER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_SUSPENDED_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_DEADLETTER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_HISTORY_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    LOCK_EXP_TIME_ timestamp NULL,
-    LOCK_OWNER_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    ADV_HANDLER_CFG_ID_ varchar(64),
-    CREATE_TIME_ timestamp NULL,
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.oracle.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.oracle.create.job.sql
deleted file mode 100644
index 4301e84583e..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.oracle.create.job.sql
+++ /dev/null
@@ -1,260 +0,0 @@
-create table ACT_RU_JOB (
-    ID_ NVARCHAR2(64) NOT NULL,
-    REV_ INTEGER,
-    CATEGORY_ NVARCHAR2(255),
-    TYPE_ NVARCHAR2(255) NOT NULL,
-    LOCK_EXP_TIME_ TIMESTAMP(6),
-    LOCK_OWNER_ NVARCHAR2(255),
-    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    ELEMENT_ID_ NVARCHAR2(255),
-    ELEMENT_NAME_ NVARCHAR2(255),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    CORRELATION_ID_ NVARCHAR2(255),
-    RETRIES_ INTEGER,
-    EXCEPTION_STACK_ID_ NVARCHAR2(64),
-    EXCEPTION_MSG_ NVARCHAR2(2000),
-    DUEDATE_ TIMESTAMP(6),
-    REPEAT_ NVARCHAR2(255),
-    HANDLER_TYPE_ NVARCHAR2(255),
-    HANDLER_CFG_ NVARCHAR2(2000),
-    CUSTOM_VALUES_ID_ NVARCHAR2(64),
-    CREATE_TIME_ TIMESTAMP(6),
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    primary key (ID_)
-);
-
-create table ACT_RU_TIMER_JOB (
-    ID_ NVARCHAR2(64) NOT NULL,
-    REV_ INTEGER,
-    CATEGORY_ NVARCHAR2(255),
-    TYPE_ NVARCHAR2(255) NOT NULL,
-    LOCK_EXP_TIME_ TIMESTAMP(6),
-    LOCK_OWNER_ NVARCHAR2(255),
-    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    ELEMENT_ID_ NVARCHAR2(255),
-    ELEMENT_NAME_ NVARCHAR2(255),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    CORRELATION_ID_ NVARCHAR2(255),
-    RETRIES_ INTEGER,
-    EXCEPTION_STACK_ID_ NVARCHAR2(64),
-    EXCEPTION_MSG_ NVARCHAR2(2000),
-    DUEDATE_ TIMESTAMP(6),
-    REPEAT_ NVARCHAR2(255),
-    HANDLER_TYPE_ NVARCHAR2(255),
-    HANDLER_CFG_ NVARCHAR2(2000),
-    CUSTOM_VALUES_ID_ NVARCHAR2(64),
-    CREATE_TIME_ TIMESTAMP(6),
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    primary key (ID_)
-);
-
-create table ACT_RU_SUSPENDED_JOB (
-    ID_ NVARCHAR2(64) NOT NULL,
-    REV_ INTEGER,
-    CATEGORY_ NVARCHAR2(255),
-    TYPE_ NVARCHAR2(255) NOT NULL,
-    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    ELEMENT_ID_ NVARCHAR2(255),
-    ELEMENT_NAME_ NVARCHAR2(255),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    CORRELATION_ID_ NVARCHAR2(255),
-    RETRIES_ INTEGER,
-    EXCEPTION_STACK_ID_ NVARCHAR2(64),
-    EXCEPTION_MSG_ NVARCHAR2(2000),
-    DUEDATE_ TIMESTAMP(6),
-    REPEAT_ NVARCHAR2(255),
-    HANDLER_TYPE_ NVARCHAR2(255),
-    HANDLER_CFG_ NVARCHAR2(2000),
-    CUSTOM_VALUES_ID_ NVARCHAR2(64),
-    CREATE_TIME_ TIMESTAMP(6),
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    primary key (ID_)
-);
-
-create table ACT_RU_DEADLETTER_JOB (
-    ID_ NVARCHAR2(64) NOT NULL,
-    REV_ INTEGER,
-    CATEGORY_ NVARCHAR2(255),
-    TYPE_ NVARCHAR2(255) NOT NULL,
-    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    ELEMENT_ID_ NVARCHAR2(255),
-    ELEMENT_NAME_ NVARCHAR2(255),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    CORRELATION_ID_ NVARCHAR2(255),
-    EXCEPTION_STACK_ID_ NVARCHAR2(64),
-    EXCEPTION_MSG_ NVARCHAR2(2000),
-    DUEDATE_ TIMESTAMP(6),
-    REPEAT_ NVARCHAR2(255),
-    HANDLER_TYPE_ NVARCHAR2(255),
-    HANDLER_CFG_ NVARCHAR2(2000),
-    CUSTOM_VALUES_ID_ NVARCHAR2(64),
-    CREATE_TIME_ TIMESTAMP(6),
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    primary key (ID_)
-);
-
-create table ACT_RU_HISTORY_JOB (
-    ID_ NVARCHAR2(64) NOT NULL,
-    REV_ INTEGER,
-    LOCK_EXP_TIME_ TIMESTAMP(6),
-    LOCK_OWNER_ NVARCHAR2(255),
-    RETRIES_ INTEGER,
-    EXCEPTION_STACK_ID_ NVARCHAR2(64),
-    EXCEPTION_MSG_ NVARCHAR2(2000),
-    HANDLER_TYPE_ NVARCHAR2(255),
-    HANDLER_CFG_ NVARCHAR2(2000),
-    CUSTOM_VALUES_ID_ NVARCHAR2(64),
-    ADV_HANDLER_CFG_ID_ NVARCHAR2(64),
-    CREATE_TIME_ TIMESTAMP(6),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    primary key (ID_)
-);
-
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ NVARCHAR2(64) NOT NULL,
-    REV_ INTEGER,
-    CATEGORY_ NVARCHAR2(255),
-    TYPE_ NVARCHAR2(255) NOT NULL,
-    LOCK_EXP_TIME_ TIMESTAMP(6),
-    LOCK_OWNER_ NVARCHAR2(255),
-    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    ELEMENT_ID_ NVARCHAR2(255),
-    ELEMENT_NAME_ NVARCHAR2(255),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    CORRELATION_ID_ NVARCHAR2(255),
-    RETRIES_ INTEGER,
-    EXCEPTION_STACK_ID_ NVARCHAR2(64),
-    EXCEPTION_MSG_ NVARCHAR2(2000),
-    DUEDATE_ TIMESTAMP(6),
-    REPEAT_ NVARCHAR2(255),
-    HANDLER_TYPE_ NVARCHAR2(255),
-    HANDLER_CFG_ NVARCHAR2(2000),
-    CUSTOM_VALUES_ID_ NVARCHAR2(64),
-    CREATE_TIME_ TIMESTAMP(6),
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_JOB_EXCEPTION on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VAL_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TJOB_EXCEPTION on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TJOB_CUSTOM_VAL_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TJOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TJOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-create index ACT_IDX_SJOB_EXCEPTION on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SJOB_CUSTOM_VAL_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SJOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DJOB_EXCEPTION on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DJOB_CUSTOM_VAL_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DJOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EJOB_EXCEPTION on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EJOB_CUSTOM_VAL_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EJOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);     
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.postgres.create.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.postgres.create.job.sql
deleted file mode 100644
index ac9fc25ed96..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/create/flowable.postgres.create.job.sql
+++ /dev/null
@@ -1,260 +0,0 @@
-create table ACT_RU_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_TIMER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_SUSPENDED_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_DEADLETTER_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_HISTORY_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    ADV_HANDLER_CFG_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    CORRELATION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_JOB_EXCEPTION_STACK_ID on ACT_RU_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_TIMER_JOB_EXCEPTION_STACK_ID on ACT_RU_TIMER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-create index ACT_IDX_SUSPENDED_JOB_EXCEPTION_STACK_ID on ACT_RU_SUSPENDED_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_DEADLETTER_JOB_EXCEPTION_STACK_ID on ACT_RU_DEADLETTER_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('job.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.cockroachdb.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.cockroachdb.drop.job.sql
deleted file mode 100644
index 27bf672c324..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.cockroachdb.drop.job.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-drop table if exists act_ru_job cascade;
-drop table if exists act_ru_timer_job cascade;
-drop table if exists act_ru_suspended_job cascade;
-drop table if exists act_ru_deadletter_job cascade;
-drop table if exists act_ru_history_job cascade;
-drop table if exists act_ru_external_job cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.db2.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.db2.drop.job.sql
deleted file mode 100644
index f37f0cec506..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.db2.drop.job.sql
+++ /dev/null
@@ -1,52 +0,0 @@
-drop index ACT_IDX_JOB_SCOPE;
-drop index ACT_IDX_JOB_SUB_SCOPE;
-drop index ACT_IDX_JOB_SCOPE_DEF;
-drop index ACT_IDX_TJOB_SCOPE;
-drop index ACT_IDX_TJOB_SUB_SCOPE;
-drop index ACT_IDX_TJOB_SCOPE_DEF;
-drop index ACT_IDX_SJOB_SCOPE;
-drop index ACT_IDX_SJOB_SUB_SCOPE;
-drop index ACT_IDX_SJOB_SCOPE_DEF;
-drop index ACT_IDX_DJOB_SCOPE;
-drop index ACT_IDX_DJOB_SUB_SCOPE;
-drop index ACT_IDX_DJOB_SCOPE_DEF;
-drop index ACT_IDX_EJOB_SCOPE;
-drop index ACT_IDX_EJOB_SUB_SCOPE;
-drop index ACT_IDX_EJOB_SCOPE_DEF;
-
-alter table ACT_RU_JOB
-    drop foreign key ACT_FK_JOB_EXCEPTION;
-
-alter table ACT_RU_JOB
-    drop foreign key ACT_FK_JOB_CUSTOM_VAL;
-
-alter table ACT_RU_TIMER_JOB
-    drop foreign key ACT_FK_TJOB_EXCEPTION;
-
-alter table ACT_RU_TIMER_JOB
-    drop foreign key ACT_FK_TJOB_CUSTOM_VAL;
-
-alter table ACT_RU_SUSPENDED_JOB
-    drop foreign key ACT_FK_SJOB_EXCEPTION;
-
-alter table ACT_RU_SUSPENDED_JOB
-    drop foreign key ACT_FK_SJOB_CUSTOM_VAL;
-
-alter table ACT_RU_DEADLETTER_JOB
-    drop foreign key ACT_FK_DJOB_EXCEPTION;
-
-alter table ACT_RU_DEADLETTER_JOB
-    drop foreign key ACT_FK_DJOB_CUSTOM_VAL;
-
-alter table ACT_RU_EXTERNAL_JOB
-    drop foreign key ACT_FK_EJOB_EXCEPTION;
-
-alter table ACT_RU_EXTERNAL_JOB
-    drop foreign key ACT_FK_EJOB_CUSTOM_VAL;
-
-drop table ACT_RU_JOB;
-drop table ACT_RU_TIMER_JOB;
-drop table ACT_RU_SUSPENDED_JOB;
-drop table ACT_RU_DEADLETTER_JOB;
-drop table ACT_RU_HISTORY_JOB;
-drop table ACT_RU_EXTERNAL_JOB;
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.h2.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.h2.drop.job.sql
deleted file mode 100644
index a77840201f3..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.h2.drop.job.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-drop index if exists ACT_IDX_JOB_SCOPE;
-drop index if exists ACT_IDX_JOB_SUB_SCOPE;
-drop index if exists ACT_IDX_JOB_SCOPE_DEF;
-drop index if exists ACT_IDX_TJOB_SCOPE;
-drop index if exists ACT_IDX_TJOB_SUB_SCOPE;
-drop index if exists ACT_IDX_TJOB_SCOPE_DEF;
-drop index if exists ACT_IDX_SJOB_SCOPE;
-drop index if exists ACT_IDX_SJOB_SUB_SCOPE;
-drop index if exists ACT_IDX_SJOB_SCOPE_DEF;
-drop index if exists ACT_IDX_DJOB_SCOPE;
-drop index if exists ACT_IDX_DJOB_SUB_SCOPE;
-drop index if exists ACT_IDX_DJOB_SCOPE_DEF;  
-drop index if exists ACT_IDX_EJOB_SCOPE;
-drop index if exists ACT_IDX_EJOB_SUB_SCOPE;
-drop index if exists ACT_IDX_EJOB_SCOPE_DEF;
-
-drop table if exists ACT_RU_JOB cascade constraints;
-drop table if exists ACT_RU_EXTERNAL_JOB cascade constraints;
-drop table if exists ACT_RU_TIMER_JOB cascade constraints;
-drop table if exists ACT_RU_SUSPENDED_JOB cascade constraints;
-drop table if exists ACT_RU_DEADLETTER_JOB cascade constraints;
-drop table if exists ACT_RU_HISTORY_JOB cascade constraints;
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.hsql.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.hsql.drop.job.sql
deleted file mode 100644
index 36671613c51..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.hsql.drop.job.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-drop index if exists ACT_IDX_JOB_SCOPE;
-drop index if exists ACT_IDX_JOB_SUB_SCOPE;
-drop index if exists ACT_IDX_JOB_SCOPE_DEF;
-drop index if exists ACT_IDX_TJOB_SCOPE;
-drop index if exists ACT_IDX_TJOB_SUB_SCOPE;
-drop index if exists ACT_IDX_TJOB_SCOPE_DEF;
-drop index if exists ACT_IDX_SJOB_SCOPE;
-drop index if exists ACT_IDX_SJOB_SUB_SCOPE;
-drop index if exists ACT_IDX_SJOB_SCOPE_DEF;
-drop index if exists ACT_IDX_DJOB_SCOPE;
-drop index if exists ACT_IDX_DJOB_SUB_SCOPE;
-drop index if exists ACT_IDX_DJOB_SCOPE_DEF;
-
-drop table if exists ACT_RU_JOB cascade;
-drop table if exists ACT_RU_TIMER_JOB cascade;
-drop table if exists ACT_RU_SUSPENDED_JOB cascade;
-drop table if exists ACT_RU_DEADLETTER_JOB cascade;
-drop table if exists ACT_RU_EXTERNAL_JOB cascade;
-drop table if exists ACT_RU_HISTORY_JOB cascade;
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.mssql.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.mssql.drop.job.sql
deleted file mode 100644
index cfa930c0e2c..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.mssql.drop.job.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_JOB_SCOPE') drop index ACT_RU_JOB.ACT_IDX_JOB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_JOB_SUB_SCOPE') drop index ACT_RU_JOB.ACT_IDX_JOB_SUB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_JOB_SCOPE_DEF') drop index ACT_RU_JOB.ACT_IDX_JOB_SCOPE_DEF;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TJOB_SCOPE') drop index ACT_RU_TIMER_JOB.ACT_IDX_TJOB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TJOB_SUB_SCOPE') drop index ACT_RU_TIMER_JOB.ACT_IDX_TJOB_SUB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TJOB_SCOPE_DEF') drop index ACT_RU_TIMER_JOB.ACT_IDX_TJOB_SCOPE_DEF;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_SJOB_SCOPE') drop index ACT_RU_SUSPENDED_JOB.ACT_IDX_SJOB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_SJOB_SUB_SCOPE') drop index ACT_RU_SUSPENDED_JOB.ACT_IDX_SJOB_SUB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_SJOB_SCOPE_DEF') drop index ACT_RU_SUSPENDED_JOB.ACT_IDX_SJOB_SCOPE_DEF;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_DJOB_SCOPE') drop index ACT_RU_DEADLETTER_JOB.ACT_IDX_DJOB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_DJOB_SUB_SCOPE') drop index ACT_RU_DEADLETTER_JOB.ACT_IDX_DJOB_SUB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_DJOB_SCOPE_DEF') drop index ACT_RU_DEADLETTER_JOB.ACT_IDX_DJOB_SCOPE_DEF;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EJOB_SCOPE') drop index ACT_RU_EXTERNAL_JOB.ACT_IDX_EJOB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EJOB_SUB_SCOPE') drop index ACT_RU_EXTERNAL_JOB.ACT_IDX_EJOB_SUB_SCOPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_EJOB_SCOPE_DEF') drop index ACT_RU_EXTERNAL_JOB.ACT_IDX_EJOB_SCOPE_DEF;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') alter table ACT_RU_JOB drop constraint ACT_FK_JOB_EXCEPTION;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') alter table ACT_RU_JOB drop constraint ACT_FK_JOB_CUSTOM_VALUES;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TIMER_JOB') alter table ACT_RU_TIMER_JOB drop constraint ACT_FK_TIMER_JOB_EXCEPTION;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TIMER_JOB') alter table ACT_RU_TIMER_JOB drop constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_SUSPENDED_JOB') alter table ACT_RU_SUSPENDED_JOB drop constraint ACT_FK_SUSPENDED_JOB_EXCEPTION;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_SUSPENDED_JOB') alter table ACT_RU_SUSPENDED_JOB drop constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_DEADLETTER_JOB') alter table ACT_RU_DEADLETTER_JOB drop constraint ACT_FK_DEADLETTER_JOB_EXCEPTION;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_DEADLETTER_JOB') alter table ACT_RU_DEADLETTER_JOB drop constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXTERNAL_JOB') alter table ACT_RU_EXTERNAL_JOB drop constraint ACT_FK_EXTERNAL_JOB_EXCEPTION;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXTERNAL_JOB') alter table ACT_RU_EXTERNAL_JOB drop constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_JOB') drop table ACT_RU_JOB;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TIMER_JOB') drop table ACT_RU_TIMER_JOB;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_SUSPENDED_JOB') drop table ACT_RU_SUSPENDED_JOB;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_DEADLETTER_JOB') drop table ACT_RU_DEADLETTER_JOB;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_HISTORY_JOB') drop table ACT_RU_HISTORY_JOB;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_EXTERNAL_JOB') drop table ACT_RU_EXTERNAL_JOB;
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.mysql.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.mysql.drop.job.sql
deleted file mode 100644
index 1271083b1fd..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.mysql.drop.job.sql
+++ /dev/null
@@ -1,52 +0,0 @@
-drop index ACT_IDX_JOB_SCOPE on ACT_RU_JOB;
-drop index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB;
-drop index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB;
-drop index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB;
-drop index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB;
-drop index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB;
-drop index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB;
-drop index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB;
-drop index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB;
-drop index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB;
-drop index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB;
-drop index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB;
-drop index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB;
-drop index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB;
-drop index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB;
-
-alter table ACT_RU_JOB
-    drop foreign key ACT_FK_JOB_EXCEPTION;
-
-alter table ACT_RU_JOB
-    drop foreign key ACT_FK_JOB_CUSTOM_VALUES;
-
-alter table ACT_RU_TIMER_JOB
-    drop foreign key ACT_FK_TIMER_JOB_EXCEPTION;
-
-alter table ACT_RU_TIMER_JOB
-    drop foreign key ACT_FK_TIMER_JOB_CUSTOM_VALUES;
-
-alter table ACT_RU_SUSPENDED_JOB
-    drop foreign key ACT_FK_SUSPENDED_JOB_EXCEPTION;
-
-alter table ACT_RU_SUSPENDED_JOB
-    drop foreign key ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES;
-
-alter table ACT_RU_DEADLETTER_JOB
-    drop foreign key ACT_FK_DEADLETTER_JOB_EXCEPTION;
-
-alter table ACT_RU_DEADLETTER_JOB
-    drop foreign key ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES;
-
-alter table ACT_RU_EXTERNAL_JOB
-    drop foreign key ACT_FK_EXTERNAL_JOB_EXCEPTION;
-
-alter table ACT_RU_EXTERNAL_JOB
-    drop foreign key ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES;
-
-drop table if exists ACT_RU_JOB;
-drop table if exists ACT_RU_TIMER_JOB;
-drop table if exists ACT_RU_SUSPENDED_JOB;
-drop table if exists ACT_RU_DEADLETTER_JOB;
-drop table if exists ACT_RU_HISTORY_JOB;
-drop table if exists ACT_RU_EXTERNAL_JOB;
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.oracle.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.oracle.drop.job.sql
deleted file mode 100644
index b60c993f285..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.oracle.drop.job.sql
+++ /dev/null
@@ -1,73 +0,0 @@
-drop index ACT_IDX_JOB_SCOPE;
-drop index ACT_IDX_JOB_SUB_SCOPE;
-drop index ACT_IDX_JOB_SCOPE_DEF;
-drop index ACT_IDX_TJOB_SCOPE;
-drop index ACT_IDX_TJOB_SUB_SCOPE;
-drop index ACT_IDX_TJOB_SCOPE_DEF;
-drop index ACT_IDX_SJOB_SCOPE;
-drop index ACT_IDX_SJOB_SUB_SCOPE;
-drop index ACT_IDX_SJOB_SCOPE_DEF;
-drop index ACT_IDX_DJOB_SCOPE;
-drop index ACT_IDX_DJOB_SUB_SCOPE;
-drop index ACT_IDX_DJOB_SCOPE_DEF;
-drop index ACT_IDX_EJOB_SCOPE;
-drop index ACT_IDX_EJOB_SUB_SCOPE;
-drop index ACT_IDX_EJOB_SCOPE_DEF;
-
-drop index ACT_IDX_JOB_EXCEPTION;
-drop index ACT_IDX_JOB_CUSTOM_VAL_ID;
-drop index ACT_IDX_JOB_CORRELATION_ID;
-
-drop index ACT_IDX_TJOB_EXCEPTION;
-drop index ACT_IDX_TJOB_CUSTOM_VAL_ID;
-drop index ACT_IDX_TJOB_CORRELATION_ID;
-drop index ACT_IDX_TJOB_DUEDATE; 
-
-drop index ACT_IDX_SJOB_EXCEPTION;
-drop index ACT_IDX_SJOB_CUSTOM_VAL_ID;
-drop index ACT_IDX_SJOB_CORRELATION_ID;
-
-drop index ACT_IDX_DJOB_EXCEPTION;
-drop index ACT_IDX_DJOB_CUSTOM_VAL_ID;
-drop index ACT_IDX_DJOB_CORRELATION_ID;
-
-drop index ACT_IDX_EJOB_EXCEPTION;
-drop index ACT_IDX_EJOB_CUSTOM_VAL_ID;
-drop index ACT_IDX_EJOB_CORRELATION_ID;
-
-alter table ACT_RU_JOB
-    drop CONSTRAINT ACT_FK_JOB_EXCEPTION;
-
-alter table ACT_RU_JOB
-    drop CONSTRAINT ACT_FK_JOB_CUSTOM_VAL;
-
-alter table ACT_RU_TIMER_JOB
-    drop CONSTRAINT ACT_FK_TJOB_EXCEPTION;
-
-alter table ACT_RU_TIMER_JOB
-    drop CONSTRAINT ACT_FK_TJOB_CUSTOM_VAL;
-
-alter table ACT_RU_SUSPENDED_JOB
-    drop CONSTRAINT ACT_FK_SJOB_EXCEPTION;
-
-alter table ACT_RU_SUSPENDED_JOB
-    drop CONSTRAINT ACT_FK_SJOB_CUSTOM_VAL;
-
-alter table ACT_RU_DEADLETTER_JOB
-    drop CONSTRAINT ACT_FK_DJOB_EXCEPTION;
-
-alter table ACT_RU_DEADLETTER_JOB
-    drop CONSTRAINT ACT_FK_DJOB_CUSTOM_VAL;
-
-alter table ACT_RU_EXTERNAL_JOB
-    drop CONSTRAINT ACT_FK_DJOB_EXCEPTION;
-
-alter table ACT_RU_EXTERNAL_JOB
-    drop CONSTRAINT ACT_FK_DJOB_CUSTOM_VAL;
-
-drop table ACT_RU_JOB;
-drop table ACT_RU_TIMER_JOB;
-drop table ACT_RU_SUSPENDED_JOB;
-drop table ACT_RU_DEADLETTER_JOB;
-drop table ACT_RU_HISTORY_JOB;
-drop table ACT_RU_EXTERNAL_JOB;
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.postgres.drop.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.postgres.drop.job.sql
deleted file mode 100644
index b40b5340063..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/drop/flowable.postgres.drop.job.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table if exists ACT_RU_JOB cascade;
-drop table if exists ACT_RU_TIMER_JOB cascade;
-drop table if exists ACT_RU_SUSPENDED_JOB cascade;
-drop table if exists ACT_RU_DEADLETTER_JOB cascade;
-drop table if exists ACT_RU_HISTORY_JOB cascade;
-drop table if exists ACT_RU_EXTERNAL_JOB cascade;
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6120.to.6200.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6120.to.6200.job.sql
deleted file mode 100644
index 7dda0da7d18..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6120.to.6200.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-insert into ACT_GE_PROPERTY values ('job.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.job.sql
deleted file mode 100644
index 46095f642bd..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-update ACT_RU_TIMER_JOB set HANDLER_TYPE_ = 'cmmn-trigger-timer' where HANDLER_TYPE_ = 'trigger-timer' and SCOPE_TYPE_ = 'cmmn';
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.job.sql
deleted file mode 100644
index bae42ddec20..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 41d60c12252..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.job.sql
deleted file mode 100644
index 7252410620e..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.2.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.job.sql
deleted file mode 100644
index 10cb9199993..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.0.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.job.sql
deleted file mode 100644
index 62ff8113cc1..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.job.sql
deleted file mode 100644
index 8f9cbc7dd51..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.job.sql
deleted file mode 100644
index cc0995d3fd0..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.job.sql
deleted file mode 100644
index 975a1bbd312..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.job.sql
deleted file mode 100644
index 99cb6d43c5f..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.job.sql
deleted file mode 100644
index e1d867942c9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.job.sql
deleted file mode 100644
index bc9442af361..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.job.sql
deleted file mode 100644
index 289b3a203cf..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.4' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.job.sql
deleted file mode 100644
index 72c549e593e..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.job.sql
deleted file mode 100644
index e1fba2ccffa..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.6' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.job.sql
deleted file mode 100644
index 61260fd616f..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.job.sql
deleted file mode 100644
index fe2c46ba344..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.job.sql
deleted file mode 100644
index 676af3544dc..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.5' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.job.sql
deleted file mode 100644
index 02c727286f9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.job.sql
deleted file mode 100644
index 9a0e6411358..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.job.sql
deleted file mode 100644
index ce5bc8ca5c9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.job.sql
deleted file mode 100644
index ec154f73a98..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.job.sql
deleted file mode 100644
index 47b1d8ae582..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.1' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.job.sql
deleted file mode 100644
index f3759ce4212..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.job.sql
deleted file mode 100644
index c912718d2fc..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.1' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.job.sql
deleted file mode 100644
index e4dae4ff08f..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.job.sql
deleted file mode 100644
index aa30a3e4da1..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.job.sql
deleted file mode 100644
index 596b6129bd1..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.job.sql
deleted file mode 100644
index 1b0aa0f1d5e..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.job.sql
deleted file mode 100644
index 01079003940..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.job.sql
deleted file mode 100644
index 1cb2084ca14..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.0.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.job.sql
deleted file mode 100644
index bbe273e6f0b..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.job.sql
deleted file mode 100644
index 23bb86db458..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.0.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.job.sql
deleted file mode 100644
index d3bd3ad5562..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.job.sql
deleted file mode 100644
index 22769e6c381..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.job.sql
deleted file mode 100644
index 1f61efe492a..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.job.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6200.to.6210.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6200.to.6210.job.sql
deleted file mode 100644
index fc5bbd9bb03..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6200.to.6210.job.sql
+++ /dev/null
@@ -1,76 +0,0 @@
-alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_JOB');
-
-alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_TIMER_JOB');
-
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_SUSPENDED_JOB');
-
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-Call Sysproc.admin_cmd ('REORG TABLE ACT_RU_DEADLETTER_JOB');
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-
-create index ACT_IDX_JOB_CUSTOM_VAL_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TJOB_CUSTOM_VAL_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SJOB_CUSTOM_VAL_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DJOB_CUSTOM_VAL_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 3f9341c4de6..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_HISTORY_JOB add column SCOPE_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6500.to.6501.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6500.to.6501.job.sql
deleted file mode 100644
index abcdcd980f9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6500.to.6501.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6511.to.6512.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6511.to.6512.job.sql
deleted file mode 100644
index 939cc483b88..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6511.to.6512.job.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6512.to.6513.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6512.to.6513.job.sql
deleted file mode 100644
index a9944151f47..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6512.to.6513.job.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) not null,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ smallint check(EXCLUSIVE_ in (1,0)),
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EJOB_EXCEPTION_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EJOB_CUSTOM_VAL_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6513.to.6514.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6513.to.6514.job.sql
deleted file mode 100644
index 0e8fda8b68a..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6513.to.6514.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-create index ACT_IDX_TJOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_SJOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-create index ACT_IDX_DJOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-create index ACT_IDX_EJOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6601.to.6610.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6601.to.6610.job.sql
deleted file mode 100644
index 44c3468b5b3..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.db2.upgradestep.6601.to.6610.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_TJOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6200.to.6210.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6200.to.6210.job.sql
deleted file mode 100644
index 58f59520416..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6200.to.6210.job.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);  
-
-alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 3f9341c4de6..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_HISTORY_JOB add column SCOPE_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6500.to.6501.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6500.to.6501.job.sql
deleted file mode 100644
index abcdcd980f9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6500.to.6501.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6511.to.6512.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6511.to.6512.job.sql
deleted file mode 100644
index 939cc483b88..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6511.to.6512.job.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6512.to.6513.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6512.to.6513.job.sql
deleted file mode 100644
index 34df9073a80..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6512.to.6513.job.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6513.to.6514.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6513.to.6514.job.sql
deleted file mode 100644
index 8386eeb18c5..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6513.to.6514.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6601.to.6610.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6601.to.6610.job.sql
deleted file mode 100644
index 1bd5f30fd36..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.h2.upgradestep.6601.to.6610.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6200.to.6210.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6200.to.6210.job.sql
deleted file mode 100644
index ad43d7b65bd..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6200.to.6210.job.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 3f9341c4de6..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_HISTORY_JOB add column SCOPE_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6500.to.6501.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6500.to.6501.job.sql
deleted file mode 100644
index abcdcd980f9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6500.to.6501.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6511.to.6512.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6511.to.6512.job.sql
deleted file mode 100644
index 939cc483b88..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6511.to.6512.job.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6512.to.6513.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6512.to.6513.job.sql
deleted file mode 100644
index 34df9073a80..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6512.to.6513.job.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6513.to.6514.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6513.to.6514.job.sql
deleted file mode 100644
index 8386eeb18c5..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6513.to.6514.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6601.to.6610.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6601.to.6610.job.sql
deleted file mode 100644
index 1bd5f30fd36..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.hsql.upgradestep.6601.to.6610.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.job.sql
deleted file mode 100644
index d398a38aedf..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6200.to.6210.job.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-alter table ACT_RU_JOB add SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_JOB add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_JOB add SCOPE_TYPE_ nvarchar(255);
-alter table ACT_RU_JOB add SCOPE_DEFINITION_ID_ nvarchar(255);
-
-alter table ACT_RU_TIMER_JOB add SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_TIMER_JOB add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_TIMER_JOB add SCOPE_TYPE_ nvarchar(255);
-alter table ACT_RU_TIMER_JOB add SCOPE_DEFINITION_ID_ nvarchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_SUSPENDED_JOB add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_SUSPENDED_JOB add SCOPE_TYPE_ nvarchar(255);
-alter table ACT_RU_SUSPENDED_JOB add SCOPE_DEFINITION_ID_ nvarchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_DEADLETTER_JOB add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_DEADLETTER_JOB add SCOPE_TYPE_ nvarchar(255);
-alter table ACT_RU_DEADLETTER_JOB add SCOPE_DEFINITION_ID_ nvarchar(255);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-alter table ACT_RU_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
-alter table ACT_RU_TIMER_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
-alter table ACT_RU_SUSPENDED_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
-alter table ACT_RU_DEADLETTER_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
-alter table ACT_RU_HISTORY_JOB add CUSTOM_VALUES_ID_ nvarchar(64);
-
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 72b7d0b99d5..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_HISTORY_JOB add SCOPE_TYPE_ nvarchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6500.to.6501.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6500.to.6501.job.sql
deleted file mode 100644
index 54708f72aa3..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6500.to.6501.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add ELEMENT_ID_ nvarchar(255);
-alter table ACT_RU_JOB add ELEMENT_NAME_ nvarchar(255);
-
-alter table ACT_RU_TIMER_JOB add ELEMENT_ID_ nvarchar(255);
-alter table ACT_RU_TIMER_JOB add ELEMENT_NAME_ nvarchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add ELEMENT_ID_ nvarchar(255);
-alter table ACT_RU_SUSPENDED_JOB add ELEMENT_NAME_ nvarchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add ELEMENT_ID_ nvarchar(255);
-alter table ACT_RU_DEADLETTER_JOB add ELEMENT_NAME_ nvarchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.job.sql
deleted file mode 100644
index 98778e9e13b..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6511.to.6512.job.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_JOB add CATEGORY_ nvarchar(255);
-
-alter table ACT_RU_TIMER_JOB add CATEGORY_ nvarchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add CATEGORY_ nvarchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add CATEGORY_ nvarchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6512.to.6513.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6512.to.6513.job.sql
deleted file mode 100644
index e151ade2202..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6512.to.6513.job.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ nvarchar(64) NOT NULL,
-    REV_ int,
-    CATEGORY_ varchar(255),
-    TYPE_ nvarchar(255) NOT NULL,
-    LOCK_EXP_TIME_ datetime,
-    LOCK_OWNER_ nvarchar(255),
-    EXCLUSIVE_ bit,
-    EXECUTION_ID_ nvarchar(64),
-    PROCESS_INSTANCE_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    ELEMENT_ID_ nvarchar(255),
-    ELEMENT_NAME_ nvarchar(255),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    RETRIES_ int,
-    EXCEPTION_STACK_ID_ nvarchar(64),
-    EXCEPTION_MSG_ nvarchar(4000),
-    DUEDATE_ datetime NULL,
-    REPEAT_ nvarchar(255),
-    HANDLER_TYPE_ nvarchar(255),
-    HANDLER_CFG_ nvarchar(4000),
-    CUSTOM_VALUES_ID_ nvarchar(64),
-    CREATE_TIME_ datetime2 NULL,
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6513.to.6514.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6513.to.6514.job.sql
deleted file mode 100644
index 4e17c85c563..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6513.to.6514.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add CORRELATION_ID_ nvarchar(255);
-alter table ACT_RU_TIMER_JOB add CORRELATION_ID_ nvarchar(255);
-alter table ACT_RU_SUSPENDED_JOB add CORRELATION_ID_ nvarchar(255);
-alter table ACT_RU_DEADLETTER_JOB add CORRELATION_ID_ nvarchar(255);
-alter table ACT_RU_EXTERNAL_JOB add CORRELATION_ID_ nvarchar(255);
-
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.job.sql
deleted file mode 100644
index 1bd5f30fd36..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mssql.upgradestep.6601.to.6610.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.job.sql
deleted file mode 100644
index ad43d7b65bd..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6200.to.6210.job.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 3f9341c4de6..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_HISTORY_JOB add column SCOPE_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6500.to.6501.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6500.to.6501.job.sql
deleted file mode 100644
index abcdcd980f9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6500.to.6501.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.job.sql
deleted file mode 100644
index 939cc483b88..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6511.to.6512.job.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6512.to.6513.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6512.to.6513.job.sql
deleted file mode 100644
index 2855f28cbb8..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6512.to.6513.job.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp(3) NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp(3) NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp(3) NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6513.to.6514.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6513.to.6514.job.sql
deleted file mode 100644
index 8386eeb18c5..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6513.to.6514.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.job.sql
deleted file mode 100644
index 1bd5f30fd36..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql.upgradestep.6601.to.6610.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6200.to.6210.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6200.to.6210.job.sql
deleted file mode 100644
index ad43d7b65bd..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6200.to.6210.job.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 3f9341c4de6..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_HISTORY_JOB add column SCOPE_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6500.to.6501.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6500.to.6501.job.sql
deleted file mode 100644
index abcdcd980f9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6500.to.6501.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6511.to.6512.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6511.to.6512.job.sql
deleted file mode 100644
index 939cc483b88..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6511.to.6512.job.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6512.to.6513.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6512.to.6513.job.sql
deleted file mode 100644
index 4d49e8a81c6..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6512.to.6513.job.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp NULL,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6513.to.6514.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6513.to.6514.job.sql
deleted file mode 100644
index 8386eeb18c5..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6513.to.6514.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6601.to.6610.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6601.to.6610.job.sql
deleted file mode 100644
index 1bd5f30fd36..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.mysql55.upgradestep.6601.to.6610.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.job.sql
deleted file mode 100644
index 3d80937b754..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6200.to.6210.job.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-alter table ACT_RU_JOB add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_JOB add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_JOB add SCOPE_TYPE_ NVARCHAR2(255);
-alter table ACT_RU_JOB add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
-
-alter table ACT_RU_TIMER_JOB add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_TIMER_JOB add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_TIMER_JOB add SCOPE_TYPE_ NVARCHAR2(255);
-alter table ACT_RU_TIMER_JOB add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
-
-alter table ACT_RU_SUSPENDED_JOB add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_SUSPENDED_JOB add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_SUSPENDED_JOB add SCOPE_TYPE_ NVARCHAR2(255);
-alter table ACT_RU_SUSPENDED_JOB add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
-
-alter table ACT_RU_DEADLETTER_JOB add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_DEADLETTER_JOB add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_DEADLETTER_JOB add SCOPE_TYPE_ NVARCHAR2(255);
-alter table ACT_RU_DEADLETTER_JOB add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-alter table ACT_RU_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
-alter table ACT_RU_TIMER_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
-alter table ACT_RU_SUSPENDED_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
-alter table ACT_RU_DEADLETTER_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
-alter table ACT_RU_HISTORY_JOB add CUSTOM_VALUES_ID_ NVARCHAR2(64);
-
-create index ACT_IDX_JOB_CUSTOM_VAL_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TJOB_CUSTOM_VAL_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SJOB_CUSTOM_VAL_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DJOB_CUSTOM_VAL_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 17a36574fd6..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_HISTORY_JOB add SCOPE_TYPE_ NVARCHAR2(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6500.to.6501.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6500.to.6501.job.sql
deleted file mode 100644
index ea2db4d722b..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6500.to.6501.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add ELEMENT_ID_ NVARCHAR2(255);
-alter table ACT_RU_JOB add ELEMENT_NAME_ NVARCHAR2(255);
-
-alter table ACT_RU_TIMER_JOB add ELEMENT_ID_ NVARCHAR2(255);
-alter table ACT_RU_TIMER_JOB add ELEMENT_NAME_ NVARCHAR2(255);
-
-alter table ACT_RU_SUSPENDED_JOB add ELEMENT_ID_ NVARCHAR2(255);
-alter table ACT_RU_SUSPENDED_JOB add ELEMENT_NAME_ NVARCHAR2(255);
-
-alter table ACT_RU_DEADLETTER_JOB add ELEMENT_ID_ NVARCHAR2(255);
-alter table ACT_RU_DEADLETTER_JOB add ELEMENT_NAME_ NVARCHAR2(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.job.sql
deleted file mode 100644
index 296ca446189..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6511.to.6512.job.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_JOB add CATEGORY_ NVARCHAR2(255);
-
-alter table ACT_RU_TIMER_JOB add CATEGORY_ NVARCHAR2(255);
-
-alter table ACT_RU_SUSPENDED_JOB add CATEGORY_ NVARCHAR2(255);
-
-alter table ACT_RU_DEADLETTER_JOB add CATEGORY_ NVARCHAR2(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6512.to.6513.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6512.to.6513.job.sql
deleted file mode 100644
index 145ed42d402..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6512.to.6513.job.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ NVARCHAR2(64) NOT NULL,
-    REV_ INTEGER,
-    CATEGORY_ NVARCHAR2(255),
-    TYPE_ NVARCHAR2(255) NOT NULL,
-    LOCK_EXP_TIME_ TIMESTAMP(6),
-    LOCK_OWNER_ NVARCHAR2(255),
-    EXCLUSIVE_ NUMBER(1,0) CHECK (EXCLUSIVE_ IN (1,0)),
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROCESS_INSTANCE_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    ELEMENT_ID_ NVARCHAR2(255),
-    ELEMENT_NAME_ NVARCHAR2(255),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    RETRIES_ INTEGER,
-    EXCEPTION_STACK_ID_ NVARCHAR2(64),
-    EXCEPTION_MSG_ NVARCHAR2(2000),
-    DUEDATE_ TIMESTAMP(6),
-    REPEAT_ NVARCHAR2(255),
-    HANDLER_TYPE_ NVARCHAR2(255),
-    HANDLER_CFG_ NVARCHAR2(2000),
-    CUSTOM_VALUES_ID_ NVARCHAR2(64),
-    CREATE_TIME_ TIMESTAMP(6),
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EJOB_EXCEPTION on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EJOB_CUSTOM_VAL_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EJOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EJOB_CUSTOM_VAL
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6513.to.6514.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6513.to.6514.job.sql
deleted file mode 100644
index 66024c304dd..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6513.to.6514.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add CORRELATION_ID_ NVARCHAR2(255);
-alter table ACT_RU_TIMER_JOB add CORRELATION_ID_ NVARCHAR2(255);
-alter table ACT_RU_SUSPENDED_JOB add CORRELATION_ID_ NVARCHAR2(255);
-alter table ACT_RU_DEADLETTER_JOB add CORRELATION_ID_ NVARCHAR2(255);
-alter table ACT_RU_EXTERNAL_JOB add CORRELATION_ID_ NVARCHAR2(255);
-
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-create index ACT_IDX_TJOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_SJOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-create index ACT_IDX_DJOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-create index ACT_IDX_EJOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.job.sql
deleted file mode 100644
index f84a527d4b3..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.oracle.upgradestep.6601.to.6610.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_TJOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.job.sql
deleted file mode 100644
index ad43d7b65bd..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6200.to.6210.job.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-alter table ACT_RU_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_SCOPE on ACT_RU_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SUB_SCOPE on ACT_RU_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_JOB_SCOPE_DEF on ACT_RU_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_TJOB_SCOPE on ACT_RU_TIMER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SUB_SCOPE on ACT_RU_TIMER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TJOB_SCOPE_DEF on ACT_RU_TIMER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-create index ACT_IDX_SJOB_SCOPE on ACT_RU_SUSPENDED_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SUB_SCOPE on ACT_RU_SUSPENDED_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_SJOB_SCOPE_DEF on ACT_RU_SUSPENDED_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);   
-
-create index ACT_IDX_DJOB_SCOPE on ACT_RU_DEADLETTER_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SUB_SCOPE on ACT_RU_DEADLETTER_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_DJOB_SCOPE_DEF on ACT_RU_DEADLETTER_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
-
-alter table ACT_RU_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_TIMER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_SUSPENDED_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_DEADLETTER_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-alter table ACT_RU_HISTORY_JOB add column CUSTOM_VALUES_ID_ varchar(64);
-
-create index ACT_IDX_JOB_CUSTOM_VALUES_ID on ACT_RU_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_TIMER_JOB_CUSTOM_VALUES_ID on ACT_RU_TIMER_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CUSTOM_VALUES_ID on ACT_RU_SUSPENDED_JOB(CUSTOM_VALUES_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CUSTOM_VALUES_ID on ACT_RU_DEADLETTER_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_TIMER_JOB
-    add constraint ACT_FK_TIMER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_SUSPENDED_JOB
-    add constraint ACT_FK_SUSPENDED_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_DEADLETTER_JOB
-    add constraint ACT_FK_DEADLETTER_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6301.to.6310.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6301.to.6310.job.sql
deleted file mode 100644
index 3f9341c4de6..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6301.to.6310.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_HISTORY_JOB add column SCOPE_TYPE_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6500.to.6501.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6500.to.6501.job.sql
deleted file mode 100644
index abcdcd980f9..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6500.to.6501.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column ELEMENT_NAME_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column ELEMENT_NAME_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'job.schema.version';
\ No newline at end of file
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.job.sql
deleted file mode 100644
index 939cc483b88..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6511.to.6512.job.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_TIMER_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_SUSPENDED_JOB add column CATEGORY_ varchar(255);
-
-alter table ACT_RU_DEADLETTER_JOB add column CATEGORY_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6512.to.6513.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6512.to.6513.job.sql
deleted file mode 100644
index 34df9073a80..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6512.to.6513.job.sql
+++ /dev/null
@@ -1,48 +0,0 @@
-create table ACT_RU_EXTERNAL_JOB (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    ELEMENT_ID_ varchar(255),
-    ELEMENT_NAME_ varchar(255),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    CUSTOM_VALUES_ID_ varchar(64),
-    CREATE_TIME_ timestamp,
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_EXTERNAL_JOB_EXCEPTION_STACK_ID on ACT_RU_EXTERNAL_JOB(EXCEPTION_STACK_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CUSTOM_VALUES_ID on ACT_RU_EXTERNAL_JOB(CUSTOM_VALUES_ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EXTERNAL_JOB
-    add constraint ACT_FK_EXTERNAL_JOB_CUSTOM_VALUES
-    foreign key (CUSTOM_VALUES_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6513.to.6514.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6513.to.6514.job.sql
deleted file mode 100644
index 8386eeb18c5..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6513.to.6514.job.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table ACT_RU_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_TIMER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_SUSPENDED_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_DEADLETTER_JOB add column CORRELATION_ID_ varchar(255);
-alter table ACT_RU_EXTERNAL_JOB add column CORRELATION_ID_ varchar(255);
-
-create index ACT_IDX_JOB_CORRELATION_ID on ACT_RU_JOB(CORRELATION_ID_);
-create index ACT_IDX_TIMER_JOB_CORRELATION_ID on ACT_RU_TIMER_JOB(CORRELATION_ID_);
-create index ACT_IDX_SUSPENDED_JOB_CORRELATION_ID on ACT_RU_SUSPENDED_JOB(CORRELATION_ID_);
-create index ACT_IDX_DEADLETTER_JOB_CORRELATION_ID on ACT_RU_DEADLETTER_JOB(CORRELATION_ID_);
-create index ACT_IDX_EXTERNAL_JOB_CORRELATION_ID on ACT_RU_EXTERNAL_JOB(CORRELATION_ID_);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.job.sql b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.job.sql
deleted file mode 100644
index 1bd5f30fd36..00000000000
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/upgrade/flowable.postgres.upgradestep.6601.to.6610.job.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-create index ACT_IDX_TIMER_JOB_DUEDATE on ACT_RU_TIMER_JOB(DUEDATE_); 
-
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'job.schema.version';
diff --git a/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java b/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java
index b0426fa37d4..f6024c83016 100755
--- a/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java
+++ b/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java
@@ -129,7 +129,6 @@ public Option[] createConfiguration() {
                 mavenBundle().groupId("com.h2database").artifactId("h2").versionAsInProject(),
                 mavenBundle().groupId("org.eclipse.angus").artifactId("angus-mail").versionAsInProject(),
                 mavenBundle().groupId("org.mybatis").artifactId("mybatis").versionAsInProject(),
-                mavenBundle().groupId("org.liquibase").artifactId("liquibase-core").versionAsInProject(),
                 mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").versionAsInProject(),
                 mavenBundle().groupId("org.slf4j").artifactId("slf4j-reload4j").versionAsInProject(),
                 mavenBundle().groupId("org.junit.jupiter").artifactId("junit-jupiter-api").versionAsInProject(),
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/BaseSpringRestTestCase.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/BaseSpringRestTestCase.java
index 97923df7fe6..8b06545b84c 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/BaseSpringRestTestCase.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/BaseSpringRestTestCase.java
@@ -365,15 +365,7 @@ protected void assertAndEnsureCleanDb() throws Throwable {
                 processEngineConfiguration,
                 TABLENAMES_EXCLUDED_FROM_DB_CLEAN_CHECK,
                 exception == null,
-                new Command<Void>() {
-                    @Override
-                    public Void execute(CommandContext commandContext) {
-                        SchemaManager schemaManager = CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager();
-                        schemaManager.schemaDrop();
-                        schemaManager.schemaCreate();
-                        return null;
-                    }
-                }
+                processEngineConfiguration.getSchemaManagementCmd()
         );
     }
 
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/EnginePropertiesResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/EnginePropertiesResourceTest.java
index 25b3669f449..bd0a3d67ce5 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/EnginePropertiesResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/EnginePropertiesResourceTest.java
@@ -21,6 +21,7 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.StringEntity;
+import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.common.engine.impl.persistence.entity.PropertyEntity;
@@ -44,17 +45,15 @@ public class EnginePropertiesResourceTest extends BaseSpringRestTestCase {
     @Before
     public void createDatabase() throws Exception {
         if (!databaseReset) {
-            managementService.executeCommand(new Command<Object>() {
-
-                @Override
-                public Object execute(CommandContext commandContext) {
-                    processEngineConfiguration.getSchemaManager().schemaDrop();
-                    processEngineConfiguration.getSchemaManager().schemaCreate();
-                    return null;
-                }
-
-            });
+            String originalDatabaseSchemaUpdate = processEngineConfiguration.getDatabaseSchemaUpdate();
+            try {
+                processEngineConfiguration.setDatabaseSchemaUpdate(AbstractEngineConfiguration.DB_SCHEMA_UPDATE_DROP_CREATE);
+                managementService.executeCommand(processEngineConfiguration.getSchemaManagementCmd());
+            } finally {
+                processEngineConfiguration.setDatabaseSchemaUpdate(originalDatabaseSchemaUpdate);
+            }
             databaseReset = true;
+            createUsers();
         }
     }
 
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EngineMappingsValidationTest.java b/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EngineMappingsValidationTest.java
index 4353537481d..fd5659d68a3 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EngineMappingsValidationTest.java
+++ b/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EngineMappingsValidationTest.java
@@ -54,7 +54,7 @@
  * @author Joram Barrez
  */
 public class EngineMappingsValidationTest {
-
+    
     private static final List<String> IMMUTABLE_ENTITIES = Arrays.asList(
         "HistoricIdentityLink",
         "HistoricTaskLogEntry",
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityParameterTypesOverview.java b/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityParameterTypesOverview.java
index 59a52776ee4..e4cf159ea22 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityParameterTypesOverview.java
+++ b/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityParameterTypesOverview.java
@@ -717,7 +717,7 @@ protected static void addPropertyParams() {
         info.addColumn("VALUE_", "value", PARAMETER_TYPE_NVARCHAR);
         info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
     }
-
+    
     protected static void addResourceParams() {
         ParameterInfo info = addParameterInfo("resource");
         info.addColumn("ID_", "id", PARAMETER_TYPE_NVARCHAR);
@@ -773,9 +773,9 @@ protected static void addTaskParams() {
         info.addQueryParameter("orQueryObject.deploymentId", PARAMETER_TYPE_NVARCHAR);
         info.addQueryParameter("assigneeId", PARAMETER_TYPE_NVARCHAR);
         info.addQueryParameter("candidateUser", PARAMETER_TYPE_NVARCHAR);
-        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_VARCHAR); // CMMN = liquibase
-        info.addQueryParameter("caseInstanceIdWithChildren", PARAMETER_TYPE_VARCHAR);  // CMMN = liquibase
-        info.addQueryParameter("cmmnDeploymentId", PARAMETER_TYPE_VARCHAR);  // CMMN = liquibase
+        info.addQueryParameter("caseDefinitionKey", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("caseInstanceIdWithChildren", PARAMETER_TYPE_VARCHAR);
+        info.addQueryParameter("cmmnDeploymentId", PARAMETER_TYPE_VARCHAR);
         info.addQueryParameter("createTimeAfter", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("createTimeBefore", PARAMETER_TYPE_TIMESTAMP);
         info.addQueryParameter("dueAfter", PARAMETER_TYPE_TIMESTAMP);
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/TableColumnTypeValidationTest.java b/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/TableColumnTypeValidationTest.java
index 28ebb3dfed1..40cf89a69b3 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/TableColumnTypeValidationTest.java
+++ b/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/TableColumnTypeValidationTest.java
@@ -61,6 +61,7 @@ public void validateColumnTypes(EntityHelperUtil.EntityMappingPackageInformation
         assertThat(mappedResources).isNotEmpty();
 
         for (String entity : mappedResources.keySet()) {
+
             String tableName = findTable(entity, mappedResources.get(entity));
 
             Map<String, String> columnNameToTypeMap = getColumnMetaData(tableName);
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/environment/FlowableLiquibaseEnvironmentPostProcessor.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/environment/FlowableLiquibaseEnvironmentPostProcessor.java
deleted file mode 100644
index 1b5552d88bc..00000000000
--- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/environment/FlowableLiquibaseEnvironmentPostProcessor.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.spring.boot.environment;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.SpringBootVersion;
-import org.springframework.boot.env.EnvironmentPostProcessor;
-import org.springframework.core.annotation.Order;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MapPropertySource;
-
-/**
- * When one of the engines that uses liquibase is pulled in with Spring Boot, it pulls the liquibase dependency
- * and that activates {@link org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration}. However,
- * this leads to issues, when the user doesn't actually use it. Therefore, we must disable it per default. In order
- * to activate it, users need to set {@code liquibase.enabled=true} explicitly.
- *
- * @author Filip Hrisafov
- */
-@Order(100)
-public class FlowableLiquibaseEnvironmentPostProcessor implements EnvironmentPostProcessor {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(FlowableLiquibaseEnvironmentPostProcessor.class);
-
-    @Override
-    public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
-        String liquibaseProperty = getLiquibaseProperty();
-        if (!environment.containsProperty(liquibaseProperty)) {
-            LOGGER.warn("Liquibase has not been explicitly enabled or disabled. Overriding default from Spring Boot from `true` to `false`. "
-                + "Flowable pulls in Liquibase, but does not use the Spring Boot configuration for it. "
-                + "If you are using it you would need to set `{}` to `true` by yourself", liquibaseProperty);
-            Map<String, Object> source = new HashMap<>();
-            source.put(liquibaseProperty, false);
-            environment.getPropertySources().addLast(new MapPropertySource("flowable-liquibase-override", source));
-        }
-    }
-
-    protected String getLiquibaseProperty() {
-        String springBootVersion = SpringBootVersion.getVersion();
-        if (springBootVersion == null || !springBootVersion.startsWith("1")) {
-            return "spring.liquibase.enabled";
-        } else {
-            return "liquibase.enabled";
-        }
-    }
-}
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/liquibase/LiquibaseXmlElementClassNotFoundFailureAnalyzer.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/liquibase/LiquibaseXmlElementClassNotFoundFailureAnalyzer.java
deleted file mode 100644
index 92b0a84c62f..00000000000
--- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/java/org/flowable/spring/boot/liquibase/LiquibaseXmlElementClassNotFoundFailureAnalyzer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.spring.boot.liquibase;
-
-import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
-import org.springframework.boot.diagnostics.FailureAnalysis;
-
-/**
- * @author Filip Hrisafov
- */
-public class LiquibaseXmlElementClassNotFoundFailureAnalyzer extends AbstractFailureAnalyzer<ClassNotFoundException> {
-
-    @Override
-    protected FailureAnalysis analyze(Throwable rootFailure, ClassNotFoundException cause) {
-        String causeMessage = cause.getMessage();
-
-        if (causeMessage != null && causeMessage.contains("javax.xml.bind.annotation.XmlElement")) {
-            for (StackTraceElement stackTraceElement : cause.getStackTrace()) {
-                if (stackTraceElement.getClassName().startsWith("liquibase.pro.packaged")) {
-                    return new FailureAnalysis(
-                        "Liquibase failed to initialize due to javax.xml.bin.annotation.XmlElement not being present."
-                            + " Liquibase Versions starting from 3.8.1 have problems on Java 11."
-                            + " See https://liquibase.jira.com/browse/CORE-3537 for more information.",
-                        "Set the liquibase version to 3.8.0",
-                        cause
-                    );
-                }
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
index 5e1461ed24e..85e6e8865c5 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
+++ b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -1,8 +1,3 @@
 
 org.springframework.boot.env.EnvironmentPostProcessor=\
-  org.flowable.spring.boot.environment.FlowableDefaultPropertiesEnvironmentPostProcessor,\
-  org.flowable.spring.boot.environment.FlowableLiquibaseEnvironmentPostProcessor
-
-# Failure analyzers
-org.springframework.boot.diagnostics.FailureAnalyzer=\
-  org.flowable.spring.boot.liquibase.LiquibaseXmlElementClassNotFoundFailureAnalyzer
+  org.flowable.spring.boot.environment.FlowableDefaultPropertiesEnvironmentPostProcessor
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/environment/FlowableDefaultPropertiesEnvironmentPostProcessorTest.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/environment/FlowableDefaultPropertiesEnvironmentPostProcessorTest.java
index f2907a27dc2..7bd0de52922 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/environment/FlowableDefaultPropertiesEnvironmentPostProcessorTest.java
+++ b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/environment/FlowableDefaultPropertiesEnvironmentPostProcessorTest.java
@@ -57,8 +57,7 @@ public void flowableDefaultPropertiesAreBeLoaded() {
                 "Config resource 'class path resource [application.properties]' via location 'optional:classpath:/'",
                 "Config resource 'class path resource [application.yml]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
-                "flowableDefaultConfig: [classpath:/flowable-default.yml]",
-                "flowable-liquibase-override"
+                "flowableDefaultConfig: [classpath:/flowable-default.yml]"
             );
 
         assertThat(environment.getProperty("foo")).isEqualTo("from-flowable-default-properties");
@@ -88,7 +87,6 @@ public void flowableDefaultPropertiesAreBeforeApplicationDefaultProperties() {
                 "Config resource 'class path resource [application.yml]' via location 'optional:classpath:/'",
                 "flowableDefaultConfig: [classpath:/flowable-default.properties]",
                 "flowableDefaultConfig: [classpath:/flowable-default.yml]",
-                "flowable-liquibase-override",
                 "defaultProperties"
             );
 
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/liquibase/LiquibaseXmlElementClassNotFoundFailureAnalyzerTest.java b/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/liquibase/LiquibaseXmlElementClassNotFoundFailureAnalyzerTest.java
deleted file mode 100644
index 5e7aaf67c69..00000000000
--- a/modules/flowable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-autoconfigure/src/test/java/org/flowable/spring/boot/liquibase/LiquibaseXmlElementClassNotFoundFailureAnalyzerTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.spring.boot.liquibase;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.diagnostics.FailureAnalysis;
-import org.springframework.boot.diagnostics.FailureAnalyzer;
-
-/**
- * @author Filip Hrisafov
- */
-class LiquibaseXmlElementClassNotFoundFailureAnalyzerTest {
-
-    protected FailureAnalyzer underTest = new LiquibaseXmlElementClassNotFoundFailureAnalyzer();
-
-    @Test
-    void noAnalysisWhenClassNotFoundExceptionForNonXmlElementClass() {
-        assertThat(underTest.analyze(new ClassNotFoundException("com.example.test.TestClass")))
-            .isNull();
-    }
-
-    @Test
-    void noAnalysisWhenStackTraceDoesNotContainLiquibaseProPackage() {
-        ClassNotFoundException failure = new ClassNotFoundException("javax.xml.bind.annotation.XmlElement");
-        StackTraceElement[] stackTrace = new StackTraceElement[] {
-            new StackTraceElement("com.example.test.TestClass", "test()", null, -1),
-            new StackTraceElement("com.example.test.TestClass", "testAgain()", null, -1)
-        };
-        failure.setStackTrace(stackTrace);
-
-        assertThat(underTest.analyze(failure))
-            .isNull();
-    }
-
-    @Test
-    void analysisWhenStackTraceContainsLiquibaseProPackage() {
-        ClassNotFoundException failure = new ClassNotFoundException("javax.xml.bind.annotation.XmlElement");
-        StackTraceElement[] stackTrace = new StackTraceElement[] {
-            new StackTraceElement("com.example.test.TestClass", "test()", null, -1),
-            new StackTraceElement("com.example.test.TestClass", "testAgain()", null, -1),
-            new StackTraceElement("liquibase.pro.packaged.k1", "k()", null, -1)
-        };
-        failure.setStackTrace(stackTrace);
-
-        FailureAnalysis analysis = underTest.analyze(failure);
-        assertThat(analysis).isNotNull();
-        assertThat(analysis.getCause()).isSameAs(failure);
-        assertThat(analysis.getAction()).isEqualTo("Set the liquibase version to 3.8.0");
-        assertThat(analysis.getDescription()).isEqualTo("Liquibase failed to initialize due to javax.xml.bin.annotation.XmlElement not being present."
-            + " Liquibase Versions starting from 3.8.1 have problems on Java 11."
-            + " See https://liquibase.jira.com/browse/CORE-3537 for more information.");
-    }
-}
diff --git a/modules/flowable-spring-common/src/main/java/org/flowable/common/spring/CommonAutoDeploymentStrategy.java b/modules/flowable-spring-common/src/main/java/org/flowable/common/spring/CommonAutoDeploymentStrategy.java
index 9c008133b0d..ef88bafa60a 100644
--- a/modules/flowable-spring-common/src/main/java/org/flowable/common/spring/CommonAutoDeploymentStrategy.java
+++ b/modules/flowable-spring-common/src/main/java/org/flowable/common/spring/CommonAutoDeploymentStrategy.java
@@ -17,7 +17,7 @@
 import java.util.Arrays;
 
 import org.apache.commons.lang3.StringUtils;
-import org.flowable.common.engine.impl.lock.LockManager;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ByteArrayResource;
diff --git a/modules/flowable-spring-configurator/src/main/java/org/flowable/engine/spring/configurator/SpringProcessEngineConfigurator.java b/modules/flowable-spring-configurator/src/main/java/org/flowable/engine/spring/configurator/SpringProcessEngineConfigurator.java
index ab45c8ef9ae..312cd353f8a 100644
--- a/modules/flowable-spring-configurator/src/main/java/org/flowable/engine/spring/configurator/SpringProcessEngineConfigurator.java
+++ b/modules/flowable-spring-configurator/src/main/java/org/flowable/engine/spring/configurator/SpringProcessEngineConfigurator.java
@@ -15,7 +15,6 @@
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.spring.SpringEngineConfiguration;
-import org.flowable.engine.ProcessEngine;
 import org.flowable.engine.configurator.ProcessEngineConfigurator;
 import org.flowable.spring.SpringProcessEngineConfiguration;
 
@@ -44,20 +43,11 @@ public void configure(AbstractEngineConfiguration engineConfiguration) {
             springProcessEngineConfiguration.setBeans(springProcessEngineConfiguration.getBeans());
         }
 
-        initProcessEngine();
+        initEngine();
 
         initServiceConfigurations(engineConfiguration, processEngineConfiguration);
     }
 
-    @Override
-    protected synchronized ProcessEngine initProcessEngine() {
-        if (processEngineConfiguration == null) {
-            throw new FlowableException("ProcessEngineConfiguration is required");
-        }
-
-        return processEngineConfiguration.buildProcessEngine();
-    }
-
     @Override
     public SpringProcessEngineConfiguration getProcessEngineConfiguration() {
         return (SpringProcessEngineConfiguration) processEngineConfiguration;
diff --git a/modules/flowable-spring/src/main/java/org/flowable/spring/SpringProcessEngineConfiguration.java b/modules/flowable-spring/src/main/java/org/flowable/spring/SpringProcessEngineConfiguration.java
index 54a8424b148..d1c1e7816dc 100644
--- a/modules/flowable-spring/src/main/java/org/flowable/spring/SpringProcessEngineConfiguration.java
+++ b/modules/flowable-spring/src/main/java/org/flowable/spring/SpringProcessEngineConfiguration.java
@@ -72,8 +72,8 @@ public SpringProcessEngineConfiguration() {
     }
 
     @Override
-    public ProcessEngine buildProcessEngine() {
-        ProcessEngine processEngine = super.buildProcessEngine();
+    public ProcessEngine buildEngine() {
+        ProcessEngine processEngine = super.buildEngine();
         ProcessEngines.setInitialized(true);
         enginesBuild.add(processEngine.getName());
         return processEngine;
diff --git a/modules/flowable-spring/src/main/java/org/flowable/spring/configurator/AbstractProcessAutoDeploymentStrategy.java b/modules/flowable-spring/src/main/java/org/flowable/spring/configurator/AbstractProcessAutoDeploymentStrategy.java
index 86501e51783..ad8daf83520 100644
--- a/modules/flowable-spring/src/main/java/org/flowable/spring/configurator/AbstractProcessAutoDeploymentStrategy.java
+++ b/modules/flowable-spring/src/main/java/org/flowable/spring/configurator/AbstractProcessAutoDeploymentStrategy.java
@@ -18,7 +18,7 @@
 import java.io.UncheckedIOException;
 import java.util.zip.ZipInputStream;
 
-import org.flowable.common.engine.impl.lock.LockManager;
+import org.flowable.common.engine.api.lock.LockManager;
 import org.flowable.common.spring.CommonAutoDeploymentProperties;
 import org.flowable.common.spring.CommonAutoDeploymentStrategy;
 import org.flowable.engine.ProcessEngine;
diff --git a/modules/flowable-spring/src/test/java/org/flowable/spring/test/autodeployment/SpringAutoDeployTest.java b/modules/flowable-spring/src/test/java/org/flowable/spring/test/autodeployment/SpringAutoDeployTest.java
index 8a6cca860c1..0b8701614fa 100644
--- a/modules/flowable-spring/src/test/java/org/flowable/spring/test/autodeployment/SpringAutoDeployTest.java
+++ b/modules/flowable-spring/src/test/java/org/flowable/spring/test/autodeployment/SpringAutoDeployTest.java
@@ -27,13 +27,14 @@
 import javax.sql.DataSource;
 
 import org.flowable.bpmn.exceptions.XMLException;
+import org.flowable.common.engine.api.scope.ScopeTypes;
+import org.flowable.common.engine.impl.db.SchemaOperationsEngineDropDbCmd;
 import org.flowable.common.engine.impl.util.IoUtil;
 import org.flowable.common.spring.CommonAutoDeploymentStrategy;
 import org.flowable.engine.ManagementService;
 import org.flowable.engine.ProcessEngine;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.impl.test.AbstractTestCase;
-import org.flowable.engine.impl.util.CommandContextUtil;
 import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.repository.DeploymentQuery;
 import org.flowable.engine.repository.ProcessDefinition;
@@ -125,10 +126,7 @@ protected void tearDown() throws Exception {
         removeAllDeployments();
 
         // Make sure the schema is always dropped
-        this.managementService.executeCommand(commandContext -> {
-            CommandContextUtil.getProcessEngineConfiguration(commandContext).getSchemaManager().schemaDrop();
-            return null;
-        });
+        this.managementService.executeCommand(new SchemaOperationsEngineDropDbCmd(ScopeTypes.BPMN));
 
         if (this.applicationContext != null) {
             this.applicationContext.close();
diff --git a/modules/flowable-task-service/src/main/java/org/flowable/task/service/impl/db/TaskDbSchemaManager.java b/modules/flowable-task-service/src/main/java/org/flowable/task/service/impl/db/TaskDbSchemaManager.java
deleted file mode 100644
index 4b12f4f48f5..00000000000
--- a/modules/flowable-task-service/src/main/java/org/flowable/task/service/impl/db/TaskDbSchemaManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.task.service.impl.db;
-
-import org.flowable.common.engine.impl.db.ServiceSqlScriptBasedDbSchemaManager;
-
-/**
- * @author Joram Barrez
- */
-public class TaskDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
-
-    private static final String TASK_TABLE = "ACT_RU_TASK";
-    private static final String TASK_VERSION_PROPERTY = "task.schema.version";
-    private static final String SCHEMA_COMPONENT = "task";
-    private static final String SCHEMA_COMPONENT_HISTORY = "task.history";
-    
-    public TaskDbSchemaManager() {
-        super(TASK_TABLE, SCHEMA_COMPONENT, SCHEMA_COMPONENT_HISTORY, TASK_VERSION_PROPERTY);
-    }
-    
-    @Override
-    protected String getResourcesRootDirectory() {
-        return "org/flowable/task/service/db/";
-    }
-
-}
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.history.sql
deleted file mode 100644
index eaa26b2ca1c..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.history.sql
+++ /dev/null
@@ -1,62 +0,0 @@
-CREATE TABLE ACT_HI_TASKINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    TASK_DEF_KEY_ varchar(255),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    START_TIME_ timestamp not null,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    END_TIME_ timestamp,
-    COMPLETED_BY_ varchar(255),
-    DURATION_ bigint,
-    DELETE_REASON_ varchar(4000),
-    PRIORITY_ integer,
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    FORM_KEY_ varchar(255),
-    CATEGORY_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-CREATE TABLE ACT_HI_TSK_LOG (
-    ID_ SERIAL PRIMARY KEY,
-    TYPE_ varchar(64),
-    TASK_ID_ varchar(64) not null,
-    TIME_STAMP_ timestamp not null,
-    USER_ID_ varchar(255),
-    DATA_ varchar(4000),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default ''
-);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.sql
deleted file mode 100644
index 326d6b74e60..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.cockroachdb.create.task.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ varchar(64),
-    REV_ integer,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    TASK_DEF_KEY_ varchar(255),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    DELEGATION_ varchar(64),
-    PRIORITY_ integer,
-    CREATE_TIME_ timestamp,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    CATEGORY_ varchar(255),
-    SUSPENSION_STATE_ integer,
-    TENANT_ID_ varchar(255) default '',
-    FORM_KEY_ varchar(255),
-    IS_COUNT_ENABLED_ boolean,
-    VAR_COUNT_ integer, 
-    ID_LINK_COUNT_ integer,
-    SUB_TASK_COUNT_ integer,
-    primary key (ID_)
-);
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.db2.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.db2.create.task.history.sql
deleted file mode 100644
index da79d5c1379..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.db2.create.task.history.sql
+++ /dev/null
@@ -1,62 +0,0 @@
-create table ACT_HI_TASKINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    TASK_DEF_KEY_ varchar(255),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    START_TIME_ timestamp not null,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    END_TIME_ timestamp,
-    COMPLETED_BY_ varchar(255),
-    DURATION_ bigint,
-    DELETE_REASON_ varchar(4000),
-    PRIORITY_ integer,
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    FORM_KEY_ varchar(255),
-    CATEGORY_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-create table ACT_HI_TSK_LOG (
-    ID_ bigint not null GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
-    TYPE_ varchar(64),
-    TASK_ID_ varchar(64) not null,
-    TIME_STAMP_ timestamp not null,
-    USER_ID_ varchar(255),
-    DATA_ varchar(4000),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.db2.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.db2.create.task.sql
deleted file mode 100644
index e584e00108c..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.db2.create.task.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    TASK_DEF_KEY_ varchar(255),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    DELEGATION_ varchar(64),
-    PRIORITY_ integer,
-    CREATE_TIME_ timestamp,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    CATEGORY_ varchar(255),
-    SUSPENSION_STATE_ integer,
-    TENANT_ID_ varchar(255) default '',
-    FORM_KEY_ varchar(255),
-    IS_COUNT_ENABLED_ smallint check(IS_COUNT_ENABLED_ in (1,0)),
-    VAR_COUNT_ integer, 
-    ID_LINK_COUNT_ integer,
-    SUB_TASK_COUNT_ integer,
-    primary key (ID_)
-);
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.h2.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.h2.create.task.history.sql
deleted file mode 100644
index 16a615bfb93..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.h2.create.task.history.sql
+++ /dev/null
@@ -1,62 +0,0 @@
-create table ACT_HI_TASKINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    TASK_DEF_KEY_ varchar(255),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    START_TIME_ timestamp not null,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    END_TIME_ timestamp,
-    COMPLETED_BY_ varchar(255),
-    DURATION_ bigint,
-    DELETE_REASON_ varchar(4000),
-    PRIORITY_ integer,
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    FORM_KEY_ varchar(255),
-    CATEGORY_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-create table ACT_HI_TSK_LOG (
-    ID_ identity,
-    TYPE_ varchar(64),
-    TASK_ID_ varchar(64) not null,
-    TIME_STAMP_ timestamp not null,
-    USER_ID_ varchar(255),
-    DATA_ varchar(4000),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.h2.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.h2.create.task.sql
deleted file mode 100644
index 9341e627521..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.h2.create.task.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ varchar(64),
-    REV_ integer,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    TASK_DEF_KEY_ varchar(255),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    DELEGATION_ varchar(64),
-    PRIORITY_ integer,
-    CREATE_TIME_ timestamp,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    CATEGORY_ varchar(255),
-    SUSPENSION_STATE_ integer,
-    TENANT_ID_ varchar(255) default '',
-    FORM_KEY_ varchar(255),
-    IS_COUNT_ENABLED_ bit,
-    VAR_COUNT_ integer, 
-    ID_LINK_COUNT_ integer,
-    SUB_TASK_COUNT_ integer,
-    primary key (ID_)
-);
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.hsql.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.hsql.create.task.history.sql
deleted file mode 100644
index bed28fae2e7..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.hsql.create.task.history.sql
+++ /dev/null
@@ -1,62 +0,0 @@
-create table ACT_HI_TASKINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    TASK_DEF_KEY_ varchar(255),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    START_TIME_ timestamp not null,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    END_TIME_ timestamp,
-    COMPLETED_BY_ varchar(255),
-    DURATION_ bigint,
-    DELETE_REASON_ varchar(4000),
-    PRIORITY_ integer,
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    FORM_KEY_ varchar(255),
-    CATEGORY_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-create table ACT_HI_TSK_LOG (
-    ID_ identity,
-    TYPE_ varchar(64),
-    TASK_ID_ varchar(64) not null,
-    TIME_STAMP_ timestamp not null,
-    USER_ID_ varchar(255),
-    DATA_ varchar(4000),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.hsql.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.hsql.create.task.sql
deleted file mode 100644
index 9341e627521..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.hsql.create.task.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ varchar(64),
-    REV_ integer,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    TASK_DEF_KEY_ varchar(255),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    DELEGATION_ varchar(64),
-    PRIORITY_ integer,
-    CREATE_TIME_ timestamp,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    CATEGORY_ varchar(255),
-    SUSPENSION_STATE_ integer,
-    TENANT_ID_ varchar(255) default '',
-    FORM_KEY_ varchar(255),
-    IS_COUNT_ENABLED_ bit,
-    VAR_COUNT_ integer, 
-    ID_LINK_COUNT_ integer,
-    SUB_TASK_COUNT_ integer,
-    primary key (ID_)
-);
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mssql.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mssql.create.task.history.sql
deleted file mode 100644
index 635b0677bf7..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mssql.create.task.history.sql
+++ /dev/null
@@ -1,62 +0,0 @@
-create table ACT_HI_TASKINST (
-    ID_ nvarchar(64) not null,
-    REV_ int default 1,
-    PROC_DEF_ID_ nvarchar(64),
-    TASK_DEF_ID_ nvarchar(64),
-    TASK_DEF_KEY_ nvarchar(255),
-    PROC_INST_ID_ nvarchar(64),
-    EXECUTION_ID_ nvarchar(64),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    PROPAGATED_STAGE_INST_ID_ nvarchar(255),
-    STATE_ nvarchar(255),
-    NAME_ nvarchar(255),
-    PARENT_TASK_ID_ nvarchar(64),
-    DESCRIPTION_ nvarchar(4000),
-    OWNER_ nvarchar(255),
-    ASSIGNEE_ nvarchar(255),
-    START_TIME_ datetime not null,
-    IN_PROGRESS_TIME_ datetime,
-    IN_PROGRESS_STARTED_BY_ nvarchar(255),
-    CLAIM_TIME_ datetime,
-    CLAIMED_BY_ nvarchar(255),
-    SUSPENDED_TIME_ datetime,
-    SUSPENDED_BY_ nvarchar(255),
-    END_TIME_ datetime,
-    COMPLETED_BY_ nvarchar(255),
-    DURATION_ numeric(19,0),
-    DELETE_REASON_ nvarchar(4000),
-    PRIORITY_ int,
-    IN_PROGRESS_DUE_DATE_ datetime,
-    DUE_DATE_ datetime,
-    FORM_KEY_ nvarchar(255),
-    CATEGORY_ nvarchar(255),
-    TENANT_ID_ nvarchar(255) default '',
-    LAST_UPDATED_TIME_ datetime2,
-    primary key (ID_)
-);
-
-create table ACT_HI_TSK_LOG (
-    ID_ numeric(19,0) IDENTITY (1,1),
-    TYPE_ nvarchar(64),
-    TASK_ID_ nvarchar(64) not null,
-    TIME_STAMP_ datetime not null,
-    USER_ID_ nvarchar(255),
-    DATA_ nvarchar(4000),
-    EXECUTION_ID_ nvarchar(64),
-    PROC_INST_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    SCOPE_ID_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    TENANT_ID_ nvarchar(255) default '',
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mssql.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mssql.create.task.sql
deleted file mode 100644
index 84eabc8d4be..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mssql.create.task.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ nvarchar(64),
-    REV_ int,
-    EXECUTION_ID_ nvarchar(64),
-    PROC_INST_ID_ nvarchar(64),
-    PROC_DEF_ID_ nvarchar(64),
-    TASK_DEF_ID_ nvarchar(64),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    SCOPE_DEFINITION_ID_ nvarchar(255),
-    PROPAGATED_STAGE_INST_ID_ nvarchar(255),
-    STATE_ nvarchar(255),
-    NAME_ nvarchar(255),
-    PARENT_TASK_ID_ nvarchar(64),
-    DESCRIPTION_ nvarchar(4000),
-    TASK_DEF_KEY_ nvarchar(255),
-    OWNER_ nvarchar(255),
-    ASSIGNEE_ nvarchar(255),
-    DELEGATION_ nvarchar(64),
-    PRIORITY_ int,
-    CREATE_TIME_ datetime,
-    IN_PROGRESS_TIME_ datetime,
-    IN_PROGRESS_STARTED_BY_ nvarchar(255),
-    CLAIM_TIME_ datetime,
-    CLAIMED_BY_ nvarchar(255),
-    SUSPENDED_TIME_ datetime,
-    SUSPENDED_BY_ nvarchar(255),
-    IN_PROGRESS_DUE_DATE_ datetime,
-    DUE_DATE_ datetime,
-    CATEGORY_ nvarchar(255),
-    SUSPENSION_STATE_ int,
-    TENANT_ID_ nvarchar(255) default '',
-    FORM_KEY_ nvarchar(255),
-    IS_COUNT_ENABLED_ tinyint,
-    VAR_COUNT_ int, 
-    ID_LINK_COUNT_ int,
-    SUB_TASK_COUNT_ int,
-    primary key (ID_)
-);
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql.create.task.history.sql
deleted file mode 100644
index 41c6a0351f3..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql.create.task.history.sql
+++ /dev/null
@@ -1,62 +0,0 @@
-create table ACT_HI_TASKINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    TASK_DEF_KEY_ varchar(255),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    START_TIME_ datetime(3) not null,
-    IN_PROGRESS_TIME_ datetime(3),
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ datetime(3),
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ datetime(3),
-    SUSPENDED_BY_ varchar(255),
-    END_TIME_ datetime(3),
-    COMPLETED_BY_ varchar(255),
-    DURATION_ bigint,
-    DELETE_REASON_ varchar(4000),
-    PRIORITY_ integer,
-    IN_PROGRESS_DUE_DATE_ datetime(3),
-    DUE_DATE_ datetime(3),
-    FORM_KEY_ varchar(255),
-    CATEGORY_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    LAST_UPDATED_TIME_ datetime(3),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_TSK_LOG (
-    ID_ bigint auto_increment,
-    TYPE_ varchar(64),
-    TASK_ID_ varchar(64) not null,
-    TIME_STAMP_ timestamp(3) not null,
-    USER_ID_ varchar(255),
-    DATA_ varchar(4000),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql.create.task.sql
deleted file mode 100644
index e10e1adb5e1..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql.create.task.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ varchar(64),
-    REV_ integer,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    TASK_DEF_KEY_ varchar(255),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    DELEGATION_ varchar(64),
-    PRIORITY_ integer,
-    CREATE_TIME_ timestamp(3) NULL,
-    IN_PROGRESS_TIME_ datetime(3),
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ datetime(3),
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ datetime(3),
-    SUSPENDED_BY_ varchar(255),
-    IN_PROGRESS_DUE_DATE_ datetime(3),
-    DUE_DATE_ datetime(3),
-    CATEGORY_ varchar(255),
-    SUSPENSION_STATE_ integer,
-    TENANT_ID_ varchar(255) default '',
-    FORM_KEY_ varchar(255),
-    IS_COUNT_ENABLED_ TINYINT,
-    VAR_COUNT_ integer,
-    ID_LINK_COUNT_ integer,
-    SUB_TASK_COUNT_ integer,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql55.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql55.create.task.history.sql
deleted file mode 100644
index 8218bf655da..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql55.create.task.history.sql
+++ /dev/null
@@ -1,62 +0,0 @@
-create table ACT_HI_TASKINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    TASK_DEF_KEY_ varchar(255),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    START_TIME_ datetime not null,
-    IN_PROGRESS_TIME_ datetime,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ datetime,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ datetime,
-    SUSPENDED_BY_ varchar(255),
-    END_TIME_ datetime,
-    COMPLETED_BY_ varchar(255),
-    DURATION_ bigint,
-    DELETE_REASON_ varchar(4000),
-    PRIORITY_ integer,
-    IN_PROGRESS_DUE_DATE_ datetime,
-    DUE_DATE_ datetime,
-    FORM_KEY_ varchar(255),
-    CATEGORY_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    LAST_UPDATED_TIME_ datetime,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_TSK_LOG (
-    ID_ bigint auto_increment,
-    TYPE_ varchar(64),
-    TASK_ID_ varchar(64) not null,
-    TIME_STAMP_ datetime not null,
-    USER_ID_ varchar(255),
-    DATA_ varchar(4000),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEFINITION_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql55.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql55.create.task.sql
deleted file mode 100644
index c949498e32b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.mysql55.create.task.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ varchar(64),
-    REV_ integer,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    TASK_DEF_KEY_ varchar(255),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    DELEGATION_ varchar(64),
-    PRIORITY_ integer,
-    CREATE_TIME_ timestamp NULL,
-    IN_PROGRESS_TIME_ datetime,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ datetime,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ datetime,
-    SUSPENDED_BY_ varchar(255),
-    IN_PROGRESS_DUE_DATE_ datetime,
-    DUE_DATE_ datetime,
-    CATEGORY_ varchar(255),
-    SUSPENSION_STATE_ integer,
-    TENANT_ID_ varchar(255) default '',
-    FORM_KEY_ varchar(255),
-    IS_COUNT_ENABLED_ TINYINT,
-    VAR_COUNT_ integer,
-    ID_LINK_COUNT_ integer,
-    SUB_TASK_COUNT_ integer,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.oracle.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.oracle.create.task.history.sql
deleted file mode 100644
index 2ee1872844f..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.oracle.create.task.history.sql
+++ /dev/null
@@ -1,64 +0,0 @@
-create table ACT_HI_TASKINST (
-    ID_ NVARCHAR2(64) not null,
-    REV_ INTEGER default 1,
-    PROC_DEF_ID_ NVARCHAR2(64),
-    TASK_DEF_ID_ NVARCHAR2(64),
-    TASK_DEF_KEY_ NVARCHAR2(255),
-    PROC_INST_ID_ NVARCHAR2(64),
-    EXECUTION_ID_ NVARCHAR2(64),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    PROPAGATED_STAGE_INST_ID_ NVARCHAR2(255),
-    PARENT_TASK_ID_ NVARCHAR2(64),
-    STATE_ NVARCHAR2(255),
-    NAME_ NVARCHAR2(255),
-    DESCRIPTION_ NVARCHAR2(2000),
-    OWNER_ NVARCHAR2(255),
-    ASSIGNEE_ NVARCHAR2(255),
-    START_TIME_ TIMESTAMP(6) not null,
-    IN_PROGRESS_TIME_ TIMESTAMP(6),
-    IN_PROGRESS_STARTED_BY_ NVARCHAR2(255),
-    CLAIM_TIME_ TIMESTAMP(6),
-    CLAIMED_BY_ NVARCHAR2(255),
-    SUSPENDED_TIME_ TIMESTAMP(6),
-    SUSPENDED_BY_ NVARCHAR2(255),
-    END_TIME_ TIMESTAMP(6),
-    COMPLETED_BY_ NVARCHAR2(255),
-    DURATION_ NUMBER(19,0),
-    DELETE_REASON_ NVARCHAR2(2000),
-    PRIORITY_ INTEGER,
-    IN_PROGRESS_DUE_DATE_ TIMESTAMP(6),
-    DUE_DATE_ TIMESTAMP(6),
-    FORM_KEY_ NVARCHAR2(255),
-    CATEGORY_ NVARCHAR2(255),
-    TENANT_ID_ NVARCHAR2(255) default '',
-    LAST_UPDATED_TIME_ TIMESTAMP(6),
-    primary key (ID_)
-);
-
-create table ACT_HI_TSK_LOG (
-    ID_ NUMBER(19),
-    TYPE_ NVARCHAR2(64),
-    TASK_ID_ NVARCHAR2(64) not null,
-    TIME_STAMP_ TIMESTAMP(6) not null,
-    USER_ID_ NVARCHAR2(255),
-    DATA_ NVARCHAR2(2000),
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROC_INST_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    TENANT_ID_ NVARCHAR2(255) default '',
-    primary key (ID_)
-);
-
-create sequence act_hi_task_evt_log_seq start with 1 increment by 1;
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.oracle.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.oracle.create.task.sql
deleted file mode 100644
index 588e70a092f..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.oracle.create.task.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ NVARCHAR2(64),
-    REV_ INTEGER,
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROC_INST_ID_ NVARCHAR2(64),
-    PROC_DEF_ID_ NVARCHAR2(64),
-    TASK_DEF_ID_ NVARCHAR2(64),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-    PROPAGATED_STAGE_INST_ID_ NVARCHAR2(255),
-    STATE_ NVARCHAR2(255),
-    NAME_ NVARCHAR2(255),
-    PARENT_TASK_ID_ NVARCHAR2(64),
-    DESCRIPTION_ NVARCHAR2(2000),
-    TASK_DEF_KEY_ NVARCHAR2(255),
-    OWNER_ NVARCHAR2(255),
-    ASSIGNEE_ NVARCHAR2(255),
-    DELEGATION_ NVARCHAR2(64),
-    PRIORITY_ INTEGER,
-    CREATE_TIME_ TIMESTAMP(6),
-    IN_PROGRESS_TIME_ TIMESTAMP(6),
-    IN_PROGRESS_STARTED_BY_ NVARCHAR2(255),
-    CLAIM_TIME_ TIMESTAMP(6),
-    CLAIMED_BY_ NVARCHAR2(255),
-    SUSPENDED_TIME_ TIMESTAMP(6),
-    SUSPENDED_BY_ NVARCHAR2(255),
-    IN_PROGRESS_DUE_DATE_ TIMESTAMP(6),
-    DUE_DATE_ TIMESTAMP(6),
-    CATEGORY_ NVARCHAR2(255),
-    SUSPENSION_STATE_ INTEGER,
-    TENANT_ID_ NVARCHAR2(255) DEFAULT '',
-    FORM_KEY_ NVARCHAR2(255),
-    IS_COUNT_ENABLED_ NUMBER(1,0) CHECK (IS_COUNT_ENABLED_ IN (1,0)),
-    VAR_COUNT_ INTEGER, 
-    ID_LINK_COUNT_ INTEGER,
-    SUB_TASK_COUNT_ INTEGER,
-    primary key (ID_)
-);
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.postgres.create.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.postgres.create.task.history.sql
deleted file mode 100644
index 89a478ffb3a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.postgres.create.task.history.sql
+++ /dev/null
@@ -1,61 +0,0 @@
-create table ACT_HI_TASKINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    TASK_DEF_KEY_ varchar(255),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    START_TIME_ timestamp not null,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    END_TIME_ timestamp,
-    COMPLETED_BY_ varchar(255),
-    DURATION_ bigint,
-    DELETE_REASON_ varchar(4000),
-    PRIORITY_ integer,
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    FORM_KEY_ varchar(255),
-    CATEGORY_ varchar(255),
-    TENANT_ID_ varchar(255) default '',
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-create table ACT_HI_TSK_LOG (
-    ID_ SERIAL PRIMARY KEY,
-    TYPE_ varchar(64),
-    TASK_ID_ varchar(64) not null,
-    TIME_STAMP_ timestamp not null,
-    USER_ID_ varchar(255),
-    DATA_ varchar(4000),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    TENANT_ID_ varchar(255) default ''
-);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.postgres.create.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.postgres.create.task.sql
deleted file mode 100644
index 0ec664f0384..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/create/flowable.postgres.create.task.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-create table ACT_RU_TASK (
-    ID_ varchar(64),
-    REV_ integer,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    TASK_DEF_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    SCOPE_DEFINITION_ID_ varchar(255),
-    PROPAGATED_STAGE_INST_ID_ varchar(255),
-    STATE_ varchar(255),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    TASK_DEF_KEY_ varchar(255),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    DELEGATION_ varchar(64),
-    PRIORITY_ integer,
-    CREATE_TIME_ timestamp,
-    IN_PROGRESS_TIME_ timestamp,
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIM_TIME_ timestamp,
-    CLAIMED_BY_ varchar(255),
-    SUSPENDED_TIME_ timestamp,
-    SUSPENDED_BY_ varchar(255),
-    IN_PROGRESS_DUE_DATE_ timestamp,
-    DUE_DATE_ timestamp,
-    CATEGORY_ varchar(255),
-    SUSPENSION_STATE_ integer,
-    TENANT_ID_ varchar(255) default '',
-    FORM_KEY_ varchar(255),
-    IS_COUNT_ENABLED_ boolean,
-    VAR_COUNT_ integer, 
-    ID_LINK_COUNT_ integer,
-    SUB_TASK_COUNT_ integer,
-    primary key (ID_)
-);
-
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.history.sql
deleted file mode 100644
index eeea2df3233..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.history.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table if exists act_hi_taskinst cascade;
-drop table if exists act_hi_TSK_log cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.sql
deleted file mode 100644
index 8d94749150c..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.cockroachdb.drop.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists act_ru_task cascade;
-
--- force-commit
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.db2.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.db2.drop.task.history.sql
deleted file mode 100644
index 650440ba7e6..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.db2.drop.task.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop index ACT_IDX_HI_TASK_SCOPE;
-drop index ACT_IDX_HI_TASK_SUB_SCOPE;
-drop index ACT_IDX_HI_TASK_SCOPE_DEF;
-
-drop table ACT_RU_TASK;
-drop table ACT_HI_TASKINST;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.db2.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.db2.drop.task.sql
deleted file mode 100644
index f571898ba48..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.db2.drop.task.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop index ACT_IDX_TASK_CREATE;
-drop index ACT_IDX_TASK_SCOPE;
-drop index ACT_IDX_TASK_SUB_SCOPE;
-drop index ACT_IDX_TASK_SCOPE_DEF;
-
-drop table ACT_HI_TSK_LOG;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.h2.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.h2.drop.task.history.sql
deleted file mode 100644
index b995ff51110..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.h2.drop.task.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table if exists ACT_HI_TASKINST cascade constraints;
-drop table if exists ACT_HI_TSK_LOG cascade constraints;
-
-drop index if exists ACT_IDX_HI_TASK_SCOPE;
-drop index if exists ACT_IDX_HI_TASK_SUB_SCOPE;
-drop index if exists ACT_IDX_HI_TASK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.h2.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.h2.drop.task.sql
deleted file mode 100644
index 58248861a3f..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.h2.drop.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists ACT_RU_TASK cascade constraints;
-
-drop index if exists ACT_IDX_TASK_CREATE;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.hsql.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.hsql.drop.task.history.sql
deleted file mode 100644
index 06e61138c7a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.hsql.drop.task.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table if exists ACT_HI_TASKINST cascade;
-drop table if exists ACT_HI_TSK_LOG cascade;
-
-drop index if exists ACT_IDX_HI_TASK_SCOPE;
-drop index if exists ACT_IDX_HI_TASK_SUB_SCOPE;
-drop index if exists ACT_IDX_HI_TASK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.hsql.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.hsql.drop.task.sql
deleted file mode 100644
index 7c92e226d59..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.hsql.drop.task.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table if exists ACT_RU_TASK cascade;
-
-drop index if exists ACT_IDX_TASK_CREATE;
-drop index if exists ACT_IDX_TASK_SCOPE;
-drop index if exists ACT_IDX_TASK_SUB_SCOPE;
-drop index if exists ACT_IDX_TASK_SCOPE_DEF;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mssql.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mssql.drop.task.history.sql
deleted file mode 100644
index a12a72ea143..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mssql.drop.task.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_TASK_SCOPE') drop index ACT_HI_TASKINST.ACT_IDX_HI_TASK_SCOPE;
-if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_TASK_SUB_SCOPE') drop index ACT_HI_TASKINST.ACT_IDX_HI_TASK_SUB_SCOPE;
-if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_TASK_SCOPE_DEF') drop index ACT_HI_TASKINST.ACT_IDX_HI_TASK_SCOPE_DEF;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_TASKINST') drop table ACT_HI_TASKINST;
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_TSK_LOG') drop table ACT_HI_TSK_LOG;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mssql.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mssql.drop.task.sql
deleted file mode 100644
index 5929b2b6bd5..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mssql.drop.task.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_CREATE') drop index ACT_RU_TASK.ACT_IDX_TASK_CREATE;
-if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SCOPE') drop index ACT_RU_TASK.ACT_IDX_TASK_SCOPE;
-if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SUB_SCOPE') drop index ACT_RU_TASK.ACT_IDX_TASK_SUB_SCOPE;
-if exists (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_TASK_SCOPE_DEF') drop index ACT_RU_TASK.ACT_IDX_TASK_SCOPE_DEF;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_TASK') drop table ACT_RU_TASK;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mysql.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mysql.drop.task.history.sql
deleted file mode 100644
index 8a028d0cee6..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mysql.drop.task.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST;
-drop index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST;
-drop index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST;
-
-drop table if exists ACT_HI_TASKINST;
-drop table if exists ACT_HI_TSK_LOG;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mysql.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mysql.drop.task.sql
deleted file mode 100644
index a9764c5da32..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.mysql.drop.task.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop index ACT_IDX_TASK_CREATE on ACT_RU_TASK;
-drop index ACT_IDX_TASK_SCOPE on ACT_RU_TASK;
-drop index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK;
-drop index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK;
-
-drop table if exists ACT_RU_TASK;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.oracle.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.oracle.drop.task.history.sql
deleted file mode 100644
index 638da9e0a34..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.oracle.drop.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-drop index ACT_IDX_HI_TASK_SCOPE;
-drop index ACT_IDX_HI_TASK_SUB_SCOPE;
-drop index ACT_IDX_HI_TASK_SCOPE_DEF;
-
-drop sequence act_hi_task_evt_log_seq;
-
-drop table ACT_HI_TASKINST;
-drop table ACT_HI_TSK_LOG;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.oracle.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.oracle.drop.task.sql
deleted file mode 100644
index b25db621cf4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.oracle.drop.task.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-drop index ACT_IDX_TASK_CREATE;
-drop index ACT_IDX_TASK_SCOPE;
-drop index ACT_IDX_TASK_SUB_SCOPE;
-drop index ACT_IDX_TASK_SCOPE_DEF;
-
-drop table ACT_RU_TASK;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.postgres.drop.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.postgres.drop.task.history.sql
deleted file mode 100644
index c45751596b4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.postgres.drop.task.history.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-drop table if exists ACT_HI_TASKINST cascade;
-drop table if exists ACT_HI_TSK_LOG cascade;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.postgres.drop.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.postgres.drop.task.sql
deleted file mode 100644
index cc4013fa5e3..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/drop/flowable.postgres.drop.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_RU_TASK cascade;
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.task.sql
deleted file mode 100644
index 57287bb6173..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index 0e1880c27d2..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.task.sql
deleted file mode 100644
index d4da55bdb19..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.task.sql
deleted file mode 100644
index 2dc154a9db2..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.2.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.task.sql
deleted file mode 100644
index 5c3d3b280ff..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.task.sql
deleted file mode 100644
index d69888a04cb..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.task.sql
deleted file mode 100644
index 4e66418b91d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.task.sql
deleted file mode 100644
index 469c21dafb4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.task.sql
deleted file mode 100644
index e892f3af3fa..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.task.sql
deleted file mode 100644
index 1647b8065f3..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.task.sql
deleted file mode 100644
index 23e4db7aea4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.task.sql
deleted file mode 100644
index bb92b105080..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.task.sql
deleted file mode 100644
index d82529c6f22..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.task.sql
deleted file mode 100644
index aa536d8dd4a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.4' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.task.sql
deleted file mode 100644
index a0cfb764b82..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.6' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.task.sql
deleted file mode 100644
index 61e5bb7fe6e..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.task.sql
deleted file mode 100644
index 18b6ebd995a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.task.sql
deleted file mode 100644
index b978e3833af..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.task.sql
deleted file mode 100644
index 8dbe58b7b17..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.task.sql
deleted file mode 100644
index 30f8442a742..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.task.sql
deleted file mode 100644
index ebd51fd704c..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.task.sql
deleted file mode 100644
index c3abdbd2379..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.task.sql
deleted file mode 100644
index 7158b003919..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.task.sql
deleted file mode 100644
index 8a01c97b7d0..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.task.sql
deleted file mode 100644
index 07cf33ec309..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.task.sql
deleted file mode 100644
index c2ada337653..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.task.sql
deleted file mode 100644
index 3598768ccc7..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.task.sql
deleted file mode 100644
index 01909dfd9ae..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.task.sql
deleted file mode 100644
index 3bce9994737..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.task.sql
deleted file mode 100644
index d89d75ee4f2..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.task.sql
deleted file mode 100644
index d0e5c3f2e9c..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.task.sql
deleted file mode 100644
index 06608ceb4cf..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.task.sql
deleted file mode 100644
index 70905632b05..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.task.sql
deleted file mode 100644
index 3b359f782b0..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.3' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.task.sql
deleted file mode 100644
index 5f112f83ce4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.task.sql
deleted file mode 100644
index 35fa20a24e6..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6800.to.6810.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.task.sql
deleted file mode 100644
index 30977f7db8f..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.task.sql
deleted file mode 100644
index 6356ad1ed0f..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.task.sql
deleted file mode 100644
index 86f6f3eae2c..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.task.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.task.history.sql
deleted file mode 100644
index 4131e088b81..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
- alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
- alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
- alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
- alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.task.sql
deleted file mode 100644
index 8770675484a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index 4f1d24ceeb4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_TASK add column SUB_TASK_COUNT_ integer;
-update ACT_RU_TASK t set t.SUB_TASK_COUNT_ = (select count(*) from (select * from ACT_RU_TASK where IS_COUNT_ENABLED_ = 1) as count_table where PARENT_TASK_ID_ = t.ID_) where t.IS_COUNT_ENABLED_ = 1;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6300.to.6301.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6300.to.6301.task.history.sql
deleted file mode 100644
index 2ed7c06c9ff..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6300.to.6301.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6300.to.6301.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6300.to.6301.task.sql
deleted file mode 100644
index 705c8b2690b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6300.to.6301.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6412.to.6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6412.to.6413.task.history.sql
deleted file mode 100644
index 0c8d2393d4f..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6412.to.6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ bigint not null GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6412.to.cam6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6412.to.cam6413.task.history.sql
deleted file mode 100644
index 0c8d2393d4f..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6412.to.cam6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ bigint not null GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6504.to.6505.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6504.to.6505.task.history.sql
deleted file mode 100644
index 91d00b1778b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6504.to.6505.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6504.to.6505.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6504.to.6505.task.sql
deleted file mode 100644
index fa6784bb9d9..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.6504.to.6505.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7000.to.7010.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7000.to.7010.task.history.sql
deleted file mode 100644
index be7a3ea9cff..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7000.to.7010.task.history.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_HI_TASKINST 
-  add column STATE_ varchar(255)
-  add column IN_PROGRESS_TIME_ timestamp
-  add column IN_PROGRESS_STARTED_BY_ varchar(255)
-  add column CLAIMED_BY_ varchar(255)
-  add column SUSPENDED_TIME_ timestamp
-  add column SUSPENDED_BY_ varchar(255)
-  add column COMPLETED_BY_ varchar(255)
-  add column IN_PROGRESS_DUE_DATE_ timestamp;
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7000.to.7010.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7000.to.7010.task.sql
deleted file mode 100644
index 4738e2a5d5b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7000.to.7010.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK 
-  add column STATE_ varchar(255)
-  add column IN_PROGRESS_TIME_ timestamp
-  add column IN_PROGRESS_STARTED_BY_ varchar(255)
-  add column CLAIMED_BY_ varchar(255)
-  add column SUSPENDED_TIME_ timestamp
-  add column SUSPENDED_BY_ varchar(255)
-  add column IN_PROGRESS_DUE_DATE_ timestamp;
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7011.to.7100.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7011.to.7100.task.history.sql
deleted file mode 100644
index e11921b7f3d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.db2.upgradestep.7011.to.7100.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.task.history.sql
deleted file mode 100644
index 80991826d5b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.task.sql
deleted file mode 100644
index 8770675484a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index cbd6268e1dc..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_TASK add column SUB_TASK_COUNT_ integer;
-update ACT_RU_TASK t set t.SUB_TASK_COUNT_ = (select count(*) from (select * from ACT_RU_TASK where IS_COUNT_ENABLED_ = true) as count_table where PARENT_TASK_ID_ = t.ID_) where t.IS_COUNT_ENABLED_ = true;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6300.to.6301.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6300.to.6301.task.history.sql
deleted file mode 100644
index 2ed7c06c9ff..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6300.to.6301.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6300.to.6301.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6300.to.6301.task.sql
deleted file mode 100644
index 705c8b2690b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6300.to.6301.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6412.to.6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6412.to.6413.task.history.sql
deleted file mode 100644
index 939209c814e..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6412.to.6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ identity,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6412.to.cam6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6412.to.cam6413.task.history.sql
deleted file mode 100644
index 939209c814e..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6412.to.cam6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ identity,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6504.to.6505.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6504.to.6505.task.history.sql
deleted file mode 100644
index 91d00b1778b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6504.to.6505.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6504.to.6505.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6504.to.6505.task.sql
deleted file mode 100644
index fa6784bb9d9..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.6504.to.6505.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7000.to.7010.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7000.to.7010.task.history.sql
deleted file mode 100644
index 50d471100cf..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7000.to.7010.task.history.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_HI_TASKINST add (
-    STATE_ varchar(255), 
-    IN_PROGRESS_TIME_ timestamp, 
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIMED_BY_ varchar(255), 
-    SUSPENDED_TIME_ timestamp, 
-    SUSPENDED_BY_ varchar(255), 
-    COMPLETED_BY_ varchar(255), 
-    IN_PROGRESS_DUE_DATE_ timestamp);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7000.to.7010.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7000.to.7010.task.sql
deleted file mode 100644
index b9f0be9f7e1..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7000.to.7010.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add (
-    STATE_ varchar(255), 
-    IN_PROGRESS_TIME_ timestamp, 
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIMED_BY_ varchar(255), 
-    SUSPENDED_TIME_ timestamp, 
-    SUSPENDED_BY_ varchar(255), 
-    IN_PROGRESS_DUE_DATE_ timestamp);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7011.to.7100.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7011.to.7100.task.history.sql
deleted file mode 100644
index e11921b7f3d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.h2.upgradestep.7011.to.7100.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.task.history.sql
deleted file mode 100644
index 469e7a3f7af..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
- alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.task.sql
deleted file mode 100644
index 8770675484a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index cbd6268e1dc..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_TASK add column SUB_TASK_COUNT_ integer;
-update ACT_RU_TASK t set t.SUB_TASK_COUNT_ = (select count(*) from (select * from ACT_RU_TASK where IS_COUNT_ENABLED_ = true) as count_table where PARENT_TASK_ID_ = t.ID_) where t.IS_COUNT_ENABLED_ = true;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.task.history.sql
deleted file mode 100644
index 74e4c429ff8..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.task.sql
deleted file mode 100644
index 705c8b2690b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6300.to.6301.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6412.to.6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6412.to.6413.task.history.sql
deleted file mode 100644
index 29288032dc2..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6412.to.6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ identity,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.task.history.sql
deleted file mode 100644
index 91d00b1778b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.task.sql
deleted file mode 100644
index fa6784bb9d9..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.6504.to.6505.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.task.history.sql
deleted file mode 100644
index 50d471100cf..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.task.history.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_HI_TASKINST add (
-    STATE_ varchar(255), 
-    IN_PROGRESS_TIME_ timestamp, 
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIMED_BY_ varchar(255), 
-    SUSPENDED_TIME_ timestamp, 
-    SUSPENDED_BY_ varchar(255), 
-    COMPLETED_BY_ varchar(255), 
-    IN_PROGRESS_DUE_DATE_ timestamp);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.task.sql
deleted file mode 100644
index b9f0be9f7e1..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7000.to.7010.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add (
-    STATE_ varchar(255), 
-    IN_PROGRESS_TIME_ timestamp, 
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIMED_BY_ varchar(255), 
-    SUSPENDED_TIME_ timestamp, 
-    SUSPENDED_BY_ varchar(255), 
-    IN_PROGRESS_DUE_DATE_ timestamp);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7011.to.7100.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7011.to.7100.task.history.sql
deleted file mode 100644
index e11921b7f3d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.hsql.upgradestep.7011.to.7100.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.task.history.sql
deleted file mode 100644
index 74f3cfc635e..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_HI_TASKINST add SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_TASKINST add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_TASKINST add SCOPE_TYPE_ nvarchar(255);
-alter table ACT_HI_TASKINST add SCOPE_DEFINITION_ID_ nvarchar(255);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.task.sql
deleted file mode 100644
index f7c49fb2ad1..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_TASK add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_TASK add SCOPE_TYPE_ nvarchar(255);
-alter table ACT_RU_TASK add SCOPE_DEFINITION_ID_ nvarchar(255);
-
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index 459c9523d66..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_TASK add SUB_TASK_COUNT_ int;
-update ACT_RU_TASK set SUB_TASK_COUNT_ = (select count(*) from (select * from ACT_RU_TASK where IS_COUNT_ENABLED_ = 1) as count_table where count_table.PARENT_TASK_ID_ = ID_) where IS_COUNT_ENABLED_ = 1;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.task.history.sql
deleted file mode 100644
index 7b3233b3276..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add TASK_DEF_ID_ nvarchar(64);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.task.sql
deleted file mode 100644
index dce4897ba5a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6300.to.6301.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add TASK_DEF_ID_ nvarchar(64);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.task.history.sql
deleted file mode 100644
index d711061e7fa..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6412.to.6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ numeric(19,0) IDENTITY (1,1),
-  TYPE_ nvarchar(64),
-  TASK_ID_ nvarchar(64) not null,
-  TIME_STAMP_ datetime not null,
-  USER_ID_ nvarchar(255),
-  DATA_ nvarchar(4000),
-  EXECUTION_ID_ nvarchar(64),
-  PROC_INST_ID_ nvarchar(64),
-  PROC_DEF_ID_ nvarchar(64),
-  SCOPE_ID_ nvarchar(255),
-  SCOPE_DEFINITION_ID_ nvarchar(255),
-  SUB_SCOPE_ID_ nvarchar(255),
-  SCOPE_TYPE_ nvarchar(255),
-  TENANT_ID_ nvarchar(255) default '',
-  primary key (ID_)
-);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6412.to.cam6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6412.to.cam6413.task.history.sql
deleted file mode 100644
index d711061e7fa..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6412.to.cam6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ numeric(19,0) IDENTITY (1,1),
-  TYPE_ nvarchar(64),
-  TASK_ID_ nvarchar(64) not null,
-  TIME_STAMP_ datetime not null,
-  USER_ID_ nvarchar(255),
-  DATA_ nvarchar(4000),
-  EXECUTION_ID_ nvarchar(64),
-  PROC_INST_ID_ nvarchar(64),
-  PROC_DEF_ID_ nvarchar(64),
-  SCOPE_ID_ nvarchar(255),
-  SCOPE_DEFINITION_ID_ nvarchar(255),
-  SUB_SCOPE_ID_ nvarchar(255),
-  SCOPE_TYPE_ nvarchar(255),
-  TENANT_ID_ nvarchar(255) default '',
-  primary key (ID_)
-);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.task.history.sql
deleted file mode 100644
index 1ddf3446c02..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add PROPAGATED_STAGE_INST_ID_ nvarchar(255);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.task.sql
deleted file mode 100644
index 0369228de35..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.6504.to.6505.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add PROPAGATED_STAGE_INST_ID_ nvarchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.task.history.sql
deleted file mode 100644
index 174006e2f8d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_HI_TASKINST add STATE_ nvarchar(255);
-alter table ACT_HI_TASKINST add IN_PROGRESS_TIME_ datetime;
-alter table ACT_HI_TASKINST add IN_PROGRESS_STARTED_BY_ nvarchar(255);
-alter table ACT_HI_TASKINST add CLAIMED_BY_ nvarchar(255);
-alter table ACT_HI_TASKINST add SUSPENDED_TIME_ datetime;
-alter table ACT_HI_TASKINST add SUSPENDED_BY_ nvarchar(255);
-alter table ACT_HI_TASKINST add COMPLETED_BY_ nvarchar(255);
-alter table ACT_HI_TASKINST add IN_PROGRESS_DUE_DATE_ datetime;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.task.sql
deleted file mode 100644
index 62d19e16664..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7000.to.7010.task.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_RU_TASK add STATE_ nvarchar(255);
-alter table ACT_RU_TASK add IN_PROGRESS_TIME_ datetime;
-alter table ACT_RU_TASK add IN_PROGRESS_STARTED_BY_ nvarchar(255);
-alter table ACT_RU_TASK add CLAIMED_BY_ nvarchar(255);
-alter table ACT_RU_TASK add SUSPENDED_TIME_ datetime;
-alter table ACT_RU_TASK add SUSPENDED_BY_ nvarchar(255);
-alter table ACT_RU_TASK add IN_PROGRESS_DUE_DATE_ datetime;
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.task.history.sql
deleted file mode 100644
index e11921b7f3d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mssql.upgradestep.7011.to.7100.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.task.history.sql
deleted file mode 100644
index 469e7a3f7af..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
- alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.task.sql
deleted file mode 100644
index 8770675484a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index 4f1d24ceeb4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_TASK add column SUB_TASK_COUNT_ integer;
-update ACT_RU_TASK t set t.SUB_TASK_COUNT_ = (select count(*) from (select * from ACT_RU_TASK where IS_COUNT_ENABLED_ = 1) as count_table where PARENT_TASK_ID_ = t.ID_) where t.IS_COUNT_ENABLED_ = 1;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.task.history.sql
deleted file mode 100644
index 2ed7c06c9ff..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.task.sql
deleted file mode 100644
index 705c8b2690b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6300.to.6301.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.task.history.sql
deleted file mode 100644
index 0892e3a26a6..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6412.to.6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ bigint auto_increment,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp(3) not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6412.to.cam6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6412.to.cam6413.task.history.sql
deleted file mode 100644
index 0892e3a26a6..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6412.to.cam6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ bigint auto_increment,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp(3) not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.task.history.sql
deleted file mode 100644
index 7a9295b0e46..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.task.sql
deleted file mode 100644
index fa6784bb9d9..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.6504.to.6505.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.task.history.sql
deleted file mode 100644
index e1988edca55..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.task.history.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_HI_TASKINST add column (
-    STATE_ varchar(255), 
-    IN_PROGRESS_TIME_ datetime(3), 
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIMED_BY_ varchar(255), 
-    SUSPENDED_TIME_ datetime(3), 
-    SUSPENDED_BY_ varchar(255), 
-    COMPLETED_BY_ varchar(255), 
-    IN_PROGRESS_DUE_DATE_ datetime(3));
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.task.sql
deleted file mode 100644
index b4b3a2d1996..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7000.to.7010.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add column (
-    STATE_ varchar(255), 
-    IN_PROGRESS_TIME_ datetime(3), 
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIMED_BY_ varchar(255), 
-    SUSPENDED_TIME_ datetime(3), 
-    SUSPENDED_BY_ varchar(255), 
-    IN_PROGRESS_DUE_DATE_ datetime(3));
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7011.to.7100.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7011.to.7100.task.history.sql
deleted file mode 100644
index e11921b7f3d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql.upgradestep.7011.to.7100.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.task.history.sql
deleted file mode 100644
index 80991826d5b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.task.sql
deleted file mode 100644
index 8770675484a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index 4f1d24ceeb4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_TASK add column SUB_TASK_COUNT_ integer;
-update ACT_RU_TASK t set t.SUB_TASK_COUNT_ = (select count(*) from (select * from ACT_RU_TASK where IS_COUNT_ENABLED_ = 1) as count_table where PARENT_TASK_ID_ = t.ID_) where t.IS_COUNT_ENABLED_ = 1;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6300.to.6301.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6300.to.6301.task.history.sql
deleted file mode 100644
index 2ed7c06c9ff..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6300.to.6301.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6300.to.6301.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6300.to.6301.task.sql
deleted file mode 100644
index 705c8b2690b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6300.to.6301.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6412.to.6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6412.to.6413.task.history.sql
deleted file mode 100644
index f1b4972f7e4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6412.to.6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ bigint auto_increment,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp(3) not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEFINITION_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6412.to.cam6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6412.to.cam6413.task.history.sql
deleted file mode 100644
index f1b4972f7e4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6412.to.cam6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ bigint auto_increment,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp(3) not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEFINITION_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default '',
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6504.to.6505.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6504.to.6505.task.history.sql
deleted file mode 100644
index 7a9295b0e46..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6504.to.6505.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6504.to.6505.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6504.to.6505.task.sql
deleted file mode 100644
index fa6784bb9d9..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.6504.to.6505.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7000.to.7010.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7000.to.7010.task.history.sql
deleted file mode 100644
index 2a1a97e8b27..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7000.to.7010.task.history.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_HI_TASKINST add column (
-    STATE_ varchar(255), 
-    IN_PROGRESS_TIME_ datetime, 
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIMED_BY_ varchar(255), 
-    SUSPENDED_TIME_ datetime, 
-    SUSPENDED_BY_ varchar(255), 
-    COMPLETED_BY_ varchar(255), 
-    IN_PROGRESS_DUE_DATE_ datetime);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7000.to.7010.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7000.to.7010.task.sql
deleted file mode 100644
index 65b303e586b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7000.to.7010.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add column (
-    STATE_ varchar(255), 
-    IN_PROGRESS_TIME_ datetime, 
-    IN_PROGRESS_STARTED_BY_ varchar(255),
-    CLAIMED_BY_ varchar(255), 
-    SUSPENDED_TIME_ datetime, 
-    SUSPENDED_BY_ varchar(255), 
-    IN_PROGRESS_DUE_DATE_ datetime);
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7011.to.7100.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7011.to.7100.task.history.sql
deleted file mode 100644
index 9d2c653f88d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.mysql55.upgradestep.7011.to.7100.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.task.history.sql
deleted file mode 100644
index 0f30aee5146..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
- alter table ACT_HI_TASKINST add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_HI_TASKINST add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_HI_TASKINST add SCOPE_TYPE_ NVARCHAR2(255);
-alter table ACT_HI_TASKINST add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.task.sql
deleted file mode 100644
index 5c791906ffb..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_TASK add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_TASK add SCOPE_TYPE_ NVARCHAR2(255);
-alter table ACT_RU_TASK add SCOPE_DEFINITION_ID_ NVARCHAR2(255);
-
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index acd834bcd60..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_TASK add SUB_TASK_COUNT_ INTEGER;
-update ACT_RU_TASK t set t.SUB_TASK_COUNT_ = (select count(*) from (select * from ACT_RU_TASK where IS_COUNT_ENABLED_ = 1) count_table where count_table.PARENT_TASK_ID_ = t.ID_) where t.IS_COUNT_ENABLED_ = 1;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.task.history.sql
deleted file mode 100644
index 9f9ce540b4d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add TASK_DEF_ID_ NVARCHAR2(64);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.task.sql
deleted file mode 100644
index d0211083bb9..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6300.to.6301.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add TASK_DEF_ID_ NVARCHAR2(64);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.task.history.sql
deleted file mode 100644
index b8f7cb7d292..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6412.to.6413.task.history.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ NUMBER(19),
-  TYPE_ NVARCHAR2(64),
-  TASK_ID_ NVARCHAR2(64) not null,
-  TIME_STAMP_ TIMESTAMP(6) not null,
-  USER_ID_ NVARCHAR2(255),
-  DATA_ NVARCHAR2(2000),
-  EXECUTION_ID_ NVARCHAR2(64),
-  PROC_INST_ID_ NVARCHAR2(64),
-  PROC_DEF_ID_ NVARCHAR2(64),
-  SCOPE_ID_ NVARCHAR2(255),
-  SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-  SUB_SCOPE_ID_ NVARCHAR2(255),
-  SCOPE_TYPE_ NVARCHAR2(255),
-  TENANT_ID_ NVARCHAR2(255) default '',
-  primary key (ID_)
-);
-
-create sequence act_hi_task_evt_log_seq start with 1 increment by 1;
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6412.to.cam6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6412.to.cam6413.task.history.sql
deleted file mode 100644
index 7a7ef8b8f62..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6412.to.cam6413.task.history.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ NUMBER(19),
-  TYPE_ NVARCHAR2(64),
-  TASK_ID_ NVARCHAR2(64) not null,
-  TIME_STAMP_ TIMESTAMP(6) not null,
-  USER_ID_ NVARCHAR2(255),
-  DATA_ NVARCHAR2(2000),
-  EXECUTION_ID_ NVARCHAR2(64),
-  PROC_INST_ID_ NVARCHAR2(64),
-  PROC_DEF_ID_ NVARCHAR2(64),
-  SCOPE_ID_ NVARCHAR2(255),
-  SCOPE_DEFINITION_ID_ NVARCHAR2(255),
-  SUB_SCOPE_ID_ NVARCHAR2(255),
-  SCOPE_TYPE_ NVARCHAR2(255),
-  TENANT_ID_ NVARCHAR2(255) default '',
-  primary key (ID_)
-);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.task.history.sql
deleted file mode 100644
index 41da22a641f..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add PROPAGATED_STAGE_INST_ID_ NVARCHAR2(255);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.task.sql
deleted file mode 100644
index 1b2b7e820d4..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.6504.to.6505.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add PROPAGATED_STAGE_INST_ID_ NVARCHAR2(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.task.history.sql
deleted file mode 100644
index abde872eb49..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.task.history.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_HI_TASKINST add (
-    STATE_ NVARCHAR2(255), 
-    IN_PROGRESS_TIME_ TIMESTAMP(6), 
-    IN_PROGRESS_STARTED_BY_ NVARCHAR2(255),
-    CLAIMED_BY_ NVARCHAR2(255), 
-    SUSPENDED_TIME_ TIMESTAMP(6), 
-    SUSPENDED_BY_ NVARCHAR2(255), 
-    COMPLETED_BY_ NVARCHAR2(255), 
-    IN_PROGRESS_DUE_DATE_ TIMESTAMP(6));
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.task.sql
deleted file mode 100644
index f523bb83af0..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7000.to.7010.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add (
-    STATE_ NVARCHAR2(255), 
-    IN_PROGRESS_TIME_ TIMESTAMP(6), 
-    IN_PROGRESS_STARTED_BY_ NVARCHAR2(255),
-    CLAIMED_BY_ NVARCHAR2(255), 
-    SUSPENDED_TIME_ TIMESTAMP(6), 
-    SUSPENDED_BY_ NVARCHAR2(255), 
-    IN_PROGRESS_DUE_DATE_ TIMESTAMP(6));
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7011.to.7100.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7011.to.7100.task.history.sql
deleted file mode 100644
index 9d2c653f88d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.oracle.upgradestep.7011.to.7100.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.task.history.sql
deleted file mode 100644
index 80991826d5b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.task.history.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_HI_TASKINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_TYPE_ varchar(255);
-alter table ACT_HI_TASKINST add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_); 
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.task.sql
deleted file mode 100644
index 8770675484a..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_TYPE_ varchar(255);
-alter table ACT_RU_TASK add column SCOPE_DEFINITION_ID_ varchar(255);
-
-create index ACT_IDX_TASK_SCOPE on ACT_RU_TASK(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SUB_SCOPE on ACT_RU_TASK(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('task.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.task.sql
deleted file mode 100644
index 9d5a3af719b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6210.to.6300.task.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table ACT_RU_TASK add column SUB_TASK_COUNT_ integer;
-update ACT_RU_TASK t set SUB_TASK_COUNT_ = (select count(*) from (select * from ACT_RU_TASK where IS_COUNT_ENABLED_ = true) as count_table where PARENT_TASK_ID_ = t.ID_) where t.IS_COUNT_ENABLED_ = true;
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.task.history.sql
deleted file mode 100644
index 74e4c429ff8..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column TASK_DEF_ID_ varchar(64);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.task.sql
deleted file mode 100644
index 705c8b2690b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6300.to.6301.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column TASK_DEF_ID_ varchar(64);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.task.history.sql
deleted file mode 100644
index 6d5ea696f28..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6412.to.6413.task.history.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ SERIAL PRIMARY KEY,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default ''
-);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6412.to.cam6413.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6412.to.cam6413.task.history.sql
deleted file mode 100644
index 6d5ea696f28..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6412.to.cam6413.task.history.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-create table ACT_HI_TSK_LOG (
-  ID_ SERIAL PRIMARY KEY,
-  TYPE_ varchar(64),
-  TASK_ID_ varchar(64) not null,
-  TIME_STAMP_ timestamp not null,
-  USER_ID_ varchar(255),
-  DATA_ varchar(4000),
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  SCOPE_ID_ varchar(255),
-  SCOPE_DEFINITION_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  TENANT_ID_ varchar(255) default ''
-);
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.task.history.sql
deleted file mode 100644
index 91d00b1778b..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_TASKINST add column PROPAGATED_STAGE_INST_ID_ varchar(255);
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.task.sql
deleted file mode 100644
index fa6784bb9d9..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.6504.to.6505.task.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_TASK add column PROPAGATED_STAGE_INST_ID_ varchar(255);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.task.history.sql
deleted file mode 100644
index 73bd766a771..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.task.history.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-alter table ACT_HI_TASKINST 
-    add column STATE_ varchar(255), 
-    add column IN_PROGRESS_TIME_ timestamp, 
-    add column IN_PROGRESS_STARTED_BY_ varchar(255),
-    add column CLAIMED_BY_ varchar(255), 
-    add column SUSPENDED_TIME_ timestamp, 
-    add column SUSPENDED_BY_ varchar(255), 
-    add column COMPLETED_BY_ varchar(255), 
-    add column IN_PROGRESS_DUE_DATE_ timestamp;
\ No newline at end of file
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.task.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.task.sql
deleted file mode 100644
index 31acf66e0be..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7000.to.7010.task.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-alter table ACT_RU_TASK 
-    add column STATE_ varchar(255), 
-    add column IN_PROGRESS_TIME_ timestamp, 
-    add column IN_PROGRESS_STARTED_BY_ varchar(255),
-    add column CLAIMED_BY_ varchar(255), 
-    add column SUSPENDED_TIME_ timestamp, 
-    add column SUSPENDED_BY_ varchar(255), 
-    add column IN_PROGRESS_DUE_DATE_ timestamp;
-
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'task.schema.version';
diff --git a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7011.to.7100.task.history.sql b/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7011.to.7100.task.history.sql
deleted file mode 100644
index e11921b7f3d..00000000000
--- a/modules/flowable-task-service/src/main/resources/org/flowable/task/service/db/upgrade/flowable.postgres.upgradestep.7011.to.7100.task.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index ACT_IDX_ACT_HI_TSK_LOG_TASK on ACT_HI_TSK_LOG(TASK_ID_);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/db/VariableDbSchemaManager.java b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/db/VariableDbSchemaManager.java
deleted file mode 100644
index 8516b543021..00000000000
--- a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/db/VariableDbSchemaManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.flowable.variable.service.impl.db;
-
-import org.flowable.common.engine.impl.db.ServiceSqlScriptBasedDbSchemaManager;
-
-/**
- * @author Joram Barrez
- */
-public class VariableDbSchemaManager extends ServiceSqlScriptBasedDbSchemaManager {
-    
-    private static final String VARIABLE_TABLE = "ACT_RU_VARIABLE";
-    private static final String VARIABLE_VERSION_PROPERTY = "variable.schema.version";
-    private static final String SCHEMA_COMPONENT = "variable";
-    private static final String SCHEMA_COMPONENT_HISTORY = "variable.history";
-    
-    public VariableDbSchemaManager() {
-        super(VARIABLE_TABLE, SCHEMA_COMPONENT, SCHEMA_COMPONENT_HISTORY, VARIABLE_VERSION_PROPERTY);
-    }
-
-    @Override
-    protected String getResourcesRootDirectory() {
-        return "org/flowable/variable/service/db/";
-    }
-    
-}
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.history.sql
deleted file mode 100644
index 2dda94d538d..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.history.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-create table ACT_HI_VARINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    NAME_ varchar(255) not null,
-    VAR_TYPE_ varchar(100),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double precision,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    CREATE_TIME_ timestamp,
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.sql
deleted file mode 100644
index 70e9a41946a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.cockroachdb.create.variable.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(255) not null,
-    NAME_ varchar(255) not null,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double precision,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    primary key (ID_)
-);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_);
-
--- force-commit
-
-alter table ACT_RU_VARIABLE
-    add constraint ACT_FK_VAR_BYTEARRAY 
-    foreign key (BYTEARRAY_ID_) 
-    references ACT_GE_BYTEARRAY (ID_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
-
--- force-commit
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.db2.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.db2.create.variable.history.sql
deleted file mode 100644
index 11988ffada4..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.db2.create.variable.history.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_HI_VARINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    NAME_ varchar(255) not null,
-    VAR_TYPE_ varchar(100),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double precision,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    CREATE_TIME_ timestamp,
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.db2.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.db2.create.variable.sql
deleted file mode 100644
index c6c39f20d58..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.db2.create.variable.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(255) not null,
-    NAME_ varchar(255) not null,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double precision,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    primary key (ID_)
-);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_VARIABLE_BA on ACT_RU_VARIABLE(BYTEARRAY_ID_);
-alter table ACT_RU_VARIABLE 
-    add constraint ACT_FK_VAR_BYTEARRAY 
-    foreign key (BYTEARRAY_ID_) 
-    references ACT_GE_BYTEARRAY (ID_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.h2.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.h2.create.variable.history.sql
deleted file mode 100644
index 81e0ed52eac..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.h2.create.variable.history.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_HI_VARINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    NAME_ varchar(255) not null,
-    VAR_TYPE_ varchar(100),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    CREATE_TIME_ timestamp,
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.h2.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.h2.create.variable.sql
deleted file mode 100644
index 78714b886e7..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.h2.create.variable.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(255) not null,
-    NAME_ varchar(255) not null,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    primary key (ID_)
-);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-alter table ACT_RU_VARIABLE
-    add constraint ACT_FK_VAR_BYTEARRAY
-    foreign key (BYTEARRAY_ID_)
-    references ACT_GE_BYTEARRAY;
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.hsql.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.hsql.create.variable.history.sql
deleted file mode 100644
index 3825fd10f94..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.hsql.create.variable.history.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_HI_VARINST (
-  ID_ varchar(64) not null,
-  REV_ integer default 1,
-  PROC_INST_ID_ varchar(64),
-  EXECUTION_ID_ varchar(64),
-  TASK_ID_ varchar(64),
-  NAME_ varchar(255) not null,
-  VAR_TYPE_ varchar(100),
-  SCOPE_ID_ varchar(255),
-  SUB_SCOPE_ID_ varchar(255),
-  SCOPE_TYPE_ varchar(255),
-  BYTEARRAY_ID_ varchar(64),
-  DOUBLE_ double,
-  LONG_ bigint,
-  TEXT_ varchar(4000),
-  TEXT2_ varchar(4000),
-  META_INFO_ varchar(4000),
-  CREATE_TIME_ timestamp,
-  LAST_UPDATED_TIME_ timestamp,
-  primary key (ID_)
-);
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.hsql.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.hsql.create.variable.sql
deleted file mode 100644
index 78714b886e7..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.hsql.create.variable.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(255) not null,
-    NAME_ varchar(255) not null,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    primary key (ID_)
-);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-alter table ACT_RU_VARIABLE
-    add constraint ACT_FK_VAR_BYTEARRAY
-    foreign key (BYTEARRAY_ID_)
-    references ACT_GE_BYTEARRAY;
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mssql.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mssql.create.variable.history.sql
deleted file mode 100644
index 602e30fcdeb..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mssql.create.variable.history.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_HI_VARINST (
-    ID_ nvarchar(64) not null,
-    REV_ int default 1,
-    PROC_INST_ID_ nvarchar(64),
-    EXECUTION_ID_ nvarchar(64),
-    TASK_ID_ nvarchar(64),
-    NAME_ nvarchar(255) not null,
-    VAR_TYPE_ nvarchar(100),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    BYTEARRAY_ID_ nvarchar(64),
-    DOUBLE_ double precision,
-    LONG_ numeric(19,0),
-    TEXT_ nvarchar(4000),
-    TEXT2_ nvarchar(4000),
-    META_INFO_ nvarchar(4000),
-    CREATE_TIME_ datetime,
-    LAST_UPDATED_TIME_ datetime2,
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mssql.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mssql.create.variable.sql
deleted file mode 100644
index 53012e41541..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mssql.create.variable.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ nvarchar(64) not null,
-    REV_ int,
-    TYPE_ nvarchar(255) not null,
-    NAME_ nvarchar(255) not null,
-    EXECUTION_ID_ nvarchar(64),
-    PROC_INST_ID_ nvarchar(64),
-    TASK_ID_ nvarchar(64),
-    SCOPE_ID_ nvarchar(255),
-    SUB_SCOPE_ID_ nvarchar(255),
-    SCOPE_TYPE_ nvarchar(255),
-    BYTEARRAY_ID_ nvarchar(64),
-    DOUBLE_ double precision,
-    LONG_ numeric(19,0),
-    TEXT_ nvarchar(4000),
-    TEXT2_ nvarchar(4000),
-    META_INFO_ nvarchar(4000),
-    primary key (ID_)
-);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_VARIABLE_BA on ACT_RU_VARIABLE(BYTEARRAY_ID_);
-alter table ACT_RU_VARIABLE 
-    add constraint ACT_FK_VAR_BYTEARRAY 
-    foreign key (BYTEARRAY_ID_) 
-    references ACT_GE_BYTEARRAY (ID_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql.create.variable.history.sql
deleted file mode 100644
index 68ba51ecb7c..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql.create.variable.history.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_HI_VARINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    NAME_ varchar(255) not null,
-    VAR_TYPE_ varchar(100),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    CREATE_TIME_ datetime(3),
-    LAST_UPDATED_TIME_ datetime(3),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql.create.variable.sql
deleted file mode 100644
index 207cc99dc5f..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql.create.variable.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(255) not null,
-    NAME_ varchar(255) not null,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-alter table ACT_RU_VARIABLE 
-    add constraint ACT_FK_VAR_BYTEARRAY 
-    foreign key (BYTEARRAY_ID_) 
-    references ACT_GE_BYTEARRAY (ID_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql55.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql55.create.variable.history.sql
deleted file mode 100644
index 8173a77d0f5..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql55.create.variable.history.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_HI_VARINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    NAME_ varchar(255) not null,
-    VAR_TYPE_ varchar(100),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    CREATE_TIME_ datetime,
-    LAST_UPDATED_TIME_ datetime,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql55.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql55.create.variable.sql
deleted file mode 100644
index 207cc99dc5f..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.mysql55.create.variable.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(255) not null,
-    NAME_ varchar(255) not null,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-alter table ACT_RU_VARIABLE 
-    add constraint ACT_FK_VAR_BYTEARRAY 
-    foreign key (BYTEARRAY_ID_) 
-    references ACT_GE_BYTEARRAY (ID_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.oracle.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.oracle.create.variable.history.sql
deleted file mode 100644
index b0156e92f63..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.oracle.create.variable.history.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_HI_VARINST (
-    ID_ NVARCHAR2(64) not null,
-    REV_ INTEGER default 1,
-    PROC_INST_ID_ NVARCHAR2(64),
-    EXECUTION_ID_ NVARCHAR2(64),
-    TASK_ID_ NVARCHAR2(64),
-    NAME_ NVARCHAR2(255) not null,
-    VAR_TYPE_ NVARCHAR2(100),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    BYTEARRAY_ID_ NVARCHAR2(64),
-    DOUBLE_ NUMBER(*,10),
-    LONG_ NUMBER(19,0),
-    TEXT_ NVARCHAR2(2000),
-    TEXT2_ NVARCHAR2(2000),
-    META_INFO_ NVARCHAR2(2000),
-    CREATE_TIME_ TIMESTAMP(6),
-    LAST_UPDATED_TIME_ TIMESTAMP(6),
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.oracle.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.oracle.create.variable.sql
deleted file mode 100644
index c8269eeebdd..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.oracle.create.variable.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ NVARCHAR2(64) not null,
-    REV_ INTEGER,
-    TYPE_ NVARCHAR2(255) not null,
-    NAME_ NVARCHAR2(255) not null,
-    EXECUTION_ID_ NVARCHAR2(64),
-    PROC_INST_ID_ NVARCHAR2(64),
-    TASK_ID_ NVARCHAR2(64),
-    SCOPE_ID_ NVARCHAR2(255),
-    SUB_SCOPE_ID_ NVARCHAR2(255),
-    SCOPE_TYPE_ NVARCHAR2(255),
-    BYTEARRAY_ID_ NVARCHAR2(64),
-    DOUBLE_ NUMBER(*,10),
-    LONG_ NUMBER(19,0),
-    TEXT_ NVARCHAR2(2000),
-    TEXT2_ NVARCHAR2(2000),
-    META_INFO_ NVARCHAR2(2000),
-    primary key (ID_)
-);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_);
-alter table ACT_RU_VARIABLE 
-    add constraint ACT_FK_VAR_BYTEARRAY 
-    foreign key (BYTEARRAY_ID_) 
-    references ACT_GE_BYTEARRAY (ID_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.postgres.create.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.postgres.create.variable.history.sql
deleted file mode 100644
index 11988ffada4..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.postgres.create.variable.history.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-create table ACT_HI_VARINST (
-    ID_ varchar(64) not null,
-    REV_ integer default 1,
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    NAME_ varchar(255) not null,
-    VAR_TYPE_ varchar(100),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double precision,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    CREATE_TIME_ timestamp,
-    LAST_UPDATED_TIME_ timestamp,
-    primary key (ID_)
-);
-
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.postgres.create.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.postgres.create.variable.sql
deleted file mode 100644
index 221c19f2b5e..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/create/flowable.postgres.create.variable.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-create table ACT_RU_VARIABLE (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(255) not null,
-    NAME_ varchar(255) not null,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    SCOPE_ID_ varchar(255),
-    SUB_SCOPE_ID_ varchar(255),
-    SCOPE_TYPE_ varchar(255),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double precision,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    META_INFO_ varchar(4000),
-    primary key (ID_)
-);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_);
-alter table ACT_RU_VARIABLE 
-    add constraint ACT_FK_VAR_BYTEARRAY 
-    foreign key (BYTEARRAY_ID_) 
-    references ACT_GE_BYTEARRAY (ID_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.1.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.history.sql
deleted file mode 100644
index 38cbe2bb8e8..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.history.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists act_hi_varinst cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.sql
deleted file mode 100644
index 3a9a774a1da..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.cockroachdb.drop.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists act_ru_variable cascade;
-
--- force-commit
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.db2.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.db2.drop.variable.history.sql
deleted file mode 100644
index 7f6168c8c1a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.db2.drop.variable.history.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop index ACT_IDX_HI_PROCVAR_NAME_TYPE;
-drop index ACT_IDX_HI_VAR_SCOPE_ID_TYPE;
-drop index ACT_IDX_HI_VAR_SUB_ID_TYPE;
-
-drop table ACT_HI_VARINST;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.db2.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.db2.drop.variable.sql
deleted file mode 100644
index a2425a70ea6..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.db2.drop.variable.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-drop index ACT_IDX_RU_VAR_SCOPE_ID_TYPE;
-drop index ACT_IDX_RU_VAR_SUB_ID_TYPE;
-
-alter table ACT_RU_VARIABLE
-    drop foreign key ACT_FK_VAR_BYTEARRAY;
-
-drop table ACT_RU_VARIABLE;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.h2.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.h2.drop.variable.history.sql
deleted file mode 100644
index c296a275466..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.h2.drop.variable.history.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop table if exists ACT_HI_VARINST cascade constraints;
-
-drop index if exists ACT_IDX_HI_PROCVAR_NAME_TYPE;
-drop index if exists ACT_IDX_HI_VAR_SCOPE_ID_TYPE;
-drop index if exists ACT_IDX_HI_VAR_SUB_ID_TYPE;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.h2.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.h2.drop.variable.sql
deleted file mode 100644
index 4eb81866fc5..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.h2.drop.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_RU_VARIABLE cascade constraints;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.hsql.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.hsql.drop.variable.history.sql
deleted file mode 100644
index 2d2913ec014..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.hsql.drop.variable.history.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop table if exists ACT_HI_VARINST cascade;
-
-drop index if exists ACT_IDX_HI_PROCVAR_NAME_TYPE;
-drop index if exists ACT_IDX_HI_VAR_SCOPE_ID_TYPE;
-drop index if exists ACT_IDX_HI_VAR_SUB_ID_TYPE;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.hsql.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.hsql.drop.variable.sql
deleted file mode 100644
index 149ab88e1ce..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.hsql.drop.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_RU_VARIABLE cascade;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mssql.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mssql.drop.variable.history.sql
deleted file mode 100644
index 9874cdd3d02..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mssql.drop.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_BYTEARRAY;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_PROCVAR_NAME_TYPE') drop index ACT_HI_VARINST.ACT_IDX_HI_PROCVAR_NAME_TYPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_VAR_SCOPE_ID_TYPE') drop index ACT_HI_VARINST.ACT_IDX_HI_VAR_SCOPE_ID_TYPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_HI_VAR_SUB_ID_TYPE') drop index ACT_HI_VARINST.ACT_IDX_HI_VAR_SUB_ID_TYPE;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_HI_VARINST') drop table ACT_HI_VARINST;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mssql.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mssql.drop.variable.sql
deleted file mode 100644
index 03470d62e45..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mssql.drop.variable.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') alter table ACT_RU_VARIABLE drop constraint ACT_FK_VAR_BYTEARRAY;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_RU_VAR_SCOPE_ID_TYPE') drop index ACT_RU_VARIABLE.ACT_IDX_RU_VAR_SCOPE_ID_TYPE;
-IF EXISTS (SELECT name FROM sysindexes WHERE name = 'ACT_IDX_RU_VAR_SUB_ID_TYPE') drop index ACT_RU_VARIABLE.ACT_IDX_RU_VAR_SUB_ID_TYPE;
-
-if exists (select TABLE_NAME from INFORMATION_SCHEMA.TABLES where TABLE_NAME = 'ACT_RU_VARIABLE') drop table ACT_RU_VARIABLE;
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mysql.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mysql.drop.variable.history.sql
deleted file mode 100644
index e361f26b757..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mysql.drop.variable.history.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST;
-drop index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST;
-drop index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST;
-
-drop table if exists ACT_HI_VARINST;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mysql.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mysql.drop.variable.sql
deleted file mode 100644
index 4f4ea983e24..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.mysql.drop.variable.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-alter table ACT_RU_VARIABLE
-    drop FOREIGN KEY ACT_FK_VAR_BYTEARRAY;
-    
-drop index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE;
-drop index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE;    
-
-drop table if exists ACT_RU_VARIABLE;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.oracle.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.oracle.drop.variable.history.sql
deleted file mode 100644
index 7f6168c8c1a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.oracle.drop.variable.history.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop index ACT_IDX_HI_PROCVAR_NAME_TYPE;
-drop index ACT_IDX_HI_VAR_SCOPE_ID_TYPE;
-drop index ACT_IDX_HI_VAR_SUB_ID_TYPE;
-
-drop table ACT_HI_VARINST;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.oracle.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.oracle.drop.variable.sql
deleted file mode 100644
index 2a24b5160a0..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.oracle.drop.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-drop index ACT_IDX_VAR_BYTEARRAY;
-drop index ACT_IDX_RU_VAR_SCOPE_ID_TYPE;
-drop index ACT_IDX_RU_VAR_SUB_ID_TYPE;
-
-alter table ACT_RU_VARIABLE
-    drop CONSTRAINT ACT_FK_VAR_BYTEARRAY;
-
-drop table ACT_RU_VARIABLE;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.postgres.drop.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.postgres.drop.variable.history.sql
deleted file mode 100644
index d27a2773d98..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.postgres.drop.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_HI_VARINST cascade;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.postgres.drop.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.postgres.drop.variable.sql
deleted file mode 100644
index 149ab88e1ce..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/drop/flowable.postgres.drop.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists ACT_RU_VARIABLE cascade;
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.variable.sql
deleted file mode 100644
index b025a2163f5..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6200.to.6210.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.2.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.variable.sql
deleted file mode 100644
index ee44c641210..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6210.to.6300.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.variable.sql
deleted file mode 100644
index b5b037935ac..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6300.to.6301.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.0.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.variable.sql
deleted file mode 100644
index 425c3b0d382..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6301.to.6310.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.variable.sql
deleted file mode 100644
index df7177b6a54..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6310.to.6320.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.3.2.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.variable.sql
deleted file mode 100644
index b4767a6ecfc..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6320.to.6400.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.0.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.variable.sql
deleted file mode 100644
index b4a7fe12c98..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6400.to.6410.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.variable.sql
deleted file mode 100644
index a55ed349bc3..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6410.to.6411.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.variable.sql
deleted file mode 100644
index 288fed1f4d2..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6411.to.6412.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.2' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.variable.sql
deleted file mode 100644
index 567c29f302e..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6412.to.6413.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.4.1.3' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.variable.sql
deleted file mode 100644
index 9772e970dda..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6413.to.6500.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.variable.sql
deleted file mode 100644
index c011bda439d..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6500.to.6501.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.variable.sql
deleted file mode 100644
index c8e761f938f..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6501.to.6502.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.2' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.variable.sql
deleted file mode 100644
index d97c77e425c..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6502.to.6503.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.3' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.variable.sql
deleted file mode 100644
index cef3e664e0f..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6503.to.6504.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.4' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.variable.sql
deleted file mode 100644
index 3b9ef90ea2e..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6504.to.6505.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.5' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.variable.sql
deleted file mode 100644
index 0f4ed1318fd..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6505.to.6506.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.0.6' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.variable.sql
deleted file mode 100644
index 9c92a7d2dbe..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6506.to.6510.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.variable.sql
deleted file mode 100644
index 87d3eb65469..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6510.to.6511.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.variable.sql
deleted file mode 100644
index 80be18ada73..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6511.to.6512.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.2' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.variable.sql
deleted file mode 100644
index 7b0899aa006..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6512.to.6513.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.3' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.variable.sql
deleted file mode 100644
index 46cea81d86a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6513.to.6514.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.4' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.variable.sql
deleted file mode 100644
index 3152c410733..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6514.to.6515.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.5' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.variable.sql
deleted file mode 100644
index d60adaa85bd..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6515.to.6516.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.5.1.6' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.variable.sql
deleted file mode 100644
index a4a57091c58..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6516.to.6600.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.variable.sql
deleted file mode 100644
index 36659c923a3..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6600.to.6601.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.0.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.variable.sql
deleted file mode 100644
index e196c66f34d..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6601.to.6610.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.variable.sql
deleted file mode 100644
index bc5d7325207..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6610.to.6620.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.variable.sql
deleted file mode 100644
index 3bed88e30de..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6620.to.6621.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.6.2.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.variable.sql
deleted file mode 100644
index 3975c275c2f..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6621.to.6700.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.variable.sql
deleted file mode 100644
index 3e7f75ab7f8..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6700.to.6701.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.0.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.variable.sql
deleted file mode 100644
index effc96c1ace..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6701.to.6710.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.variable.sql
deleted file mode 100644
index 482068966b7..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6710.to.6720.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.variable.sql
deleted file mode 100644
index f0cd9e2777f..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6720.to.6721.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.variable.sql
deleted file mode 100644
index 68736bf324b..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6721.to.6722.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.2' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.variable.sql
deleted file mode 100644
index 129fb9d29b5..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6722.to.6723.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.7.2.3' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.variable.sql
deleted file mode 100644
index 83cfe5a7f7b..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6723.to.6800.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '6.8.0.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.variable.sql
deleted file mode 100644
index 4a9b3a8c71b..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.6810.to.7000.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.0.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.variable.sql
deleted file mode 100644
index e6b1623c4af..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7000.to.7010.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.variable.sql
deleted file mode 100644
index 770c490269c..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7010.to.7011.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.0.1.1' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.variable.sql
deleted file mode 100644
index da93a034aef..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.all.upgradestep.7011.to.7100.variable.sql
+++ /dev/null
@@ -1 +0,0 @@
-update ACT_GE_PROPERTY set VALUE_ = '7.1.0.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index 2ea7aeb1b9a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index 5262643c912..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.cockroachdb.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.variable.history.sql
deleted file mode 100644
index b4bfb3dfffe..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.variable.sql
deleted file mode 100644
index 4721dd9a63c..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6120.to.6200.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index 2ea7aeb1b9a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index 5262643c912..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.db2.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.variable.history.sql
deleted file mode 100644
index 4b8b39bfcf7..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.variable.sql
deleted file mode 100644
index 4721dd9a63c..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6120.to.6200.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index 2ea7aeb1b9a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index 5262643c912..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.h2.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.variable.history.sql
deleted file mode 100644
index b4bfb3dfffe..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.variable.sql
deleted file mode 100644
index 4721dd9a63c..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6120.to.6200.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index 2ea7aeb1b9a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index 5262643c912..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.hsql.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.variable.history.sql
deleted file mode 100644
index e2d76668c63..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_VARINST add SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_VARINST add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_HI_VARINST add SCOPE_TYPE_ nvarchar(255);
-
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.variable.sql
deleted file mode 100644
index 905d7a00995..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6120.to.6200.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_RU_VARIABLE add SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_VARIABLE add SUB_SCOPE_ID_ nvarchar(255);
-alter table ACT_RU_VARIABLE add SCOPE_TYPE_ nvarchar(255);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index ccf3f031cb3..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add META_INFO_ nvarchar(4000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index e6fd3967e1d..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mssql.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add META_INFO_ nvarchar(4000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.variable.history.sql
deleted file mode 100644
index b4bfb3dfffe..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.variable.sql
deleted file mode 100644
index 4721dd9a63c..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6120.to.6200.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index 2ea7aeb1b9a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index 5262643c912..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.variable.history.sql
deleted file mode 100644
index b4bfb3dfffe..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.variable.sql
deleted file mode 100644
index 4721dd9a63c..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6120.to.6200.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index 2ea7aeb1b9a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index 5262643c912..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.mysql55.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.variable.history.sql
deleted file mode 100644
index 18ea2fe8c4e..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_VARINST add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_HI_VARINST add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_HI_VARINST add SCOPE_TYPE_ NVARCHAR2(255);
-
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.variable.sql
deleted file mode 100644
index e55a6c992af..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6120.to.6200.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_RU_VARIABLE add SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_VARIABLE add SUB_SCOPE_ID_ NVARCHAR2(255);
-alter table ACT_RU_VARIABLE add SCOPE_TYPE_ NVARCHAR2(255);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '6.2.0.0', 1);
\ No newline at end of file
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index b6517f3b10b..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add META_INFO_ NVARCHAR2(2000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index f86a86bee22..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.oracle.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add META_INFO_ NVARCHAR2(2000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.variable.history.sql
deleted file mode 100644
index b4bfb3dfffe..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.variable.history.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table ACT_HI_VARINST add column SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_HI_VARINST add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.variable.sql
deleted file mode 100644
index 8f436c7bd3f..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6120.to.6200.variable.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-alter table ACT_RU_VARIABLE add column SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SUB_SCOPE_ID_ varchar(255);
-alter table ACT_RU_VARIABLE add column SCOPE_TYPE_ varchar(255);
-
-create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TYPE_);
-create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
-
-insert into ACT_GE_PROPERTY values ('variable.schema.version', '6.2.0.0', 1);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.variable.history.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.variable.history.sql
deleted file mode 100644
index 2ea7aeb1b9a..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.variable.history.sql
+++ /dev/null
@@ -1 +0,0 @@
-alter table ACT_HI_VARINST add column META_INFO_ varchar(4000);
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.variable.sql b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.variable.sql
deleted file mode 100644
index 5262643c912..00000000000
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/upgrade/flowable.postgres.upgradestep.6800.to.6810.variable.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-alter table ACT_RU_VARIABLE add column META_INFO_ varchar(4000);
-
-update ACT_GE_PROPERTY set VALUE_ = '6.8.1.0' where NAME_ = 'variable.schema.version';
diff --git a/pom.xml b/pom.xml
index f2852be7f03..87dfe0c2a3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -369,33 +369,6 @@
 				<artifactId>subethasmtp</artifactId>
 				<version>6.0.6</version>
 			</dependency>
-			<dependency>
-				<groupId>org.liquibase</groupId>
-				<artifactId>liquibase-core</artifactId>
-				<version>4.24.0</version>
-				<exclusions>
-					<!--
-						Even though liquibase defines all these dependencies as compile dependencies.
-						Flowable runs correctly with Liquibase without all of these dependencies.
-					 -->
-					<exclusion>
-						<groupId>javax.xml.bind</groupId>
-						<artifactId>jaxb-api</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.opencsv</groupId>
-						<artifactId>opencsv</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.yaml</groupId>
-						<artifactId>snakeyaml</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.apache.commons</groupId>
-						<artifactId>*</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<dependency>
 				<groupId>org.hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>