diff --git a/plugins/GrapesJsBuilderBundle/package-lock.json b/plugins/GrapesJsBuilderBundle/package-lock.json
index 68e30d98017..1d9ee54d525 100644
--- a/plugins/GrapesJsBuilderBundle/package-lock.json
+++ b/plugins/GrapesJsBuilderBundle/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "grapesjs": "^0.17.29",
+        "grapesjs": "^0.22.1",
         "grapesjs-mjml": "^0.5.8",
         "grapesjs-parser-postcss": "^0.1.1",
         "grapesjs-plugin-ckeditor": "^0.0.10",
@@ -1849,6 +1849,25 @@
         "node": ">= 6.0.0"
       }
     },
+    "node_modules/@types/backbone": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@types/backbone/-/backbone-1.4.15.tgz",
+      "integrity": "sha512-WWeKtYlsIMtDyLbbhkb96taJMEbfQBnuz7yw1u0pkphCOtksemoWhIXhK74VRCY9hbjnsH3rsJu2uUiFtnsEYg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/jquery": "*",
+        "@types/underscore": "*"
+      }
+    },
+    "node_modules/@types/jquery": {
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz",
+      "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/sizzle": "*"
+      }
+    },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -1861,6 +1880,18 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
+      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
+      "license": "MIT"
+    },
+    "node_modules/@types/underscore": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.13.0.tgz",
+      "integrity": "sha512-L6LBgy1f0EFQZ+7uSA57+n2g/s4Qs5r06Vwrwn0/nuK1de+adz00NWaztRQ30aEqw5qOaWbPI8u2cGQ52lj6VA==",
+      "license": "MIT"
+    },
     "node_modules/abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -2389,35 +2420,25 @@
       }
     },
     "node_modules/backbone": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz",
-      "integrity": "sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.1.tgz",
+      "integrity": "sha512-ADy1ztN074YkWbHi8ojJVFe3vAanO/lrzMGZWUClIP7oDD/Pjy2vrASraUP+2EVCfIiTtCW4FChVow01XneivA==",
+      "license": "MIT",
       "dependencies": {
         "underscore": ">=1.8.3"
       }
     },
     "node_modules/backbone-undo": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/backbone-undo/-/backbone-undo-0.2.5.tgz",
-      "integrity": "sha1-VbJSMPkDGcpiJGXomoAki4k8LOI=",
-      "dependencies": {
-        "backbone": "1.0.0 - 1.2.1",
-        "underscore": "1.4.4 - 1.8.3"
-      }
-    },
-    "node_modules/backbone-undo/node_modules/backbone": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.2.1.tgz",
-      "integrity": "sha1-1yGcXtSeXhMdv/ryXJbW0sw8oD4=",
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/backbone-undo/-/backbone-undo-0.2.6.tgz",
+      "integrity": "sha512-AsfpNiljLXlk7TcffDUu3EAUq7CxWbyTNwARWrql5XTzN4vh6WzEEBZYaKK4kTTz+iW1tSzqUooaGRIwO83kWA==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "license": "MIT",
       "dependencies": {
-        "underscore": ">=1.7.0"
+        "backbone": ">=1.0.0",
+        "underscore": ">=1.4.4"
       }
     },
-    "node_modules/backbone-undo/node_modules/underscore": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -3281,9 +3302,10 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "5.65.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.0.tgz",
-      "integrity": "sha512-gWEnHKEcz1Hyz7fsQWpK7P0sPI2/kSkRX2tc7DFA6TmZuDN75x/1ejnH/Pn8adYKrLEA1V2ww6L00GudHZbSKw=="
+      "version": "5.63.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.0.tgz",
+      "integrity": "sha512-KlLWRPggDg2rBD1Mx7/EqEhaBdy+ybBCVh/efgjBDsPpMeEu6MbTAJzIT4TuCzvmbTEgvKOGzVT6wdBTNusqrg==",
+      "license": "MIT"
     },
     "node_modules/codemirror-formatting": {
       "version": "1.0.0",
@@ -5724,17 +5746,19 @@
       "dev": true
     },
     "node_modules/grapesjs": {
-      "version": "0.17.29",
-      "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.17.29.tgz",
-      "integrity": "sha512-yZdjLCHGBrYUH8SQcZGbEM7nzgJpFpKqnIk7sP3/nhuuoKGF2kiFeeIT5fmP1ZMINT+Es7sbTQF0PIKVrx/+lg==",
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.22.1.tgz",
+      "integrity": "sha512-s45IC11cQZKvNc7ySjO5RN/CYkMFLzr3hYZI+JOWreK9vY1BMhKBLQpix4629j2kZOEc2w8LNNe0qKwsh3W2uA==",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "backbone": "1.3.3",
-        "backbone-undo": "^0.2.5",
-        "codemirror": "^5.63.0",
-        "codemirror-formatting": "^1.0.0",
-        "promise-polyfill": "^8.1.3",
-        "spectrum-colorpicker": "^1.8.0",
-        "underscore": "^1.13.1"
+        "@types/backbone": "1.4.15",
+        "backbone": "1.4.1",
+        "backbone-undo": "0.2.6",
+        "codemirror": "5.63.0",
+        "codemirror-formatting": "1.0.0",
+        "html-entities": "~1.4.0",
+        "promise-polyfill": "8.3.0",
+        "underscore": "1.13.1"
       }
     },
     "node_modules/grapesjs-aviary": {
@@ -6107,6 +6131,12 @@
         "whatwg-encoding": "^1.0.1"
       }
     },
+    "node_modules/html-entities": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
+      "license": "MIT"
+    },
     "node_modules/html-minifier": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
@@ -10006,9 +10036,10 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "node_modules/promise-polyfill": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.0.tgz",
-      "integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g=="
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz",
+      "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==",
+      "license": "MIT"
     },
     "node_modules/prop-types": {
       "version": "15.8.1",
@@ -11030,11 +11061,6 @@
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
-    "node_modules/spectrum-colorpicker": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/spectrum-colorpicker/-/spectrum-colorpicker-1.8.1.tgz",
-      "integrity": "sha512-x1picQ5giVso71ESII7jZ3+ZFdit8WthNkzwJqLNdPDPzrltKUQGpTohWyPfSAID+bK1zGdO6bDbSh1S6GoLYA=="
-    },
     "node_modules/split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -11937,7 +11963,8 @@
     "node_modules/underscore": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
+      "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
@@ -13978,6 +14005,23 @@
         "physical-cpu-count": "^2.0.0"
       }
     },
+    "@types/backbone": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@types/backbone/-/backbone-1.4.15.tgz",
+      "integrity": "sha512-WWeKtYlsIMtDyLbbhkb96taJMEbfQBnuz7yw1u0pkphCOtksemoWhIXhK74VRCY9hbjnsH3rsJu2uUiFtnsEYg==",
+      "requires": {
+        "@types/jquery": "*",
+        "@types/underscore": "*"
+      }
+    },
+    "@types/jquery": {
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz",
+      "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==",
+      "requires": {
+        "@types/sizzle": "*"
+      }
+    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -13990,6 +14034,16 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
+    "@types/sizzle": {
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
+      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w=="
+    },
+    "@types/underscore": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.13.0.tgz",
+      "integrity": "sha512-L6LBgy1f0EFQZ+7uSA57+n2g/s4Qs5r06Vwrwn0/nuK1de+adz00NWaztRQ30aEqw5qOaWbPI8u2cGQ52lj6VA=="
+    },
     "abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -14420,35 +14474,20 @@
       }
     },
     "backbone": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz",
-      "integrity": "sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.1.tgz",
+      "integrity": "sha512-ADy1ztN074YkWbHi8ojJVFe3vAanO/lrzMGZWUClIP7oDD/Pjy2vrASraUP+2EVCfIiTtCW4FChVow01XneivA==",
       "requires": {
         "underscore": ">=1.8.3"
       }
     },
     "backbone-undo": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/backbone-undo/-/backbone-undo-0.2.5.tgz",
-      "integrity": "sha1-VbJSMPkDGcpiJGXomoAki4k8LOI=",
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/backbone-undo/-/backbone-undo-0.2.6.tgz",
+      "integrity": "sha512-AsfpNiljLXlk7TcffDUu3EAUq7CxWbyTNwARWrql5XTzN4vh6WzEEBZYaKK4kTTz+iW1tSzqUooaGRIwO83kWA==",
       "requires": {
-        "backbone": "1.0.0 - 1.2.1",
-        "underscore": "1.4.4 - 1.8.3"
-      },
-      "dependencies": {
-        "backbone": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.2.1.tgz",
-          "integrity": "sha1-1yGcXtSeXhMdv/ryXJbW0sw8oD4=",
-          "requires": {
-            "underscore": ">=1.7.0"
-          }
-        },
-        "underscore": {
-          "version": "1.8.3",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-          "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
-        }
+        "backbone": ">=1.0.0",
+        "underscore": ">=1.4.4"
       }
     },
     "balanced-match": {
@@ -15138,9 +15177,9 @@
       }
     },
     "codemirror": {
-      "version": "5.65.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.0.tgz",
-      "integrity": "sha512-gWEnHKEcz1Hyz7fsQWpK7P0sPI2/kSkRX2tc7DFA6TmZuDN75x/1ejnH/Pn8adYKrLEA1V2ww6L00GudHZbSKw=="
+      "version": "5.63.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.0.tgz",
+      "integrity": "sha512-KlLWRPggDg2rBD1Mx7/EqEhaBdy+ybBCVh/efgjBDsPpMeEu6MbTAJzIT4TuCzvmbTEgvKOGzVT6wdBTNusqrg=="
     },
     "codemirror-formatting": {
       "version": "1.0.0",
@@ -17095,17 +17134,18 @@
       "dev": true
     },
     "grapesjs": {
-      "version": "0.17.29",
-      "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.17.29.tgz",
-      "integrity": "sha512-yZdjLCHGBrYUH8SQcZGbEM7nzgJpFpKqnIk7sP3/nhuuoKGF2kiFeeIT5fmP1ZMINT+Es7sbTQF0PIKVrx/+lg==",
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.22.1.tgz",
+      "integrity": "sha512-s45IC11cQZKvNc7ySjO5RN/CYkMFLzr3hYZI+JOWreK9vY1BMhKBLQpix4629j2kZOEc2w8LNNe0qKwsh3W2uA==",
       "requires": {
-        "backbone": "1.3.3",
-        "backbone-undo": "^0.2.5",
-        "codemirror": "^5.63.0",
-        "codemirror-formatting": "^1.0.0",
-        "promise-polyfill": "^8.1.3",
-        "spectrum-colorpicker": "^1.8.0",
-        "underscore": "^1.13.1"
+        "@types/backbone": "1.4.15",
+        "backbone": "1.4.1",
+        "backbone-undo": "0.2.6",
+        "codemirror": "5.63.0",
+        "codemirror-formatting": "1.0.0",
+        "html-entities": "~1.4.0",
+        "promise-polyfill": "8.3.0",
+        "underscore": "1.13.1"
       }
     },
     "grapesjs-aviary": {
@@ -17396,6 +17436,11 @@
         "whatwg-encoding": "^1.0.1"
       }
     },
+    "html-entities": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="
+    },
     "html-minifier": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
@@ -20540,9 +20585,9 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "promise-polyfill": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.2.0.tgz",
-      "integrity": "sha512-k/TC0mIcPVF6yHhUvwAp7cvL6I2fFV7TzF1DuGPI8mBh4QQazf36xCKEHKTZKRysEoTQoQdKyP25J8MPJp7j5g=="
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz",
+      "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg=="
     },
     "prop-types": {
       "version": "15.8.1",
@@ -21385,11 +21430,6 @@
       "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
       "dev": true
     },
-    "spectrum-colorpicker": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/spectrum-colorpicker/-/spectrum-colorpicker-1.8.1.tgz",
-      "integrity": "sha512-x1picQ5giVso71ESII7jZ3+ZFdit8WthNkzwJqLNdPDPzrltKUQGpTohWyPfSAID+bK1zGdO6bDbSh1S6GoLYA=="
-    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
diff --git a/plugins/GrapesJsBuilderBundle/package.json b/plugins/GrapesJsBuilderBundle/package.json
index 50df33a0213..cb44756db6c 100644
--- a/plugins/GrapesJsBuilderBundle/package.json
+++ b/plugins/GrapesJsBuilderBundle/package.json
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/mautic/plugin-grapesjs-builder#readme",
   "dependencies": {
-    "grapesjs": "^0.17.29",
+    "grapesjs": "^0.22.1",
     "grapesjs-mjml": "^0.5.8",
     "grapesjs-parser-postcss": "^0.1.1",
     "grapesjs-plugin-ckeditor": "^0.0.10",