diff --git a/athena_ci/athena_build.sh b/athena_ci/athena_build.sh
index c64bbb384722aae3407d0d438ec9416cfee082ba..f8e8a1cafba8e0a74f7846468c15a0eb9b2f3a05 100755
--- a/athena_ci/athena_build.sh
+++ b/athena_ci/athena_build.sh
@@ -206,7 +206,8 @@ export ROOT_INCLUDE_PATH="${gm_install_dir}/include:${ROOT_INCLUDE_PATH}"
 cmake "$ATHENA_SOURCE/Projects/WorkDir" \
   -GNinja \
   -DCMAKE_MAKE_PROGRAM="$NINJA" \
-  -DCMAKE_CPP_FLAGS="$EXTRA_FLAGS -isystem ${gm_install_dir}/include" \
+  -DCMAKE_CPP_FLAGS="-isystem ${gm_install_dir}/include" \
+  -DCMAKE_CXX_FLAGS="$EXTRA_FLAGS " \
   -DATLAS_PACKAGE_FILTER_FILE="$package_filters" \
   -DCMAKE_CXX_COMPILER_LAUNCHER=$CCACHE \
   -DCMAKE_INSTALL_PREFIX=$install_dir
@@ -230,7 +231,7 @@ if [ -z "$CI" ]; then
   heading "Interactive mode, dropping into shell"
   bash
 else
-  VERBOSE=1 cmake --build athena-build -- -j3
+  cmake --build athena-build -- -j3
   $CCACHE -s
   cmake --install athena-build > athena_install.log
 fi