diff --git a/database/pom.xml b/database/pom.xml
index 2b4f7bab2c0..981478bb50b 100644
--- a/database/pom.xml
+++ b/database/pom.xml
@@ -34,7 +34,7 @@
     <version.cockroachdb>42.2.9</version.cockroachdb>
 
     <!-- needed for sql script and backward compatibility checks -->
-    <camunda.version.old>7.20.0</camunda.version.old>
+    <camunda.version.old>7.21.0</camunda.version.old>
 
     <!-- Testcontainers JDBC URL parameters. By default, an empty string -->
     <database.tc.params />
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.cockroachdb.create.engine.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.cockroachdb.create.engine.sql
index 0e414e8a7cb..82d6796bd58 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.cockroachdb.create.engine.sql
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.cockroachdb.create.engine.sql
@@ -69,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.21.0');
+values ('0', CURRENT_TIMESTAMP, '7.22.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.db2.create.engine.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.db2.create.engine.sql
index 00779eeea36..4366cbb9193 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.db2.create.engine.sql
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.db2.create.engine.sql
@@ -69,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.21.0');
+values ('0', CURRENT_TIMESTAMP, '7.22.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64) not null,
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.h2.create.engine.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.h2.create.engine.sql
index dcc0b3951fc..e660cce1f99 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.h2.create.engine.sql
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.h2.create.engine.sql
@@ -69,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.21.0');
+values ('0', CURRENT_TIMESTAMP, '7.22.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mariadb.create.engine.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mariadb.create.engine.sql
index 789ab7b90a4..15a789796e2 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mariadb.create.engine.sql
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mariadb.create.engine.sql
@@ -69,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.21.0');
+values ('0', CURRENT_TIMESTAMP, '7.22.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mssql.create.engine.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mssql.create.engine.sql
index a2236f35d65..12ebcac76ff 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mssql.create.engine.sql
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mssql.create.engine.sql
@@ -69,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.21.0');
+values ('0', CURRENT_TIMESTAMP, '7.22.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ nvarchar(64),
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mysql.create.engine.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mysql.create.engine.sql
index 9594612cea5..a8bfc5b35c9 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mysql.create.engine.sql
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.mysql.create.engine.sql
@@ -69,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.21.0');
+values ('0', CURRENT_TIMESTAMP, '7.22.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.oracle.create.engine.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.oracle.create.engine.sql
index 2086b124c3a..efc65ac206f 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.oracle.create.engine.sql
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.oracle.create.engine.sql
@@ -69,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.21.0');
+values ('0', CURRENT_TIMESTAMP, '7.22.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ NVARCHAR2(64),
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.postgres.create.engine.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.postgres.create.engine.sql
index 6fe02c5b2ec..10ad68c0a7a 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.postgres.create.engine.sql
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/create/activiti.postgres.create.engine.sql
@@ -69,7 +69,7 @@ create table ACT_GE_SCHEMA_LOG (
 );
 
 insert into ACT_GE_SCHEMA_LOG
-values ('0', CURRENT_TIMESTAMP, '7.21.0');
+values ('0', CURRENT_TIMESTAMP, '7.22.0');
 
 create table ACT_RE_DEPLOYMENT (
     ID_ varchar(64),
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/liquibase/camunda-changelog.xml b/engine/src/main/resources/org/camunda/bpm/engine/db/liquibase/camunda-changelog.xml
index fb7d5537cb0..da087112453 100644
--- a/engine/src/main/resources/org/camunda/bpm/engine/db/liquibase/camunda-changelog.xml
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/liquibase/camunda-changelog.xml
@@ -133,4 +133,16 @@
     <tagDatabase tag="7.21.0"/>
   </changeSet>
 
+  <changeSet author="Camunda" id="7.21-to-7.22">
+    <sqlFile path="upgrade/${db.name}_engine_7.21_to_7.22.sql"
+             encoding="UTF-8"
+             relativeToChangelogFile="true"
+             splitStatements="true"
+             stripComments="true"/>
+  </changeSet>
+
+  <changeSet author="Camunda" id="7.22.0-tag">
+    <tagDatabase tag="7.22.0"/>
+  </changeSet>
+
 </databaseChangeLog>
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/cockroachdb_engine_7.21_to_7.22.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/cockroachdb_engine_7.21_to_7.22.sql
new file mode 100644
index 00000000000..ab7cd1a4591
--- /dev/null
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/cockroachdb_engine_7.21_to_7.22.sql
@@ -0,0 +1,21 @@
+--
+-- 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.
+--
+
+-- table writes should ideally come after schema changes, see https://github.com/cockroachdb/cockroach/pull/58182
+
+insert into ACT_GE_SCHEMA_LOG
+values ('1100', CURRENT_TIMESTAMP, '7.22.0');
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/db2_engine_7.21_to_7.22.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/db2_engine_7.21_to_7.22.sql
new file mode 100644
index 00000000000..972d54a543e
--- /dev/null
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/db2_engine_7.21_to_7.22.sql
@@ -0,0 +1,19 @@
+--
+-- 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 ('1100', CURRENT_TIMESTAMP, '7.22.0');
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/h2_engine_7.21_to_7.22.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/h2_engine_7.21_to_7.22.sql
new file mode 100644
index 00000000000..972d54a543e
--- /dev/null
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/h2_engine_7.21_to_7.22.sql
@@ -0,0 +1,19 @@
+--
+-- 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 ('1100', CURRENT_TIMESTAMP, '7.22.0');
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mariadb_engine_7.21_to_7.22.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mariadb_engine_7.21_to_7.22.sql
new file mode 100644
index 00000000000..972d54a543e
--- /dev/null
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mariadb_engine_7.21_to_7.22.sql
@@ -0,0 +1,19 @@
+--
+-- 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 ('1100', CURRENT_TIMESTAMP, '7.22.0');
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mssql_engine_7.21_to_7.22.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mssql_engine_7.21_to_7.22.sql
new file mode 100644
index 00000000000..972d54a543e
--- /dev/null
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mssql_engine_7.21_to_7.22.sql
@@ -0,0 +1,19 @@
+--
+-- 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 ('1100', CURRENT_TIMESTAMP, '7.22.0');
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mysql_engine_7.21_to_7.22.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mysql_engine_7.21_to_7.22.sql
new file mode 100644
index 00000000000..972d54a543e
--- /dev/null
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/mysql_engine_7.21_to_7.22.sql
@@ -0,0 +1,19 @@
+--
+-- 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 ('1100', CURRENT_TIMESTAMP, '7.22.0');
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/oracle_engine_7.21_to_7.22.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/oracle_engine_7.21_to_7.22.sql
new file mode 100644
index 00000000000..972d54a543e
--- /dev/null
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/oracle_engine_7.21_to_7.22.sql
@@ -0,0 +1,19 @@
+--
+-- 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 ('1100', CURRENT_TIMESTAMP, '7.22.0');
diff --git a/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/postgres_engine_7.21_to_7.22.sql b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/postgres_engine_7.21_to_7.22.sql
new file mode 100644
index 00000000000..972d54a543e
--- /dev/null
+++ b/engine/src/main/resources/org/camunda/bpm/engine/db/upgrade/postgres_engine_7.21_to_7.22.sql
@@ -0,0 +1,19 @@
+--
+-- 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 ('1100', CURRENT_TIMESTAMP, '7.22.0');
diff --git a/qa/test-db-instance-migration/pom.xml b/qa/test-db-instance-migration/pom.xml
index 01155320fa4..c941c6cd98f 100644
--- a/qa/test-db-instance-migration/pom.xml
+++ b/qa/test-db-instance-migration/pom.xml
@@ -42,6 +42,7 @@
     <module>test-fixture-719</module>
     <module>test-fixture-720</module>
     <module>test-fixture-721</module>
+    <module>test-fixture-722</module>
     <module>test-migration</module>
   </modules>
 
diff --git a/qa/test-db-instance-migration/test-fixture-721/pom.xml b/qa/test-db-instance-migration/test-fixture-721/pom.xml
index 859b0fa126e..08e3c79217a 100644
--- a/qa/test-db-instance-migration/test-fixture-721/pom.xml
+++ b/qa/test-db-instance-migration/test-fixture-721/pom.xml
@@ -12,23 +12,20 @@
   <name>camunda BPM - QA - upgrade - instance migration - test fixture - 7.21.0</name>
 
   <properties>
-    <!-- delete when 7.21 is released -->
-    <camunda.version.current>${project.version}</camunda.version.current>
-    <camunda.version.previous>7.20.0</camunda.version.previous>
+    <camunda.version.previous>7.21.0</camunda.version.previous>
   </properties>
 
-  <!-- uncomment when 7.21 is released -->
-<!--   <dependencyManagement> -->
-<!--     <dependencies> -->
-<!--       <dependency> -->
-<!--         <groupId>org.camunda.bpm</groupId> -->
-<!--         <artifactId>camunda-bom</artifactId> -->
-<!--         <version>7.21.0</version> -->
-<!--         <scope>import</scope> -->
-<!--         <type>pom</type> -->
-<!--       </dependency> -->
-<!--     </dependencies> -->
-<!--   </dependencyManagement> -->
+   <dependencyManagement>
+     <dependencies>
+       <dependency>
+         <groupId>org.camunda.bpm</groupId>
+         <artifactId>camunda-bom</artifactId>
+         <version>7.21.0</version>
+         <scope>import</scope>
+         <type>pom</type>
+       </dependency>
+     </dependencies>
+   </dependencyManagement>
 
   <dependencies>
     <dependency>
@@ -106,9 +103,7 @@
                     <artifactItem>
                       <groupId>org.camunda.bpm.distro</groupId>
                       <artifactId>camunda-sql-scripts</artifactId>
-                      <!-- Replace after 7.21.0 release -->
-                      <version>${camunda.version.current}</version>
-                      <!--<version>7.21.0</version>-->
+                      <version>7.21.0</version>
                       <type>test-jar</type>
                       <outputDirectory>${project.build.directory}/scripts-current</outputDirectory>
                       <overWrite>true</overWrite>
@@ -118,8 +113,7 @@
               </execution>
             </executions>
           </plugin>
-          <!-- uncomment when 7.21 is released -->
-          <!--<plugin>
+          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
             <configuration>
@@ -140,7 +134,7 @@
                 </configuration>
               </execution>
             </executions>
-          </plugin>-->
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/qa/test-db-instance-migration/test-fixture-722/pom.xml b/qa/test-db-instance-migration/test-fixture-722/pom.xml
new file mode 100644
index 00000000000..50b46ad5ea1
--- /dev/null
+++ b/qa/test-db-instance-migration/test-fixture-722/pom.xml
@@ -0,0 +1,149 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.camunda.bpm.qa.upgrade</groupId>
+    <artifactId>camunda-qa-db-instance-migration</artifactId>
+    <version>7.22.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camunda-qa-upgrade-test-fixture-722</artifactId>
+  <packaging>jar</packaging>
+  <name>camunda BPM - QA - upgrade - instance migration - test fixture - 7.22.0</name>
+
+  <properties>
+    <!-- delete when 7.22 is released -->
+    <camunda.version.current>${project.version}</camunda.version.current>
+    <camunda.version.previous>7.21.0</camunda.version.previous>
+  </properties>
+
+  <!-- uncomment when 7.22 is released -->
+<!--   <dependencyManagement> -->
+<!--     <dependencies> -->
+<!--       <dependency> -->
+<!--         <groupId>org.camunda.bpm</groupId> -->
+<!--         <artifactId>camunda-bom</artifactId> -->
+<!--         <version>7.22.0</version> -->
+<!--         <scope>import</scope> -->
+<!--         <type>pom</type> -->
+<!--       </dependency> -->
+<!--     </dependencies> -->
+<!--   </dependencyManagement> -->
+
+  <dependencies>
+    <dependency>
+      <groupId>org.camunda.bpm</groupId>
+      <artifactId>camunda-engine</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.camunda.spin</groupId>
+      <artifactId>camunda-spin-dataformat-json-jackson</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.camunda.bpm</groupId>
+      <artifactId>camunda-engine-plugin-spin</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.camunda.bpm.qa.upgrade</groupId>
+      <artifactId>camunda-qa-upgrade-scenario-util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>instance-migration</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>update-db</id>
+                <phase>generate-test-resources</phase>
+                <goals>
+                  <goal>update</goal>
+                </goals>
+                <configuration>
+                  <changeLogFile>camunda-changelog.xml</changeLogFile>
+                  <changeLogDirectory>${project.build.directory}/scripts-current/sql/liquibase/</changeLogDirectory>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- provide sql scripts -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-current-sql-scripts</id>
+                <phase>generate-test-sources</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.camunda.bpm.distro</groupId>
+                      <artifactId>camunda-sql-scripts</artifactId>
+                      <!-- Replace after 7.22.0 release -->
+                      <version>${camunda.version.current}</version>
+                      <!--<version>7.22.0</version>-->
+                      <type>test-jar</type>
+                      <outputDirectory>${project.build.directory}/scripts-current</outputDirectory>
+                      <overWrite>true</overWrite>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- uncomment when 7.22 is released -->
+          <!--<plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <configuration>
+              <cleanupDaemonThreads>false</cleanupDaemonThreads>
+              <includeProjectDependencies>true</includeProjectDependencies>
+              <includePluginDependencies>false</includePluginDependencies>
+              <classpathScope>test</classpathScope>
+            </configuration>
+            <executions>
+              <execution>
+                <id>create-test-fixture</id>
+                <goals>
+                  <goal>java</goal>
+                </goals>
+                <phase>process-test-classes</phase>
+                <configuration>
+                  <mainClass>org.camunda.bpm.qa.upgrade.TestFixture</mainClass>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>-->
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/qa/test-db-instance-migration/test-fixture-722/src/main/java/org/camunda/bpm/qa/upgrade/TestFixture.java b/qa/test-db-instance-migration/test-fixture-722/src/main/java/org/camunda/bpm/qa/upgrade/TestFixture.java
new file mode 100644
index 00000000000..cd7c099e416
--- /dev/null
+++ b/qa/test-db-instance-migration/test-fixture-722/src/main/java/org/camunda/bpm/qa/upgrade/TestFixture.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package org.camunda.bpm.qa.upgrade;
+
+import org.camunda.bpm.engine.ProcessEngine;
+import org.camunda.bpm.engine.ProcessEngineConfiguration;
+import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
+
+public class TestFixture {
+
+  public static final String ENGINE_VERSION = "7.22.0";
+
+  public TestFixture(ProcessEngine processEngine) {
+  }
+
+  public static void main(String... args) {
+    ProcessEngineConfigurationImpl processEngineConfiguration = (ProcessEngineConfigurationImpl) ProcessEngineConfiguration
+      .createProcessEngineConfigurationFromResource("camunda.cfg.xml");
+    ProcessEngine processEngine = processEngineConfiguration.buildProcessEngine();
+
+    // register test scenarios
+    ScenarioRunner runner = new ScenarioRunner(processEngine, ENGINE_VERSION);
+
+    // example scenario setup
+    // runner.setupScenarios(ExampleScenario.class);
+
+    processEngine.close();
+  }
+}
diff --git a/qa/test-db-instance-migration/test-fixture-722/src/main/resources/camunda.cfg.xml b/qa/test-db-instance-migration/test-fixture-722/src/main/resources/camunda.cfg.xml
new file mode 100644
index 00000000000..0964abfcfcd
--- /dev/null
+++ b/qa/test-db-instance-migration/test-fixture-722/src/main/resources/camunda.cfg.xml
@@ -0,0 +1,35 @@
+<?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="processEngineConfiguration" class="org.camunda.bpm.engine.impl.cfg.StandaloneInMemProcessEngineConfiguration">
+
+    <property name="jdbcUrl" value="${database.url}" />
+    <property name="jdbcDriver" value="${database.driver}" />
+    <property name="jdbcUsername" value="${database.username}" />
+    <property name="jdbcPassword" value="${database.password}" />
+
+    <!-- Database configurations -->
+    <property name="databaseSchemaUpdate" value="false" />
+
+    <!-- job executor configurations -->
+    <property name="jobExecutorActivate" value="false" />
+
+    <!-- mail server configurations -->
+    <property name="mailServerPort" value="${mail.server.port}" />
+    <property name="history" value="full" />
+
+    <!-- turn off metrics reporter -->
+    <property name="dbMetricsReporterActivate" value="false" />
+    <property name="telemetryReporterActivate" value="false" />
+    <property name="taskMetricsEnabled" value="false" />
+
+    <property name="defaultSerializationFormat" value="application/json"/>
+
+    <property name="jdbcBatchProcessing" value="${jdbcBatchProcessing}"/>
+
+  </bean>
+
+</beans>
diff --git a/qa/test-db-rolling-update/create-new-engine/pom.xml b/qa/test-db-rolling-update/create-new-engine/pom.xml
index d6afd09c105..56ad472057a 100644
--- a/qa/test-db-rolling-update/create-new-engine/pom.xml
+++ b/qa/test-db-rolling-update/create-new-engine/pom.xml
@@ -13,7 +13,7 @@
 
   <properties>
     <camunda.version.current>${project.version}</camunda.version.current>
-    <camunda.version.previous>7.20.0</camunda.version.previous>
+    <camunda.version.previous>7.21.0</camunda.version.previous>
   </properties>
 
   <dependencies>
diff --git a/qa/test-db-rolling-update/create-old-engine/pom.xml b/qa/test-db-rolling-update/create-old-engine/pom.xml
index 723063f48c6..d35b99b6dec 100644
--- a/qa/test-db-rolling-update/create-old-engine/pom.xml
+++ b/qa/test-db-rolling-update/create-old-engine/pom.xml
@@ -16,7 +16,7 @@
       <dependency>
         <groupId>org.camunda.bpm</groupId>
         <artifactId>camunda-bom</artifactId>
-        <version>7.20.0</version>
+        <version>7.21.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/qa/test-db-rolling-update/rolling-update-util/pom.xml b/qa/test-db-rolling-update/rolling-update-util/pom.xml
index 1698fb03762..560b45d780f 100644
--- a/qa/test-db-rolling-update/rolling-update-util/pom.xml
+++ b/qa/test-db-rolling-update/rolling-update-util/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
         <groupId>org.camunda.bpm</groupId>
         <artifactId>camunda-bom</artifactId>
-        <version>7.20.0</version>
+        <version>7.21.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/qa/test-db-rolling-update/test-old-engine/pom.xml b/qa/test-db-rolling-update/test-old-engine/pom.xml
index d16937a3a0d..1430fdb2109 100644
--- a/qa/test-db-rolling-update/test-old-engine/pom.xml
+++ b/qa/test-db-rolling-update/test-old-engine/pom.xml
@@ -17,7 +17,7 @@
       <dependency>
         <groupId>org.camunda.bpm</groupId>
         <artifactId>camunda-bom</artifactId>
-        <version>7.20.0</version>
+        <version>7.21.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/qa/test-old-engine/pom.xml b/qa/test-old-engine/pom.xml
index cfb04e65981..91a5167eb3f 100755
--- a/qa/test-old-engine/pom.xml
+++ b/qa/test-old-engine/pom.xml
@@ -12,7 +12,7 @@
   <name>Camunda Platform - QA - test new schema with old engine</name>
 
   <properties>
-    <camunda.old.engine.version>7.20.0</camunda.old.engine.version>
+    <camunda.old.engine.version>7.21.0</camunda.old.engine.version>
   </properties>
 
   <build>
@@ -99,7 +99,7 @@
             <groupId>org.camunda.bpm</groupId>
             <artifactId>camunda-bom</artifactId>
             <!-- Cannot use variables due to bug in Maven Release Plugin -->
-            <version>7.20.0</version>
+            <version>7.21.0</version>
             <scope>import</scope>
             <type>pom</type>
           </dependency>
@@ -259,6 +259,13 @@
           <artifactId>geronimo-jta_1.1_spec</artifactId>
           <scope>test</scope>
         </dependency>
+
+        <dependency>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-vfs</artifactId>
+          <version>3.1.0.Final</version>
+          <scope>test</scope>
+        </dependency>
       </dependencies>
 
       <build>