diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05a77c5..8726fc4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 env:
     REGISTRY: ghcr.io
-    IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.7.0
+    IMAGE_NAME: twsearle/orca-jedi/ci-almalinux9:v1.9.2
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cb96a9..3900464 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,20 @@ ecbuild_debug( "   NetCDF_FEATURES: [${NetCDF_FEATURES}]" )
 
 #include( features/BOUNDSCHECKING )
 
+################################################################################
+# Project-wide compiler options
+
+message( "   CMAKE_CXX_COMPILER_ID : ${CMAKE_CXX_COMPILER_ID}" )
+if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+endif()
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+endif()
+if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU|Clang")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Werror")
+endif()
+
 ################################################################################
 # sources