diff --git a/pubspec.lock b/pubspec.lock
index 54a673a54..166983d37 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -610,8 +610,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: upgrade_3_10_x
-      resolved-ref: c57066ac64bca6f5f475039032da1758dacd7075
+      ref: master
+      resolved-ref: "0393f6de405ed6b80ca363e87a436be81e3daf05"
       url: "https://github.com/linagora/flutter-date-range-picker.git"
     source: git
     version: "1.0.2"
@@ -905,8 +905,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: upgrade_3_10_x
-      resolved-ref: "33559b23eebea37dee9e78bdbd9854d211b1fb6e"
+      ref: email_supported
+      resolved-ref: "11cf3928c18a43ad29f6dfb3d3b0a712a41ec816"
       url: "https://github.com/linagora/html-editor-enhanced.git"
     source: git
     version: "2.5.1"
@@ -1519,12 +1519,11 @@ packages:
   super_tag_editor:
     dependency: "direct main"
     description:
-      path: "."
-      ref: upgrade_3_10_x
-      resolved-ref: b28a36844b6e8e1dd7f252570841942240bf3d9d
-      url: "https://github.com/dab246/super_tag_editor.git"
-    source: git
-    version: "0.1.3"
+      name: super_tag_editor
+      sha256: "1bd2e25fb147a2144b3451a8489b35f5cad09f27fe2dca3c0f5cbe4ae12d3047"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   syncfusion_flutter_core:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 30ee10fc8..057bfb779 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -54,7 +54,7 @@ dependencies:
   html_editor_enhanced:
     git:
       url: https://github.com/linagora/html-editor-enhanced.git
-      ref: upgrade_3_10_x
+      ref: email_supported
 
   jmap_dart_client:
     git:
@@ -79,12 +79,7 @@ dependencies:
   flutter_date_range_picker:
     git:
       url: https://github.com/linagora/flutter-date-range-picker.git
-      ref: upgrade_3_10_x
-
-  super_tag_editor:
-    git:
-      url: https://github.com/dab246/super_tag_editor.git
-      ref: upgrade_3_10_x
+      ref: master
 
   ### Dependencies from pub.dev ###
   cupertino_icons: 1.0.5
@@ -207,6 +202,8 @@ dependencies:
 
   flutter_linkify: 6.0.0
 
+  super_tag_editor: 0.2.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter