diff --git a/pom.xml b/pom.xml
index b859acb3..40469e57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,15 +37,15 @@
-->
- 3.2.5
- 4.1.5
+ 3.2.6
+ 4.1.6
- 7.20.0
- 7.20.0-ee
+ 7.21.0
+ 7.21.0-ee
${camunda-ce.version}
${camunda-ce.version}
- 7.20.0
+ 7.21.0
1.23.0
1.5.0
2.5.0
diff --git a/scenarios/distributed-axon-server-local-polyflow/process-application-local-polyflow/src/main/resources/db/migrations/V0_0_14__postgres_engine_7.18_to_7.21.sql b/scenarios/distributed-axon-server-local-polyflow/process-application-local-polyflow/src/main/resources/db/migrations/V0_0_14__postgres_engine_7.18_to_7.21.sql
new file mode 100644
index 00000000..c56732d3
--- /dev/null
+++ b/scenarios/distributed-axon-server-local-polyflow/process-application-local-polyflow/src/main/resources/db/migrations/V0_0_14__postgres_engine_7.18_to_7.21.sql
@@ -0,0 +1,27 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; 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.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1000', CURRENT_TIMESTAMP, '7.21.0');
+
+alter table ACT_RU_EXT_TASK
+ add column CREATE_TIME_ timestamp;
+
+alter table ACT_RU_JOB
+ add column ROOT_PROC_INST_ID_ varchar(64);
+
+create index ACT_IDX_JOB_ROOT_PROCINST on ACT_RU_JOB(ROOT_PROC_INST_ID_);
diff --git a/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_14__postgres_engine_7.18_to_7.21.sql b/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_14__postgres_engine_7.18_to_7.21.sql
new file mode 100644
index 00000000..c56732d3
--- /dev/null
+++ b/scenarios/distributed-axon-server/process-application/src/main/resources/db/migrations/V0_0_14__postgres_engine_7.18_to_7.21.sql
@@ -0,0 +1,27 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; 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.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1000', CURRENT_TIMESTAMP, '7.21.0');
+
+alter table ACT_RU_EXT_TASK
+ add column CREATE_TIME_ timestamp;
+
+alter table ACT_RU_JOB
+ add column ROOT_PROC_INST_ID_ varchar(64);
+
+create index ACT_IDX_JOB_ROOT_PROCINST on ACT_RU_JOB(ROOT_PROC_INST_ID_);
diff --git a/scenarios/distributed-kafka/process-application-local-polyflow/src/main/resources/db/migrations/V0_0_13__postgres_engine_7.18_to_7.21.sql b/scenarios/distributed-kafka/process-application-local-polyflow/src/main/resources/db/migrations/V0_0_13__postgres_engine_7.18_to_7.21.sql
new file mode 100644
index 00000000..c56732d3
--- /dev/null
+++ b/scenarios/distributed-kafka/process-application-local-polyflow/src/main/resources/db/migrations/V0_0_13__postgres_engine_7.18_to_7.21.sql
@@ -0,0 +1,27 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; 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.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1000', CURRENT_TIMESTAMP, '7.21.0');
+
+alter table ACT_RU_EXT_TASK
+ add column CREATE_TIME_ timestamp;
+
+alter table ACT_RU_JOB
+ add column ROOT_PROC_INST_ID_ varchar(64);
+
+create index ACT_IDX_JOB_ROOT_PROCINST on ACT_RU_JOB(ROOT_PROC_INST_ID_);
diff --git a/scenarios/single-node-jpa-maria/src/main/resources/db/migrations/mariadb/V0_0_8__mariadb_engine_7.19_to_7.21.sql b/scenarios/single-node-jpa-maria/src/main/resources/db/migrations/mariadb/V0_0_8__mariadb_engine_7.19_to_7.21.sql
new file mode 100644
index 00000000..95c1abb6
--- /dev/null
+++ b/scenarios/single-node-jpa-maria/src/main/resources/db/migrations/mariadb/V0_0_8__mariadb_engine_7.19_to_7.21.sql
@@ -0,0 +1,27 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; 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.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1000', CURRENT_TIMESTAMP, '7.21.0');
+
+alter table ACT_RU_EXT_TASK
+ add column CREATE_TIME_ datetime(3);
+
+alter table ACT_RU_JOB
+ add column ROOT_PROC_INST_ID_ varchar(64);
+
+create index ACT_IDX_JOB_ROOT_PROCINST on ACT_RU_JOB(ROOT_PROC_INST_ID_);
diff --git a/scenarios/single-node-jpa-maria/src/test/resources/db/migrations/h2/V0_0_8__h2_engine_7.19_to_7.21.sql b/scenarios/single-node-jpa-maria/src/test/resources/db/migrations/h2/V0_0_8__h2_engine_7.19_to_7.21.sql
new file mode 100644
index 00000000..c56732d3
--- /dev/null
+++ b/scenarios/single-node-jpa-maria/src/test/resources/db/migrations/h2/V0_0_8__h2_engine_7.19_to_7.21.sql
@@ -0,0 +1,27 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; 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.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1000', CURRENT_TIMESTAMP, '7.21.0');
+
+alter table ACT_RU_EXT_TASK
+ add column CREATE_TIME_ timestamp;
+
+alter table ACT_RU_JOB
+ add column ROOT_PROC_INST_ID_ varchar(64);
+
+create index ACT_IDX_JOB_ROOT_PROCINST on ACT_RU_JOB(ROOT_PROC_INST_ID_);
diff --git a/scenarios/single-node-jpa/src/main/resources/db/migrations/h2-postgresql/V0_0_15__postgres_engine_7.18_to_7.21.sql b/scenarios/single-node-jpa/src/main/resources/db/migrations/h2-postgresql/V0_0_15__postgres_engine_7.18_to_7.21.sql
new file mode 100644
index 00000000..c56732d3
--- /dev/null
+++ b/scenarios/single-node-jpa/src/main/resources/db/migrations/h2-postgresql/V0_0_15__postgres_engine_7.18_to_7.21.sql
@@ -0,0 +1,27 @@
+--
+-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+-- under one or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information regarding copyright
+-- ownership. Camunda licenses this file to you under the Apache License,
+-- Version 2.0; 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.
+--
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1000', CURRENT_TIMESTAMP, '7.21.0');
+
+alter table ACT_RU_EXT_TASK
+ add column CREATE_TIME_ timestamp;
+
+alter table ACT_RU_JOB
+ add column ROOT_PROC_INST_ID_ varchar(64);
+
+create index ACT_IDX_JOB_ROOT_PROCINST on ACT_RU_JOB(ROOT_PROC_INST_ID_);