diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71b2af7446e3edb2746d847c023604b25785b97d..d2794e40612845f54fee85c3bd249e22b105a115 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -228,17 +228,17 @@ build/x86_64-centos7-gcc8-dbg:
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-dbg
 
-build/x86_64-centos7-gcc9-opt:
+build/x86_64-centos7-gcc10-opt:
     extends: .build
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-opt
+        CMTCONFIG: x86_64-centos7-gcc10-opt
 
-build/x86_64-centos7-gcc9-dbg:
+build/x86_64-centos7-gcc10-dbg:
     extends: .build
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-dbg
+        CMTCONFIG: x86_64-centos7-gcc10-dbg
 
 build/x86_64-centos7-clang10-opt:
     extends: .build
@@ -279,31 +279,6 @@ full-ci/x86_64-centos7-gcc8-opt:
             - tdaq/$CI_COMMIT_REF_NAME/installed
         expire_in: 1 day    
 
-# Special CI build for tdaq-99-00-02 from default branch
-# but using tdaq-common-99-00-02
-.ers-ci/x86_64-centos7-gcc8-opt:
-    extends: build/x86_64-centos7-gcc8-opt
-    tags:
-        - tdaq-ci        
-    variables:
-        TDAQ_COMMON_VERSION: tdaq-common-99-00-02
-        CMAKE_OPTIONS: -D TDAQ_NO_DEBUG_INSTALL=TRUE -D USE_CCACHE=TRUE -D TDAQ_VERSION=99.0.2 -D TDAQ_COMMON_VERSION=99.0.2
-        CTEST_OPTIONS: -D CTEST_TRACK=Continuous -D CTEST_BUILD_NAME=CI-ERS-x86_64-centos7-gcc8-opt  
-    only:
-        refs:
-            - tdaq-99-00-00
-        variables:
-            - $PACKAGES == null
-    except:
-        - triggers
-        - web
-        - schedules
-    artifacts:
-        paths:
-            - tdaq-common/tdaq-common-99-00-02/installed
-            - tdaq/tdaq-99-00-02/installed
-        expire_in: 1 day    
-
 #
 # The job for continuous builds.
 #
@@ -348,17 +323,17 @@ continuous/x86_64-centos7-gcc8-dbg:
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-dbg
 
-continuous/x86_64-centos7-gcc9-opt:
+.continuous/x86_64-centos7-gcc10-opt:
     extends: .continuous
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-opt
+        CMTCONFIG: x86_64-centos7-gcc10-opt
 
-continuous/x86_64-centos7-gcc9-dbg:
+.continuous/x86_64-centos7-gcc10-dbg:
     extends: .continuous
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-dbg
+        CMTCONFIG: x86_64-centos7-gcc10-dbg
 
 .continuous/x86_64-slc6-gcc8-opt:
     extends: .continuous
@@ -417,29 +392,29 @@ continuous/x86_64-centos7-gcc9-dbg:
 #
 # One per CMTCONFIG, disable by putting . in front of name
 #
-patches/x86_64-centos8-gcc-opt:
+patches/x86_64-centos7-gcc8-opt:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-opt
 
-patches/x86_64-centos8-gcc-dbg:
+patches/x86_64-centos7-gcc8-dbg:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-dbg
 
-patches/x86_64-centos9-gcc-opt:
+.patches/x86_64-centos7-gcc10-opt:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-opt
+        CMTCONFIG: x86_64-centos7-gcc10-opt
 
-patches/x86_64-centos9-gcc-dbg:
+.patches/x86_64-centos7-gcc10-dbg:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-dbg
+        CMTCONFIG: x86_64-centos7-gcc10-dbg
 
 .patches/x86_64-slc6-gcc-opt:
     extends: .patches