diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index 6e56cb400..26411337e 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 20
 
     env:
diff --git a/cmake/re-config.cmake b/cmake/re-config.cmake
index 426a79db4..c45216800 100644
--- a/cmake/re-config.cmake
+++ b/cmake/re-config.cmake
@@ -55,7 +55,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 else()
   check_symbol_exists(res_ninit resolv.h HAVE_RESOLV)
 endif()
-if(HAVE_RESOLV)
+if(HAVE_RESOLV AND ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+  list(APPEND RE_DEFINITIONS HAVE_RESOLV)
+  set(RESOLV_LIBRARY) # Provided by libc
+elseif(HAVE_RESOLV)
   set(RESOLV_LIBRARY resolv)
   list(APPEND RE_DEFINITIONS HAVE_RESOLV)
 else()