diff --git a/ext/flowable/flowable-bpmn/pom.xml b/ext/flowable/flowable-bpmn/pom.xml
index e2ee2b6399..fde73ab307 100644
--- a/ext/flowable/flowable-bpmn/pom.xml
+++ b/ext/flowable/flowable-bpmn/pom.xml
@@ -56,7 +56,7 @@ under the License.
       <artifactId>flowable-idm-spring-configurator</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.flowable</groupId>
+      <groupId>net.tirasa.flowable-leftovers</groupId>
       <artifactId>flowable-json-converter</artifactId>
     </dependency>
 
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareJsonConverter.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareJsonConverter.java
index ad29e17acc..6cd4e257f6 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareJsonConverter.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareJsonConverter.java
@@ -25,7 +25,7 @@
 public class DropdownAwareJsonConverter extends BpmnJsonConverter {
 
     public DropdownAwareJsonConverter() {
-        convertersToBpmnMap.put(StencilConstants.STENCIL_TASK_USER, DropdownAwareUserTaskJsonConverter.class);
-        convertersToJsonMap.put(UserTask.class, DropdownAwareUserTaskJsonConverter.class);
+        BPMN_CONVERTERS.put(StencilConstants.STENCIL_TASK_USER, DropdownAwareUserTaskJsonConverter.class);
+        JSON_CONVERTERS.put(UserTask.class, DropdownAwareUserTaskJsonConverter.class);
     }
 }
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareUserTaskJsonConverter.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareUserTaskJsonConverter.java
index 838201ccbc..c4f9853e1b 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareUserTaskJsonConverter.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DropdownAwareUserTaskJsonConverter.java
@@ -18,6 +18,8 @@
  */
 package org.apache.syncope.core.flowable.support;
 
+import static org.flowable.editor.language.json.converter.util.JsonConverterUtil.getProperty;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/pom.xml b/pom.xml
index d7ab4281a4..5ec7bf055f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,7 +420,7 @@ under the License.
 
     <jasypt.version>1.9.3</jasypt.version>
 
-    <flowable.version>7.0.0.M1</flowable.version>
+    <flowable.version>7.0.0.M2</flowable.version>
     <flowable-old.version>6.8.0</flowable-old.version>
 
     <disruptor.version>3.4.4</disruptor.version>
@@ -926,12 +926,12 @@ under the License.
         <artifactId>flowable-idm-spring-configurator</artifactId>
         <version>${flowable.version}</version>
       </dependency>
-      <!-- TODO: SYNCOPE-1718 -->
       <dependency>
-        <groupId>org.flowable</groupId>
+        <groupId>net.tirasa.flowable-leftovers</groupId>
         <artifactId>flowable-json-converter</artifactId>
-        <version>${flowable-old.version}</version>
+        <version>${flowable.version}</version>
       </dependency>
+      <!-- TODO: SYNCOPE-1718 -->
       <dependency>
         <groupId>org.flowable</groupId>
         <artifactId>flowable-ui-modeler-frontend</artifactId>
@@ -1077,7 +1077,7 @@ under the License.
       <dependency>
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>pdfbox</artifactId>
-        <version>3.0.0-beta1</version>
+        <version>3.0.0</version>
       </dependency>
 
       <dependency>