diff --git a/client/package.json b/client/package.json
index d7af90d09..264b40c01 100644
--- a/client/package.json
+++ b/client/package.json
@@ -26,7 +26,7 @@
     "@ibm/plex": "^6.0.0",
     "@sentry/browser": "^6.3.6",
     "bpmn-js": "^13.0.0",
-    "bpmn-js-properties-panel": "^1.22.1",
+    "bpmn-js-properties-panel": "^2.0.0",
     "bpmn-js-tracking": "0.3.0",
     "bpmn-moddle": "^8.0.1",
     "camunda-bpmn-js": "^2.5.0",
diff --git a/package-lock.json b/package-lock.json
index 385d4a298..5404b6f5b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -221,7 +221,7 @@
         "@ibm/plex": "^6.0.0",
         "@sentry/browser": "^6.3.6",
         "bpmn-js": "^13.0.0",
-        "bpmn-js-properties-panel": "^1.22.1",
+        "bpmn-js-properties-panel": "^2.0.0",
         "bpmn-js-tracking": "0.3.0",
         "bpmn-moddle": "^8.0.1",
         "camunda-bpmn-js": "^2.5.0",
@@ -1125,18 +1125,6 @@
         "node": ">=4"
       }
     },
-    "client/node_modules/@bpmn-io/properties-panel": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-2.1.0.tgz",
-      "integrity": "sha512-W0oQG8eSK6CArtASWHhe0T9z8T4oqaSkWwWAa9ItsqvGls2jpzZxC6Ub6S/Xuncpu9QPEFfIwDyqoF25SsRneQ==",
-      "dependencies": {
-        "@bpmn-io/feel-editor": "^0.7.1",
-        "classnames": "^2.3.1",
-        "feelers": "^0.1.0-alpha.8",
-        "min-dash": "^4.0.0",
-        "min-dom": "^4.0.3"
-      }
-    },
     "client/node_modules/@camunda/form-playground": {
       "version": "0.7.0-alpha.1",
       "resolved": "https://registry.npmjs.org/@camunda/form-playground/-/form-playground-0.7.0-alpha.1.tgz",
@@ -3524,10 +3512,9 @@
       }
     },
     "node_modules/@bpmn-io/properties-panel": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-1.8.2.tgz",
-      "integrity": "sha512-U1QkCYV7mkEB1aXWaPADJETL1+zbf0KzMwfwHJOG3YnF+xL/EkvAYk5HF9/b+fHfs/FTl7xAPehX6gLHHyDUHg==",
-      "peer": true,
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-2.2.0.tgz",
+      "integrity": "sha512-sG12ghzcEai/bYCziG12MNklKtRVNdhgiE9059/8ZsYbThxChcpgscOTmUjwHCawByfz1UR1HjF4So9ssZS29w==",
       "dependencies": {
         "@bpmn-io/feel-editor": "^0.7.1",
         "classnames": "^2.3.1",
@@ -3539,20 +3526,17 @@
     "node_modules/@bpmn-io/properties-panel/node_modules/component-event": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/component-event/-/component-event-0.2.1.tgz",
-      "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw==",
-      "peer": true
+      "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw=="
     },
     "node_modules/@bpmn-io/properties-panel/node_modules/min-dash": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.1.1.tgz",
-      "integrity": "sha512-r+Z6vxXLSGr+otyCPx9NKPCSixw7LdfZREPTmqfd2a/d5D6w4NCdOxRJs+HyFO6v2pQkyHroGSiINWECK+OWPg==",
-      "peer": true
+      "integrity": "sha512-r+Z6vxXLSGr+otyCPx9NKPCSixw7LdfZREPTmqfd2a/d5D6w4NCdOxRJs+HyFO6v2pQkyHroGSiINWECK+OWPg=="
     },
     "node_modules/@bpmn-io/properties-panel/node_modules/min-dom": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.1.0.tgz",
       "integrity": "sha512-1lj1EyoSwY/UmTeT/hhPiZTsq+vK9D+8FAJ/53iK5jT1otkG9rJTixSKdjmTieEvdfES+sKbbTptzaQJhnacjA==",
-      "peer": true,
       "dependencies": {
         "component-event": "^0.2.1",
         "domify": "^1.4.1",
@@ -8958,9 +8942,9 @@
       }
     },
     "node_modules/bpmn-js-properties-panel": {
-      "version": "1.25.0",
-      "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-1.25.0.tgz",
-      "integrity": "sha512-sahhmiWi1WHMxdtJcJ4ToV+hP34CTPEzzWP0qQRFx2GbcKn0nYTbshDL3D9ZUhbjbtM79suPvb84+9R8R78EKg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-2.0.0.tgz",
+      "integrity": "sha512-Son92BKzoLhRZ7BpP5pbVk/OAd+VtuOWLqt9+1rZA72oiRGy0t/N3coLaw3uLRdKg5331BG0Y40RltL8hcwfww==",
       "dependencies": {
         "@bpmn-io/element-templates-validator": "^0.14.0",
         "@bpmn-io/extract-process-variables": "^0.8.0",
@@ -8974,28 +8958,36 @@
         "uuid": "^9.0.0"
       },
       "peerDependencies": {
-        "@bpmn-io/properties-panel": "^1.0.1 || ^2.0.0",
+        "@bpmn-io/properties-panel": ">= 2.2",
         "bpmn-js": ">= 11.5",
         "camunda-bpmn-js-behaviors": ">= 0.4",
         "diagram-js": ">= 11.9"
       }
     },
+    "node_modules/bpmn-js-properties-panel/node_modules/component-event": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/component-event/-/component-event-0.2.1.tgz",
+      "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw=="
+    },
     "node_modules/bpmn-js-properties-panel/node_modules/min-dash": {
-      "version": "4.0.0",
-      "license": "MIT"
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.1.1.tgz",
+      "integrity": "sha512-r+Z6vxXLSGr+otyCPx9NKPCSixw7LdfZREPTmqfd2a/d5D6w4NCdOxRJs+HyFO6v2pQkyHroGSiINWECK+OWPg=="
     },
     "node_modules/bpmn-js-properties-panel/node_modules/min-dom": {
-      "version": "4.0.3",
-      "license": "MIT",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.1.0.tgz",
+      "integrity": "sha512-1lj1EyoSwY/UmTeT/hhPiZTsq+vK9D+8FAJ/53iK5jT1otkG9rJTixSKdjmTieEvdfES+sKbbTptzaQJhnacjA==",
       "dependencies": {
-        "component-event": "^0.1.4",
+        "component-event": "^0.2.1",
         "domify": "^1.4.1",
         "min-dash": "^4.0.0"
       }
     },
     "node_modules/bpmn-js-properties-panel/node_modules/uuid": {
       "version": "9.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -28981,10 +28973,9 @@
       }
     },
     "@bpmn-io/properties-panel": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-1.8.2.tgz",
-      "integrity": "sha512-U1QkCYV7mkEB1aXWaPADJETL1+zbf0KzMwfwHJOG3YnF+xL/EkvAYk5HF9/b+fHfs/FTl7xAPehX6gLHHyDUHg==",
-      "peer": true,
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-2.2.0.tgz",
+      "integrity": "sha512-sG12ghzcEai/bYCziG12MNklKtRVNdhgiE9059/8ZsYbThxChcpgscOTmUjwHCawByfz1UR1HjF4So9ssZS29w==",
       "requires": {
         "@bpmn-io/feel-editor": "^0.7.1",
         "classnames": "^2.3.1",
@@ -28996,20 +28987,17 @@
         "component-event": {
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/component-event/-/component-event-0.2.1.tgz",
-          "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw==",
-          "peer": true
+          "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw=="
         },
         "min-dash": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.1.1.tgz",
-          "integrity": "sha512-r+Z6vxXLSGr+otyCPx9NKPCSixw7LdfZREPTmqfd2a/d5D6w4NCdOxRJs+HyFO6v2pQkyHroGSiINWECK+OWPg==",
-          "peer": true
+          "integrity": "sha512-r+Z6vxXLSGr+otyCPx9NKPCSixw7LdfZREPTmqfd2a/d5D6w4NCdOxRJs+HyFO6v2pQkyHroGSiINWECK+OWPg=="
         },
         "min-dom": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.1.0.tgz",
           "integrity": "sha512-1lj1EyoSwY/UmTeT/hhPiZTsq+vK9D+8FAJ/53iK5jT1otkG9rJTixSKdjmTieEvdfES+sKbbTptzaQJhnacjA==",
-          "peer": true,
           "requires": {
             "component-event": "^0.2.1",
             "domify": "^1.4.1",
@@ -32826,9 +32814,9 @@
       "requires": {}
     },
     "bpmn-js-properties-panel": {
-      "version": "1.25.0",
-      "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-1.25.0.tgz",
-      "integrity": "sha512-sahhmiWi1WHMxdtJcJ4ToV+hP34CTPEzzWP0qQRFx2GbcKn0nYTbshDL3D9ZUhbjbtM79suPvb84+9R8R78EKg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-2.0.0.tgz",
+      "integrity": "sha512-Son92BKzoLhRZ7BpP5pbVk/OAd+VtuOWLqt9+1rZA72oiRGy0t/N3coLaw3uLRdKg5331BG0Y40RltL8hcwfww==",
       "requires": {
         "@bpmn-io/element-templates-validator": "^0.14.0",
         "@bpmn-io/extract-process-variables": "^0.8.0",
@@ -32842,19 +32830,30 @@
         "uuid": "^9.0.0"
       },
       "dependencies": {
+        "component-event": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/component-event/-/component-event-0.2.1.tgz",
+          "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw=="
+        },
         "min-dash": {
-          "version": "4.0.0"
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.1.1.tgz",
+          "integrity": "sha512-r+Z6vxXLSGr+otyCPx9NKPCSixw7LdfZREPTmqfd2a/d5D6w4NCdOxRJs+HyFO6v2pQkyHroGSiINWECK+OWPg=="
         },
         "min-dom": {
-          "version": "4.0.3",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.1.0.tgz",
+          "integrity": "sha512-1lj1EyoSwY/UmTeT/hhPiZTsq+vK9D+8FAJ/53iK5jT1otkG9rJTixSKdjmTieEvdfES+sKbbTptzaQJhnacjA==",
           "requires": {
-            "component-event": "^0.1.4",
+            "component-event": "^0.2.1",
             "domify": "^1.4.1",
             "min-dash": "^4.0.0"
           }
         },
         "uuid": {
-          "version": "9.0.0"
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+          "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
         }
       }
     },
@@ -33397,7 +33396,7 @@
         "babel-loader": "^8.0.5",
         "babel-plugin-istanbul": "^5.1.3",
         "bpmn-js": "^13.0.0",
-        "bpmn-js-properties-panel": "^1.22.1",
+        "bpmn-js-properties-panel": "^2.0.0",
         "bpmn-js-tracking": "0.3.0",
         "bpmn-moddle": "^8.0.1",
         "bpmnlint-loader": "^0.1.6",
@@ -34076,18 +34075,6 @@
             "showdown": "^2.1.0"
           }
         },
-        "@bpmn-io/properties-panel": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/@bpmn-io/properties-panel/-/properties-panel-2.1.0.tgz",
-          "integrity": "sha512-W0oQG8eSK6CArtASWHhe0T9z8T4oqaSkWwWAa9ItsqvGls2jpzZxC6Ub6S/Xuncpu9QPEFfIwDyqoF25SsRneQ==",
-          "requires": {
-            "@bpmn-io/feel-editor": "^0.7.1",
-            "classnames": "^2.3.1",
-            "feelers": "^0.1.0-alpha.8",
-            "min-dash": "^4.0.0",
-            "min-dom": "^4.0.3"
-          }
-        },
         "@camunda/form-playground": {
           "version": "0.7.0-alpha.1",
           "resolved": "https://registry.npmjs.org/@camunda/form-playground/-/form-playground-0.7.0-alpha.1.tgz",