diff --git a/package.json b/package.json
index 9b29dd5d..474b0adc 100644
--- a/package.json
+++ b/package.json
@@ -13,13 +13,13 @@
   "addons": [
     "@eeacms/volto-eea-kitkat",
     "@kitconcept/volto-blocks-grid",
+    "@eeacms/volto-object-widget",
     "@eeacms/volto-embed",
     "@eeacms/volto-tableau",
     "@eeacms/volto-datablocks",
     "@eeacms/volto-plotlycharts",
     "@eeacms/volto-slate-dataentity",
     "@eeacms/volto-block-style",
-    "@eeacms/volto-object-widget",
     "@eeacms/volto-group-block",
     "@eeacms/volto-freshwater"
   ],
@@ -66,11 +66,13 @@
   },
   "dependencies": {
     "@eeacms/volto-block-image-cards": "github:eea/volto-block-image-cards#develop",
+    "@eeacms/volto-block-style": "3.5.0",
     "@eeacms/volto-columns-block": "github:eea/volto-columns-block#develop",
     "@eeacms/volto-datablocks": "github:eea/volto-datablocks#fix_volto_13",
     "@eeacms/volto-eea-kitkat": "4.0.1",
     "@eeacms/volto-embed": "2.0.4",
-    "@eeacms/volto-object-widget": "github:eea/volto-object-widget",
+    "@eeacms/volto-group-block": "4.3.0",
+    "@eeacms/volto-object-widget": "3.0.0",
     "@eeacms/volto-plotlycharts": "github:eea/volto-plotlycharts#transform_filter",
     "@eeacms/volto-slate-dataentity": "github:eea/volto-slate-dataentity#develop",
     "@eeacms/volto-slate-footnote": "github:eea/volto-slate-footnote#develop",
@@ -90,9 +92,7 @@
     "react-visibility-sensor": "5.1.1",
     "slick-carousel": "^1.8.1",
     "webpack-bundle-analyzer": "^3.6.1",
-    "@eeacms/volto-block-style": "github:eea/volto-block-style#develop",
-    "@eeacms/volto-freshwater": "eea/volto-freshwater#develop",
-    "@eeacms/volto-group-block": "eea/volto-group-block#develop"    
+    "@eeacms/volto-freshwater": "eea/volto-freshwater#develop"
   },
   "devDependencies": {
     "@babel/core": "7.11.1",
diff --git a/yarn.lock b/yarn.lock
index 4ced8151..50f3c7dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1368,13 +1368,6 @@
   dependencies:
     react-color "~2.18.1"
 
-"@eeacms/volto-block-style@github:eea/volto-block-style#develop":
-  version "3.5.0"
-  resolved "https://codeload.github.com/eea/volto-block-style/tar.gz/8b20d02f809e456af84aaea5ad74115c00e39c3e"
-  dependencies:
-    "@eeacms/volto-resize-helper" "*"
-    react-color "~2.18.1"
-
 "@eeacms/volto-columns-block@github:eea/volto-columns-block#develop":
   version "4.4.5"
   resolved "https://codeload.github.com/eea/volto-columns-block/tar.gz/35aa79635a03778819365873fdad2937e79b4f5f"
@@ -1440,18 +1433,11 @@
   resolved "https://codeload.github.com/eea/volto-freshwater/tar.gz/12c139485cf2d26a69c38745beac79f8f63f5fd0"
   dependencies:
     "@eeacms/volto-block-style" "^3.3.0"
-    "@eeacms/volto-datablocks" "2.0.11"
-    "@eeacms/volto-group-block" "*"
-    "@eeacms/volto-plotlycharts" "*"
     "@eeacms/volto-resize-helper" "^0.2.0"
     "@kitconcept/volto-blocks-grid" "*"
     react-lazy-load-image-component "^1.4.0"
     volto-slate "^2.6.1"
 
-"@eeacms/volto-group-block@eea/volto-group-block#develop":
-  version "4.3.0"
-  resolved "https://codeload.github.com/eea/volto-group-block/tar.gz/ff8889cb7b0761b1df43b201984ce40b14e1561b"
-
 "@eeacms/volto-listing-block@0.1.2":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@eeacms/volto-listing-block/-/volto-listing-block-0.1.2.tgz#4ba22f5a3b424f56801af22bd96e8e5a6d35d1ec"
@@ -1471,10 +1457,6 @@
   dependencies:
     "@eeacms/volto-widgets-view" "*"
 
-"@eeacms/volto-object-widget@github:eea/volto-object-widget":
-  version "3.0.0"
-  resolved "https://codeload.github.com/eea/volto-object-widget/tar.gz/952ef2eedf97f13df9cf5a58aa8e99d82a619f2f"
-
 "@eeacms/volto-plotlycharts@github:eea/volto-plotlycharts#transform_filter":
   version "2.0.6"
   resolved "https://codeload.github.com/eea/volto-plotlycharts/tar.gz/90495b2aab6cf48ad5f68849d300f605deb79b72"
@@ -1503,8 +1485,7 @@
   version "0.1.0"
   resolved "https://codeload.github.com/eea/volto-slate-dataentity/tar.gz/fef8aefda26d9505544920832a8b323dfd63d4c1"
   dependencies:
-    "@eeacms/volto-datablocks" "^2.0.2"
-    volto-slate "^2.5.0"
+    volto-datablocks eea/volto-datablocks#master
 
 "@eeacms/volto-slate-footnote@4.0.2":
   version "4.0.2"