diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15c4e7f1ed589ffbf6e6282ab90d43e299c62148..855ded2cf9ca477189b92123757886bc024fad09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,13 +190,23 @@ FileEndCheck:
     
 .singularity_debian10_variables: &singularity_debian10_variables
     OS: debian10
-    NCPU: 16
+    NCPU: 14
     FAIRSOFT_VERSION: jun19p2
     FAIRROOT_VERSION: v18.2.1
     BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
 
+.singularity_debian8_variables: &singularity_debian8_variables
+    OS: debian8
+    NCPU: 14
+    FAIRSOFT_VERSION: jun19p2
+    FAIRROOT_VERSION: v18.2.1
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
+    EXTRA_PATH: $SIMPATH/bin
+
 .linux_tag: &linux_tag
   stage: build
   tags:
@@ -254,11 +264,16 @@ CbmRoot_Merge_realData:
   variables:
     <<: [*mergeRequestVariables, *realData_variables]
 
-CbmRoot_Merge_Singularity:
+CbmRoot_Merge_Singularity_debian10:
   <<: [*singularity_tag, *check_merge_request, *build_and_test]
   variables:
     <<: [*mergeRequestVariables, *singularity_debian10_variables]
 
+CbmRoot_Merge_Singularity_debian8:
+  <<: [*singularity_tag, *check_merge_request, *build_and_test]
+  variables:
+    <<: [*mergeRequestVariables, *singularity_debian8_variables]
+
 CbmRoot_Merge:
   <<: [*linux_tag, *check_merge_request, *build_and_test]
   variables: