diff --git a/ci/repo-config/mesosci/cs8/o2-alidist.env b/ci/repo-config/mesosci/cs8/o2-alidist.env
deleted file mode 100644
index 14e08c47..00000000
--- a/ci/repo-config/mesosci/cs8/o2-alidist.env
+++ /dev/null
@@ -1,16 +0,0 @@
-CI_NAME=build_O2_alidist-cs8
-PACKAGE=O2Suite
-ALIBUILD_DEFAULTS=o2
-PR_REPO=alisw/alidist
-PR_BRANCH=master
-BRANCH_REMOTE_STORE=s3://alibuild-repo::rw
-NO_ASSUME_CONSISTENT_EXTERNALS=
-TRUST_COLLABORATORS=true
-CHECK_NAME=build/O2/alidist-cs8
-DONT_USE_COMMENTS=1
-DEVEL_PKGS="$PR_REPO $PR_BRANCH
-AliceO2Group/AliceO2 dev O2
-AliceO2Group/O2Physics master"
-ALIBUILD_O2_TESTS=1
-ALIBUILD_O2PHYSICS_TESTS=1
-ALIBUILD_XJALIENFS_TESTS=1
diff --git a/ci/repo-config/mesosci/cs8/o2.env b/ci/repo-config/mesosci/cs8/o2.env
deleted file mode 100644
index 91d8d833..00000000
--- a/ci/repo-config/mesosci/cs8/o2.env
+++ /dev/null
@@ -1,13 +0,0 @@
-CI_NAME=build_O2_o2-cs8
-PACKAGE=O2Suite
-ALIBUILD_DEFAULTS=o2
-PR_REPO=AliceO2Group/AliceO2
-PR_REPO_CHECKOUT=O2
-PR_BRANCH=dev
-TRUST_COLLABORATORS=true
-CHECK_NAME=build/O2/o2-cs8
-DONT_USE_COMMENTS=1
-DEVEL_PKGS="$PR_REPO $PR_BRANCH $PR_REPO_CHECKOUT
-AliceO2Group/O2Physics master
-alisw/alidist master"
-ALIBUILD_O2_TESTS=1
diff --git a/ci/repo-config/mesosdaq/slc7/o2-common.env b/ci/repo-config/mesosdaq/cs8/o2-common.env
similarity index 100%
rename from ci/repo-config/mesosdaq/slc7/o2-common.env
rename to ci/repo-config/mesosdaq/cs8/o2-common.env
diff --git a/ci/repo-config/mesosdaq/slc7/qualitycontrol-fullsystest.env b/ci/repo-config/mesosdaq/cs8/qualitycontrol-fullsystest.env
similarity index 100%
rename from ci/repo-config/mesosdaq/slc7/qualitycontrol-fullsystest.env
rename to ci/repo-config/mesosdaq/cs8/qualitycontrol-fullsystest.env
diff --git a/ci/repo-config/mesosdaq/cs8/qualitycontrol.env b/ci/repo-config/mesosdaq/cs8/qualitycontrol.env
index 9f3958cb..ced5eae8 100644
--- a/ci/repo-config/mesosdaq/cs8/qualitycontrol.env
+++ b/ci/repo-config/mesosdaq/cs8/qualitycontrol.env
@@ -1,4 +1,4 @@
-CI_NAME=build_QualityControl_o2-cs8
+CI_NAME=build_QualityControl_o2
 PACKAGE=QualityControl
 ALIBUILD_DEFAULTS=o2
 PR_REPO=AliceO2Group/QualityControl
@@ -6,10 +6,10 @@ PR_BRANCH=master
 TRUSTED_USERS=ktf,Barthelemy,awegrzyn
 TRUST_COLLABORATORS=true
 NO_ASSUME_CONSISTENT_EXTERNALS=
-CHECK_NAME=build/QualityControl/o2-cs8
+CHECK_NAME=build/QualityControl/o2
 DONT_USE_COMMENTS=1
 DEVEL_PKGS="$PR_REPO $PR_BRANCH
 AliceO2Group/AliceO2 dev O2
 alisw/alidist master"
 ALIBUILD_O2_TESTS=1
-DONT_USE_COMMENTS=1
+DONT_USE_COMMENTS=1
\ No newline at end of file
diff --git a/ci/repo-config/mesosdaq/slc7/qualitycontrol.env b/ci/repo-config/mesosdaq/slc7/qualitycontrol.env
deleted file mode 100644
index ced5eae8..00000000
--- a/ci/repo-config/mesosdaq/slc7/qualitycontrol.env
+++ /dev/null
@@ -1,15 +0,0 @@
-CI_NAME=build_QualityControl_o2
-PACKAGE=QualityControl
-ALIBUILD_DEFAULTS=o2
-PR_REPO=AliceO2Group/QualityControl
-PR_BRANCH=master
-TRUSTED_USERS=ktf,Barthelemy,awegrzyn
-TRUST_COLLABORATORS=true
-NO_ASSUME_CONSISTENT_EXTERNALS=
-CHECK_NAME=build/QualityControl/o2
-DONT_USE_COMMENTS=1
-DEVEL_PKGS="$PR_REPO $PR_BRANCH
-AliceO2Group/AliceO2 dev O2
-alisw/alidist master"
-ALIBUILD_O2_TESTS=1
-DONT_USE_COMMENTS=1
\ No newline at end of file