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/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/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..b4317f58a2643ffe640a029859d79c2897447819 160000
--- a/swrod
+++ b/swrod
@@ -1 +1 @@
-Subproject commit 9aacebd66a75d4b668e5e2f8341a404f581ebdba
+Subproject commit b4317f58a2643ffe640a029859d79c2897447819