diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 763aa0bd3..bcc026d7a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -165,7 +165,6 @@ jobs:
     env:
       CC: gcc-12
       CXX: g++-12
-      EXTRA_FLAGS: -Wno-stringop-overread
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
       POSTGRESQL_VERSION: 13
@@ -262,7 +261,6 @@ jobs:
     env:
       CC: gcc-12
       CXX: g++-12
-      EXTRA_FLAGS: -Wno-stringop-overread
       LUA_VERSION: 5.4
       LUAJIT_OPTION: ON
       POSTGRESQL_VERSION: 16
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index 1581280d1..eb9f0cc10 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -22,7 +22,7 @@ jobs:
       POSTGRESQL_VERSION: 16
       POSTGIS_VERSION: 3
       BUILD_TYPE: Release
-      CXXFLAGS: -pedantic -Wextra -Wno-stringop-overread -Werror
+      CXXFLAGS: -pedantic -Wextra -Werror
       PREFIX: /usr/local
       OSMURL: https://download.geofabrik.de/europe/monaco-latest.osm.pbf
       OSMFILE: monaco-latest.osm.pbf
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 566d8b79b..e96d9c49d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,10 @@ else()
     add_compile_options(-Wall)
 endif()
 
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_definitions(-Wno-stringop-overread -Wno-maybe-uninitialized)
+endif()
+
 option(EXTERNAL_LIBOSMIUM "Do not use the bundled libosmium" OFF)
 option(EXTERNAL_PROTOZERO "Do not use the bundled protozero" OFF)
 option(EXTERNAL_FMT       "Do not use the bundled fmt"       OFF)
@@ -67,7 +71,7 @@ endif()
 set(MINIMUM_POSTGRESQL_SERVER_VERSION "11")
 set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "110000")
 
-set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11")
+set(PostgreSQL_ADDITIONAL_VERSIONS "19" "18" "17" "16" "15" "14" "13" "12" "11")
 
 #############################################################
 # Version
@@ -196,7 +200,7 @@ endif()
 
 find_program(LUA_EXE NAMES lua lua5.4 lua5.3 lua5.2 lua5.1)
 
-find_package(Boost 1.50 REQUIRED)
+find_package(Boost CONFIG 1.50 REQUIRED)
 include_directories(SYSTEM ${Boost_INCLUDE_DIR})
 
 find_package(PostgreSQL REQUIRED)