diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml
index fe67237..00f1c6a 100644
--- a/.github/workflows/key4hep.yml
+++ b/.github/workflows/key4hep.yml
@@ -1,31 +1,33 @@
-name: keyh4ep
-on: [push, pull_request]
+name: Key4hep build
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    - cron: '16 4 * * 1'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
+  build:
     strategy:
+      matrix:
+        build_type: ["release", "nightly"]
+        image: ["alma9"]
+        include:
+          - build_type: nightly
+            image: ubuntu24
       fail-fast: false
-
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: cvmfs-contrib/github-action-cvmfs@v3
-    - uses: aidasoft/run-lcg-view@v4
+    - uses: actions/checkout@v6
+    - uses: key4hep/key4hep-actions/cache-external-data@main
+    - uses: key4hep/key4hep-actions/key4hep-build@main
       with:
-        container: centos7
-        view-path: /cvmfs/sw-nightlies.hsf.org/key4hep
-        run: |
-          mkdir build
-          cd build
-          echo "::group::Run CMake"
-          cmake -GNinja \
-            -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-vla-extension " \
-            -DCMAKE_CXX_STANDARD=17 \
-            -DCMAKE_INSTALL_PREFIX=../install \
-            ..
-          echo "::endgroup::" && echo "::group::Build"
-          ninja -k0
-          echo "::endgroup::" && echo "::group::Run Tests"
-          ctest --output-on-failure
-          echo "::endgroup::" && echo "::group::Install"
-          ninja install
+        build_type: ${{ matrix.build_type }}
+        image: ${{ matrix.image }}
+        stack: ${{ matrix.stack }}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
deleted file mode 100644
index 0273d44..0000000
--- a/.github/workflows/linux.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: linux
-on: [push, pull_request]
-
-jobs:
-  centos7:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        COMPILER: [gcc10, clang11]
-        LCG: [100]
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: cvmfs-contrib/github-action-cvmfs@v3
-    - uses: aidasoft/run-lcg-view@v4
-      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 -Werror -Wno-vla-extension " ..
-          ninja -k0
-          ctest --output-on-failure
-          ninja install