diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/EntityDependencyOrder.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/EntityDependencyOrder.java
index 6524a1bfa80..fa92b5da877 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/EntityDependencyOrder.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/db/EntityDependencyOrder.java
@@ -29,6 +29,7 @@
 import org.flowable.cmmn.engine.impl.persistence.entity.PlanItemInstanceEntityImpl;
 import org.flowable.cmmn.engine.impl.persistence.entity.SentryPartInstanceEntityImpl;
 import org.flowable.common.engine.impl.persistence.entity.ByteArrayEntityImpl;
+import org.flowable.common.engine.impl.persistence.entity.ChangeLogEntityImpl;
 import org.flowable.common.engine.impl.persistence.entity.Entity;
 import org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl;
 import org.flowable.entitylink.service.impl.persistence.entity.EntityLinkEntityImpl;
@@ -63,6 +64,7 @@ public class EntityDependencyOrder {
     static {
 
         DELETE_ORDER.add(PropertyEntityImpl.class);
+        DELETE_ORDER.add(ChangeLogEntityImpl.class);
         DELETE_ORDER.add(BatchPartEntityImpl.class);
         DELETE_ORDER.add(BatchEntityImpl.class);
         DELETE_ORDER.add(JobEntityImpl.class);
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/EntityDependencyOrder.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/EntityDependencyOrder.java
index 2b9bada10ad..5c3726852f6 100644
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/EntityDependencyOrder.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/db/EntityDependencyOrder.java
@@ -16,6 +16,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.flowable.common.engine.impl.persistence.entity.ChangeLogEntityImpl;
 import org.flowable.common.engine.impl.persistence.entity.Entity;
 import org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl;
 import org.flowable.dmn.engine.impl.persistence.entity.DecisionEntityImpl;
@@ -31,6 +32,7 @@ public class EntityDependencyOrder {
     static {
 
         DELETE_ORDER.add(PropertyEntityImpl.class);
+        DELETE_ORDER.add(ChangeLogEntityImpl.class);
         DELETE_ORDER.add(HistoricDecisionExecutionEntityImpl.class);
         DELETE_ORDER.add(DmnResourceEntityImpl.class);
         DELETE_ORDER.add(DmnDeploymentEntityImpl.class);
diff --git a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/ChangeLog.xml b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/ChangeLog.xml
index e5a7f456686..4e91d976363 100644
--- a/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/ChangeLog.xml
+++ b/modules/flowable-engine-common/src/main/resources/org/flowable/common/db/mapping/entity/ChangeLog.xml
@@ -7,7 +7,7 @@
   <!-- CHANGELOG SELECT -->
   
   <resultMap id="changeLogResultMap" type="org.flowable.common.engine.impl.persistence.entity.ChangeLogEntityImpl">
-    <id property="id" column="ID" jdbcType="NVARCHAR" />
+    <id property="id" column="ID" jdbcType="VARCHAR" />
   </resultMap>
   
   <select id="selectCmmnChangeLogVersions" resultMap="changeLogResultMap">
diff --git a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/EntityDependencyOrder.java b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/EntityDependencyOrder.java
index f12f5f0c225..f39094864a0 100644
--- a/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/EntityDependencyOrder.java
+++ b/modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/db/EntityDependencyOrder.java
@@ -16,6 +16,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.flowable.common.engine.impl.persistence.entity.ChangeLogEntityImpl;
 import org.flowable.common.engine.impl.persistence.entity.Entity;
 import org.flowable.common.engine.impl.persistence.entity.PropertyEntityImpl;
 import org.flowable.eventregistry.impl.persistence.entity.ChannelDefinitionEntityImpl;
@@ -31,6 +32,7 @@ public class EntityDependencyOrder {
     static {
         
         DELETE_ORDER.add(PropertyEntityImpl.class);
+        DELETE_ORDER.add(ChangeLogEntityImpl.class);
         DELETE_ORDER.add(EventResourceEntityImpl.class);
         DELETE_ORDER.add(EventDeploymentEntityImpl.class);
         DELETE_ORDER.add(EventDefinitionEntityImpl.class);
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..c94c93ebbbb 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,6 +54,9 @@
  * @author Joram Barrez
  */
 public class EngineMappingsValidationTest {
+    
+    private static final List<String> NON_CREATE_ENTITIES = Arrays.asList(
+        "ChangeLog");
 
     private static final List<String> IMMUTABLE_ENTITIES = Arrays.asList(
         "HistoricIdentityLink",
@@ -63,7 +66,8 @@ public class EngineMappingsValidationTest {
         "EventLogEntry",
         "Privilege",
         "PrivilegeMapping",
-        "Membership");
+        "Membership",
+        "ChangeLog");
 
     @ParameterizedTest(name = "Package {0}")
     @ArgumentsSource(EntityPackageTestArgumentsProvider.class)
@@ -100,7 +104,8 @@ public void verifyInserts(EntityMappingPackageInformation packageInformation) {
             Document mappingFileContent = mappedResources.get(resource);
 
             Class<?> entityClass = getAndAssertEntityImplClass(mappingFileContent, resource);
-            if (Modifier.isAbstract(entityClass.getModifiers())) {
+            if (Modifier.isAbstract(entityClass.getModifiers())
+                    || NON_CREATE_ENTITIES.contains(resource)) { // these entities have no insert
                 continue;
             }
 
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..8075765d450 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
@@ -56,6 +56,7 @@ public abstract class EntityParameterTypesOverview {
         addProcessDefinitionParams();
         addProcessDefinitionInfoParams();
         addPropertyParams();
+        addChangeLogParams();
         addResourceParams();
         addTaskParams();
         addTimerJobParams();
@@ -717,6 +718,11 @@ protected static void addPropertyParams() {
         info.addColumn("VALUE_", "value", PARAMETER_TYPE_NVARCHAR);
         info.addColumn("REV_", "revision", PARAMETER_TYPE_INTEGER);
     }
+    
+    protected static void addChangeLogParams() {
+        ParameterInfo info = addParameterInfo("changeLog");
+        info.addColumn("ID", "id", PARAMETER_TYPE_VARCHAR);
+    }
 
     protected static void addResourceParams() {
         ParameterInfo info = addParameterInfo("resource");