diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa65950941e874c0ac94b825affcfd90b52d4add..a4edbd29a291e51909038dff2f40b777520ae2da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,7 @@ variables:
 
     # For a release branch, fix the TDAQ_COMMON_VERSION if
     # not the same as TDAQ_VERSION (e.g. tdaq-common-03-04-00)
-    # TDAQ_COMMON_VERSION: ""
+    TDAQ_COMMON_VERSION: tdaq-common-04-00-00
 
     # Generic options to build_stack script
     #
diff --git a/ALTI b/ALTI
index b15ebef706a73d5be350152c943181184c6d8a44..9661663916e35f1b449cd2493ee7aa2905261c85 160000
--- a/ALTI
+++ b/ALTI
@@ -1 +1 @@
-Subproject commit b15ebef706a73d5be350152c943181184c6d8a44
+Subproject commit 9661663916e35f1b449cd2493ee7aa2905261c85
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 544188eaaeca28d077cbb9096238fa9dd2cfafb4..3ef462881048aeea4bc131f85f46f794c712f03e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6.0)
 
-set(TDAQ_VERSION 99.0.0 CACHE STRING "TDAQ version number")
-set(TDAQ_COMMON_VERSION 99.0.0 CACHE STRING "TDAQ common version number")
+set(TDAQ_VERSION 9.0.0 CACHE STRING "TDAQ version number")
+set(TDAQ_COMMON_VERSION 4.0.0 CACHE STRING "tdaq-common version number")
 
 project(tdaq VERSION ${TDAQ_VERSION})
 
diff --git a/HLTMPPU b/HLTMPPU
index 58a14fb3c0604fa486fafcae16e8c25142151e02..1cc041c3aee1c4b9fb054940f3d8ae7eef116549 160000
--- a/HLTMPPU
+++ b/HLTMPPU
@@ -1 +1 @@
-Subproject commit 58a14fb3c0604fa486fafcae16e8c25142151e02
+Subproject commit 1cc041c3aee1c4b9fb054940f3d8ae7eef116549
diff --git a/TRP b/TRP
index 1335cf9a92405937738dd0d99a26fb1c6417faef..ada8cae3e69ebc389c45ec8c77740cd785cfb9b5 160000
--- a/TRP
+++ b/TRP
@@ -1 +1 @@
-Subproject commit 1335cf9a92405937738dd0d99a26fb1c6417faef
+Subproject commit ada8cae3e69ebc389c45ec8c77740cd785cfb9b5
diff --git a/coldpie b/coldpie
index 689169e314c140c70ede134578843157f1c183c2..67d08bf3314f417c51f7d05f69d524f8d1b8bc63 160000
--- a/coldpie
+++ b/coldpie
@@ -1 +1 @@
-Subproject commit 689169e314c140c70ede134578843157f1c183c2
+Subproject commit 67d08bf3314f417c51f7d05f69d524f8d1b8bc63
diff --git a/dal b/dal
index 5266a04b2fcf07e7b2a9a1888003a61609cf07c4..62cc661fbeb5132ef0f2137e2ce0d5d33fb5e326 160000
--- a/dal
+++ b/dal
@@ -1 +1 @@
-Subproject commit 5266a04b2fcf07e7b2a9a1888003a61609cf07c4
+Subproject commit 62cc661fbeb5132ef0f2137e2ce0d5d33fb5e326
diff --git a/dvs b/dvs
index 76a349be13586bf9a78ef64bd61dc68ec297fd16..ea248f2cccc1554345e01f9025597e54231791cc 160000
--- a/dvs
+++ b/dvs
@@ -1 +1 @@
-Subproject commit 76a349be13586bf9a78ef64bd61dc68ec297fd16
+Subproject commit ea248f2cccc1554345e01f9025597e54231791cc
diff --git a/omni b/omni
index 62d329df848fc80fde7035da6f3637f277595bec..80d6227c4756fccb983e58ad62330a1e28f64939 160000
--- a/omni
+++ b/omni
@@ -1 +1 @@
-Subproject commit 62d329df848fc80fde7035da6f3637f277595bec
+Subproject commit 80d6227c4756fccb983e58ad62330a1e28f64939
diff --git a/swrod b/swrod
index 9aacebd66a75d4b668e5e2f8341a404f581ebdba..1e98fd57fe0f2cbad92cc5302cd2345fa2848724 160000
--- a/swrod
+++ b/swrod
@@ -1 +1 @@
-Subproject commit 9aacebd66a75d4b668e5e2f8341a404f581ebdba
+Subproject commit 1e98fd57fe0f2cbad92cc5302cd2345fa2848724