diff --git a/.github/scripts/compile_and_test.sh b/.github/scripts/compile_and_test.sh
deleted file mode 100755
index 405960ff..00000000
--- a/.github/scripts/compile_and_test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-ILCSOFT=/cvmfs/clicdp.cern.ch/iLCSoft/builds/current/CI_${COMPILER}
-source $ILCSOFT/init_ilcsoft.sh
-
-cd /Package
-mkdir build
-cd build
-cmake -GNinja -C $ILCSOFT/ILCSoft.cmake -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always" -DMARLINRECO_FORTRAN='OFF' .. && \
-ninja && \
-ninja install && \
-ctest --output-on-failure
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
new file mode 100644
index 00000000..477ef9c0
--- /dev/null
+++ b/.github/workflows/coverity.yml
@@ -0,0 +1,21 @@
+name: coverity
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  run-coverity:
+    runs-on: ubuntu-latest
+    if: github.repository == 'iLCSoft/MarlinReco'
+    steps:
+    - uses: actions/checkout@v2
+    - uses: cvmfs-contrib/github-action-cvmfs@v2
+    - uses: aidasoft/run-lcg-view@v3
+      with:
+        coverity-cmake-command: 'cmake -C $ILCSOFT/ILCSoft.cmake ..'
+        coverity-project: 'iLCSoft%2FMarlinReco'
+        coverity-project-token: ${{ secrets.MARLINRECO_COVERITY_TOKEN }}
+        github-pat: ${{ secrets.READ_COVERITY_IMAGE }}
+        view-path: "/cvmfs/clicdp.cern.ch/iLCSoft/lcg/100/nightly/x86_64-centos7-gcc10-opt"
+        setup-script: "init_ilcsoft.sh"
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ed390588..a8d799b2 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -7,14 +7,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        COMPILER: [gcc, llvm]
+        COMPILER: [gcc10, clang11]
+        LCG: [100]
+        include:
+          - COMPILER: gcc8
+            LCG: 99python2
 
     steps:
     - uses: actions/checkout@v2
     - uses: cvmfs-contrib/github-action-cvmfs@v2
-    - name: Start container
-      run: |
-        docker run -it --name CI_container -v ${GITHUB_WORKSPACE}:/Package -v /cvmfs:/cvmfs:shared -e COMPILER=${{ matrix.COMPILER }} -d ghcr.io/aidasoft/centos7:latest /bin/bash
-    - name: Compile and test
-      run: |
-        docker exec CI_container /bin/bash -c "./Package/.github/scripts/compile_and_test.sh"
+    - uses: aidasoft/run-lcg-view@v3
+      with:
+        view-path: "/cvmfs/clicdp.cern.ch/iLCSoft/lcg/${{ matrix.LCG }}/nightly/x86_64-centos7-${{ matrix.COMPILER }}-opt"
+        setup-script: "init_ilcsoft.sh"
+        run: |
+          mkdir build
+          cd build
+          cmake -GNinja -C ${ILCSOFT}/ILCSoft.cmake -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " ..
+          ninja -k0
+          ctest --output-on-failure
+          ninja install