diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml
index 2aeaf77..aaf8f75 100644
--- a/.github/workflows/key4hep.yml
+++ b/.github/workflows/key4hep.yml
@@ -1,34 +1,27 @@
-name: key4hep
+name: Key4hep build
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  linux:
-    runs-on: ubuntu-latest
+  build:
     strategy:
-      fail-fast: false
       matrix:
-        include:
-          - release: "sw.hsf.org/key4hep"
-            CXX_STANDARD: 17
-          - release: "sw-nightlies.hsf.org/key4hep"
-            CXX_STANDARD: 20
+        build_type: ["release", "nightly"]
+        image: ["alma9", "ubuntu22"]
+      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@v4
+    - uses: key4hep/key4hep-actions/key4hep-build@main
       with:
-        container: centos7
-        view-path: /cvmfs/${{ matrix.release }}
-        run: |
-          mkdir build install
-          cd build
-          cmake -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \
-            -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always " \
-            -DCMAKE_INSTALL_PREFIX=../install \
-            -DINSTALL_DOC=ON \
-            -GNinja \
-            ..
-          ninja -k0
-          ctest --output-on-failure
-          ninja install
+        build_type: ${{ matrix.build_type }}
+        image: ${{ matrix.image }}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
deleted file mode 100644
index 77ef221..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: [gcc11]
-        LCG: [104]
-
-    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 " -DINSTALL_DOC=ON ..
-          ninja -k0
-          ctest --output-on-failure
-          ninja install
diff --git a/source/src/DBInterface.cc b/source/src/DBInterface.cc
index 70fce34..75e5064 100644
--- a/source/src/DBInterface.cc
+++ b/source/src/DBInterface.cc
@@ -831,7 +831,7 @@ namespace lccd {
       {
 	condTagMgr()->createCondDBTag( tag, description ) ;
       }
-    catch ( CondDBException condbexc )
+    catch ( CondDBException& condbexc )
       {
 	//	std::cout << " WARNING: DBInterface::tagFolder: "<<condbexc.getMessage() << std::endl;
       }