diff --git a/client/package.json b/client/package.json
index 598237977a..914280acd2 100644
--- a/client/package.json
+++ b/client/package.json
@@ -75,7 +75,7 @@
     "@babel/preset-react": "^7.0.0",
     "@sentry/webpack-plugin": "^2.4.0",
     "babel-loader": "^8.0.5",
-    "babel-plugin-istanbul": "^5.1.3",
+    "babel-plugin-istanbul": "^6.0.0",
     "bpmnlint-loader": "^0.1.6",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "chai": "^4.2.0",
diff --git a/package-lock.json b/package-lock.json
index e684cc3570..b6f87037f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -191,7 +191,7 @@
         "@babel/preset-react": "^7.0.0",
         "@sentry/webpack-plugin": "^2.4.0",
         "babel-loader": "^8.0.5",
-        "babel-plugin-istanbul": "^5.1.3",
+        "babel-plugin-istanbul": "^6.0.0",
         "bpmnlint-loader": "^0.1.6",
         "case-sensitive-paths-webpack-plugin": "^2.1.2",
         "chai": "^4.2.0",
@@ -332,53 +332,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "client/node_modules/babel-plugin-istanbul": {
-      "version": "5.1.3",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "find-up": "^3.0.0",
-        "istanbul-lib-instrument": "^3.2.0",
-        "test-exclude": "^5.2.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "client/node_modules/babel-plugin-istanbul/node_modules/find-up": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "client/node_modules/babel-plugin-istanbul/node_modules/locate-path": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "client/node_modules/babel-plugin-istanbul/node_modules/p-locate": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "client/node_modules/braces": {
       "version": "3.0.2",
       "dev": true,
@@ -1042,39 +995,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "client/node_modules/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "client/node_modules/istanbul-lib-instrument": {
-      "version": "3.2.0",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/generator": "^7.0.0",
-        "@babel/parser": "^7.0.0",
-        "@babel/template": "^7.0.0",
-        "@babel/traverse": "^7.0.0",
-        "@babel/types": "^7.0.0",
-        "istanbul-lib-coverage": "^2.0.4",
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "client/node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "client/node_modules/klona": {
       "version": "2.0.5",
       "dev": true,
@@ -1274,20 +1194,6 @@
         "node": ">=8"
       }
     },
-    "client/node_modules/p-limit": {
-      "version": "2.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "client/node_modules/p-series": {
       "version": "2.1.0",
       "license": "MIT",
@@ -1312,14 +1218,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "client/node_modules/path-exists": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "client/node_modules/postcss-modules-extract-imports": {
       "version": "3.0.0",
       "dev": true,
@@ -1464,52 +1362,6 @@
         "react": "^16.0.0"
       }
     },
-    "client/node_modules/read-pkg-up": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^3.0.0",
-        "read-pkg": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "client/node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "client/node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "client/node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "client/node_modules/reflect.ownkeys": {
       "version": "0.2.0",
       "dev": true,
@@ -1626,20 +1478,6 @@
         "node": ">=8"
       }
     },
-    "client/node_modules/test-exclude": {
-      "version": "5.2.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
-        "read-pkg-up": "^4.0.0",
-        "require-main-filename": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "client/node_modules/tiny-warning": {
       "version": "1.0.3",
       "license": "MIT"
@@ -9675,6 +9513,38 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/babel-plugin-polyfill-corejs2": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz",
@@ -35906,6 +35776,34 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-instrument": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+          "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/parser": "^7.14.7",
+            "@istanbuljs/schema": "^0.1.2",
+            "istanbul-lib-coverage": "^3.2.0",
+            "semver": "^6.3.0"
+          }
+        }
+      }
+    },
     "babel-plugin-polyfill-corejs2": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz",
@@ -36936,7 +36834,7 @@
         "@sentry/browser": "^7.57.0",
         "@sentry/webpack-plugin": "^2.4.0",
         "babel-loader": "^8.0.5",
-        "babel-plugin-istanbul": "^5.1.3",
+        "babel-plugin-istanbul": "^6.0.0",
         "bpmn-js": "^13.2.1",
         "bpmn-js-element-templates": "^1.2.2",
         "bpmn-js-properties-panel": "^4.0.2",
@@ -37089,39 +36987,6 @@
             }
           }
         },
-        "babel-plugin-istanbul": {
-          "version": "5.1.3",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0",
-            "istanbul-lib-instrument": "^3.2.0",
-            "test-exclude": "^5.2.2"
-          },
-          "dependencies": {
-            "find-up": {
-              "version": "3.0.0",
-              "dev": true,
-              "requires": {
-                "locate-path": "^3.0.0"
-              }
-            },
-            "locate-path": {
-              "version": "3.0.0",
-              "dev": true,
-              "requires": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
-              }
-            },
-            "p-locate": {
-              "version": "3.0.0",
-              "dev": true,
-              "requires": {
-                "p-limit": "^2.0.0"
-              }
-            }
-          }
-        },
         "braces": {
           "version": "3.0.2",
           "dev": true,
@@ -37561,29 +37426,6 @@
           "version": "3.14.1",
           "dev": true
         },
-        "istanbul-lib-coverage": {
-          "version": "2.0.4",
-          "dev": true
-        },
-        "istanbul-lib-instrument": {
-          "version": "3.2.0",
-          "dev": true,
-          "requires": {
-            "@babel/generator": "^7.0.0",
-            "@babel/parser": "^7.0.0",
-            "@babel/template": "^7.0.0",
-            "@babel/traverse": "^7.0.0",
-            "@babel/types": "^7.0.0",
-            "istanbul-lib-coverage": "^2.0.4",
-            "semver": "^6.0.0"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "6.0.0",
-              "dev": true
-            }
-          }
-        },
         "klona": {
           "version": "2.0.5",
           "dev": true
@@ -37719,13 +37561,6 @@
         "p-defer": {
           "version": "3.0.0"
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-series": {
           "version": "2.1.0",
           "requires": {
@@ -37746,10 +37581,6 @@
             }
           }
         },
-        "path-exists": {
-          "version": "3.0.0",
-          "dev": true
-        },
         "postcss-modules-extract-imports": {
           "version": "3.0.0",
           "dev": true,
@@ -37843,38 +37674,6 @@
             "scheduler": "^0.13.6"
           }
         },
-        "read-pkg-up": {
-          "version": "4.0.0",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0",
-            "read-pkg": "^3.0.0"
-          },
-          "dependencies": {
-            "find-up": {
-              "version": "3.0.0",
-              "dev": true,
-              "requires": {
-                "locate-path": "^3.0.0"
-              }
-            },
-            "locate-path": {
-              "version": "3.0.0",
-              "dev": true,
-              "requires": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
-              }
-            },
-            "p-locate": {
-              "version": "3.0.0",
-              "dev": true,
-              "requires": {
-                "p-limit": "^2.0.0"
-              }
-            }
-          }
-        },
         "reflect.ownkeys": {
           "version": "0.2.0",
           "dev": true
@@ -37950,16 +37749,6 @@
             "has-flag": "^4.0.0"
           }
         },
-        "test-exclude": {
-          "version": "5.2.2",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3",
-            "minimatch": "^3.0.4",
-            "read-pkg-up": "^4.0.0",
-            "require-main-filename": "^2.0.0"
-          }
-        },
         "tiny-warning": {
           "version": "1.0.3"
         },