diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 165c7be116ffa949249b8c56342325588de1c7a3..784c7f305368c89855fa74e3b194f11d4562cdfc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,6 +93,43 @@ CodeFormatCheck:
     - echo "export LABEL=format-check_MR-\${CI_MERGE_REQUEST_IID}" >> env.sh
     - echo "export FAIRROOT_FORMAT_BASE=upstream/\${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" >> env.sh
     - . ./env.sh && ctest -S cmake/scripts/checkformat.cmake -VV
+
+#CodeTidyCheck:
+#  stage: checkFormat
+#  tags:
+#    - CbmRoot_apptainer
+#  only:
+#    refs:
+#      - merge_requests
+#    variables:
+#      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+#  script:
+#    # Get the upstream repository manually. I did not find any other way to have it for
+#    # comparison
+#    - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
+#    - git fetch upstream
+#    - echo "export FAIRSOFT_VERSION=$FAIRSOFT_VERSION" > env.sh
+#    - echo "export FAIRROOT_VERSION=$FAIRROOT_VERSION" >> env.sh
+#    - echo "export SIMPATH=/opt/fairsoft/\${FAIRSOFT_VERSION}" >> env.sh
+#    - echo "export FAIRROOTPATH=/opt/fairroot/\${FAIRROOT_VERSION}_\${FAIRSOFT_VERSION}" >> env.sh
+#    - echo "export BUILDDIR=$PWD/build" >> env.sh
+#    - echo "export SOURCEDIR=$PWD" >> env.sh
+#    - echo "export PATH=/cvmfs/cbm.gsi.de/clang-format-11.0.0/bin:\$SIMPATH/bin:$PATH" >> env.sh
+#    - echo "export LABEL=tidy-check_MR-${CI_MERGE_REQUEST_IID}" >> env.sh
+#    - echo "export FAIRROOT_TIDY_BASE=upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" >> env.sh
+#    - echo "export NCPU=8"
+#    - . ./env.sh && ctest -S cmake/scripts/checktidy.cmake -VV
+#  after_script:
+#    - rm -rf build
+#  variables:
+#    CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian12_v18.8.0_nov22p1_1.sif"
+#    OS: debian12
+#    FAIRSOFT_VERSION: nov22p1
+#    FAIRROOT_VERSION: v18.8.0
+#    BASE_PATH: "/opt"
+#    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+#    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+
 FileFormatCheck:
   stage: checkFormat
   image: alpine