diff --git a/.github/workflows/build_servers_cmake.yml b/.github/workflows/build_servers_cmake.yml
index e037dd4e65..adfc7448ca 100644
--- a/.github/workflows/build_servers_cmake.yml
+++ b/.github/workflows/build_servers_cmake.yml
@@ -46,4 +46,4 @@ jobs:
       - name: Build
         working-directory: ${{github.workspace}}/build
         # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: cmake --build .
+        run: cmake --build . --target server tools
diff --git a/src/tool/CMakeLists.txt b/src/tool/CMakeLists.txt
index 31182df069..e0c9d547f6 100644
--- a/src/tool/CMakeLists.txt
+++ b/src/tool/CMakeLists.txt
@@ -37,3 +37,5 @@ if(WIN32)
 		"yaml.hpp"
 	)
 endif()
+
+add_custom_target(tools DEPENDS mapcache csv2yaml yaml2sql yamlupgrade map-server-generator)