diff --git a/component/egg-patch/Products.DCWorkflow/workflow_method.patch b/component/egg-patch/Products.DCWorkflow/workflow_method.patch
index cdf243ab94c5f6667e5a0e2a188c79fb0e03bc06..583390e675753ed98666c1d51686b3040e06467e 100644
--- a/component/egg-patch/Products.DCWorkflow/workflow_method.patch
+++ b/component/egg-patch/Products.DCWorkflow/workflow_method.patch
@@ -1,7 +1,7 @@
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py	2013-10-31 16:42:05.021141352 +0100
-@@ -40,6 +40,7 @@
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/DCWorkflow.py
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/DCWorkflow.py	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/DCWorkflow.py	2019-09-13 17:51:27.396181694 +0200
+@@ -37,6 +37,7 @@
  from Products.DCWorkflow.permissions import ManagePortal
  from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
  from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION
@@ -9,7 +9,7 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
  from Products.DCWorkflow.utils import Message as _
  from Products.DCWorkflow.utils import modifyRolesForGroup
  from Products.DCWorkflow.utils import modifyRolesForPermission
-@@ -281,6 +282,52 @@
+@@ -277,6 +278,52 @@
              raise Unauthorized(action)
          self._changeStateOf(ob, tdef, kw)
  
@@ -62,9 +62,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
      security.declarePrivate('isInfoSupported')
      def isInfoSupported(self, ob, name):
          '''
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml	2013-10-31 16:42:05.021141352 +0100
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transition_properties.dtml
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transition_properties.dtml	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transition_properties.dtml	2019-09-13 17:53:15.309111199 +0200
 @@ -56,6 +56,16 @@
  </tr>
  
@@ -82,9 +82,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properti
  <th align="left">Script (before)</th>
  <td>
  <select name="script_name">
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml	2013-10-31 16:42:05.021141352 +0100
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transitions.dtml
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transitions.dtml	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transitions.dtml	2019-09-13 17:54:18.323989786 +0200
 @@ -17,7 +17,8 @@
    <td>
     Destination state: <code><dtml-if new_state_id>&dtml-new_state_id;<dtml-else>(Remain in state)</dtml-if></code> <br />
@@ -95,26 +95,26 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Pr
     <br />
     <dtml-if script_name>
       Script (before): &dtml-script_name;
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py	2013-10-31 16:42:09.221141578 +0100
-@@ -34,7 +34,7 @@
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/exportimport.py
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/exportimport.py	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/exportimport.py	2019-09-13 17:55:03.758065281 +0200
+@@ -32,7 +32,7 @@
  from Products.GenericSetup.interfaces import ISetupEnviron
  from Products.GenericSetup.utils import BodyAdapterBase
  
--TRIGGER_TYPES = ( 'AUTOMATIC', 'USER' )
-+TRIGGER_TYPES = ( 'AUTOMATIC', 'USER', 'METHOD' )
+-TRIGGER_TYPES = ('AUTOMATIC', 'USER')
++TRIGGER_TYPES = ('AUTOMATIC', 'USER', 'METHOD')
  _FILENAME = 'workflows.xml'
  
  
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py	2013-10-31 16:42:12.389141749 +0100
-@@ -31,6 +31,7 @@
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/Transitions.py	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py	2019-09-13 17:56:55.071150292 +0200
+@@ -29,6 +29,7 @@
  
  TRIGGER_AUTOMATIC = 0
  TRIGGER_USER_ACTION = 1
 +TRIGGER_WORKFLOW_METHOD = 2
  
  
- class TransitionDefinition (SimpleItem):
+ class TransitionDefinition(SimpleItem):
diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg
index c065c82bcc0b8364a5642879257d1acc9ea525f5..f23d19a1e832648c4b8ab5a3bdf3bee5f8bcddb8 100644
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
@@ -1,3 +1,19 @@
 [buildout]
 extends =
   ../../stack/erp5/buildout.cfg
+
+
+# Test Suite: ERP5.UnitTest-Master ran at 2021/04/07 20:28:18.417758 UTC
+#             9 failures, 0 errors, 7364 total, status: FAIL
+
+[erp5]
+revision = 1b706b6c29771b5fcbde6499be5df905ca503d5a
+
+
+[erp5-bin]
+revision = 13d3ed05f0f07a53786fdf1ec0855a94ba1acdfc
+
+
+[erp5-doc]
+revision = 3996ae1f832ca438ead9fbcf0ab8082dd1d22021
+
diff --git a/software/neoppod/software-common.cfg b/software/neoppod/software-common.cfg
index f7e3d7130a2794dc3765fcc6f4ad322983bcc7dd..aa1c327dd21dec396703fa5b071f19c273637a8d 100644
--- a/software/neoppod/software-common.cfg
+++ b/software/neoppod/software-common.cfg
@@ -138,3 +138,11 @@ python-dateutil = 2.7.3
 # Required by:
 # mock = 3.0.5
 funcsigs = 1.0.2
+
+
+# Test Suite: NEO.UnitTest-Master ran at 2021/04/08 06:47:3.372275 UTC
+#             28 failures, 0 errors, 869 total, status: PASS
+
+[neoppod-repository]
+revision = de0feb4e0e3cd60ebc25b6db5efb4fd5078c5e04
+
diff --git a/software/re6stnet/software.cfg b/software/re6stnet/software.cfg
index d2bebbc284538438c50458cb936590a940441c16..4af3c73d859ddb430bbfc3f0a0133a4b2bcb7201 100644
--- a/software/re6stnet/software.cfg
+++ b/software/re6stnet/software.cfg
@@ -100,3 +100,9 @@ context =
 
 [versions]
 miniupnpc = 1.9
+
+# No test suite for re6stnet for now. The revision is hardcoded.
+
+[re6stnet-repository]
+revision = 721f9d4355b40c8cdcdc9bb91383c37a30fa8940
+
diff --git a/software/slapos-master/software.cfg b/software/slapos-master/software.cfg
index ac6563ae70bb2cde9ec34177e4e463b163bebdc7..1ee628c6a9dede02fe8fd13f528f9dae350ad7a0 100644
--- a/software/slapos-master/software.cfg
+++ b/software/slapos-master/software.cfg
@@ -79,3 +79,27 @@ url = ${:_profile_base_location_}/${:filename}
 [versions]
 python-memcached = 1.47
 xml-marshaller = 1.0.2
+
+
+# Test Suite: SlapOS-Master.UnitTest-Master ran at 2021/04/01 08:15:31.095805 UTC
+#             1 failures, 0 errors, 1744 total, status: FAIL
+
+[erp5]
+revision = bcbf71e8d80a6714cff886248c74aeea6730bf30
+
+
+[vifib]
+revision = a14a847e4ad47d667296b72b29eb36471aa6b9d9
+
+
+[erp5-bin]
+revision = 13d3ed05f0f07a53786fdf1ec0855a94ba1acdfc
+
+
+[slapos-bin]
+revision = 0e69f462bf6de44db7d9a2bf0bf5407aa9691753
+
+
+[erp5-doc]
+revision = 3996ae1f832ca438ead9fbcf0ab8082dd1d22021
+
diff --git a/software/wendelin/software.cfg b/software/wendelin/software.cfg
index 8fd68109ad99b47ea116f100ec3515e564435a9f..20500df97d0aa25b18c9289d6c4cf8a58ba2ec91 100644
--- a/software/wendelin/software.cfg
+++ b/software/wendelin/software.cfg
@@ -74,3 +74,31 @@ branch = master
 
 [versions]
 msgpack-numpy = 0.4.4.3
+
+
+# Test Suite: Wendelin.UnitTest-Master ran at 2021/04/08 01:03:58.820370 UTC
+#             0 failures, 0 errors, 34 total, status: PASS
+
+[slapos]
+revision = 944edd5e5e1b8122225cb50b40fe982239eadf9c
+
+
+[erp5]
+revision = 1b706b6c29771b5fcbde6499be5df905ca503d5a
+
+
+[wendelin]
+revision = cc7d405be2b32ede8d219595bc89bdcb2dd37835
+
+
+[wendelin.core]
+revision = fe369d32327917ca3197be2f855442da2666230e
+
+
+[erp5-bin]
+revision = 13d3ed05f0f07a53786fdf1ec0855a94ba1acdfc
+
+
+[erp5-doc]
+revision = 3996ae1f832ca438ead9fbcf0ab8082dd1d22021
+
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index db98d1bab160284d624ac9f59e6fe4ebb163fe12..428c257a952f6d59b46c0f76e61ff7ff59083525 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -385,21 +385,11 @@ setup-eggs =
   eggtestinfo
 egg = ${:_buildout_section_name_}
 
-[Products.CMFUid]
-<= zope-product-with-eggtestinfo
-[Products.CMFActionIcons]
-<= zope-product-with-eggtestinfo
-[Products.CMFCalendar]
-<= zope-product-with-eggtestinfo
 [Products.CMFCore]
 <= zope-product-with-eggtestinfo
-[Products.CMFDefault]
-<= zope-product-with-eggtestinfo
-[Products.CMFTopic]
-<= zope-product-with-eggtestinfo
 [Products.DCWorkflow]
 <= zope-product-with-eggtestinfo
-Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#975b49e96bae33ac8563454fe5fa9899
+Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#0bd00af377750253bd275f2ccfdf9379
 Products.DCWorkflow-patch-options = -p1
 [Products.GenericSetup]
 <= zope-product-with-eggtestinfo
@@ -497,13 +487,8 @@ eggs = ${neoppod:eggs}
   Products.PluggableAuthService
   Products.PluginRegistry
 
-# CMF 2.2
-  ${Products.CMFActionIcons:egg}
-  ${Products.CMFCalendar:egg}
+# CMF 2.3
   ${Products.CMFCore:egg}
-  ${Products.CMFDefault:egg}
-  ${Products.CMFTopic:egg}
-  ${Products.CMFUid:egg}
   ${Products.DCWorkflow:egg}
   ${Products.GenericSetup:egg}
   five.localsitemanager
@@ -607,7 +592,7 @@ depends =
 
 # patched eggs
 Acquisition = 2.13.12+SlapOSPatched001
-Products.DCWorkflow = 2.2.4+SlapOSPatched001
+Products.DCWorkflow = 2.3.0+SlapOSPatched001
 ocropy = 1.0+SlapOSPatched001
 pysvn = 1.7.10+SlapOSPatched002
 python-ldap = 2.4.32+SlapOSPatched001
@@ -630,12 +615,8 @@ rdiff-backup = 1.0.5+SlapOSPatched001
 # modified version that works fine for buildout installation
 SOAPpy = 0.12.0nxd001
 
-# CMF 2.3 is not yet supported.
-Products.CMFCalendar = 2.2.3
-Products.CMFCore = 2.2.10
-Products.CMFDefault = 2.2.4
-Products.CMFTopic = 2.2.1
-Products.CMFUid = 2.2.1
+# CMF 2.3
+Products.CMFCore = 2.3.1
 
 # newer version requires zope.traversing>=4.0.0a2.
 zope.app.appsetup = 3.16.0
@@ -649,11 +630,10 @@ zope.app.testing = 3.8.1
 # Pinned versions
 APacheDEX = 1.8
 Pillow = 6.2.2
-Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
 # Products.ExternalEditor 2.0.0's dtml is not based on Zope2 OFS's one.
 Products.ExternalEditor = 1.1.1
-Products.GenericSetup = 1.8.6
+Products.GenericSetup = 1.8.7
 Products.LongRequestLogger = 2.1.0
 # Products.MimetypesRegistry 2.1 requires AccessControl>=3.0.0Acquisition.
 Products.MimetypesRegistry = 2.0.10
@@ -669,6 +649,7 @@ WSGIUtils = 0.7
 astroid = 1.3.8
 erp5diff = 0.8.1.7
 five.formlib = 1.0.4
+five.globalrequest = 1.0
 five.localsitemanager = 2.0.5
 google-api-python-client = 1.6.1
 httplib2 = 0.10.3