diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index df56eb4683..89e96ce40b 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -270,8 +270,8 @@ jobs:
             ASAN_OPTIONS="detect_leaks=0:abort_on_error=1:print_stacktrace=1:disable_coredump=0:\
           strict_string_checks=1:check_initialization_order=1:strict_init_order=1:detect_stack_use_after_return=0"
             UBSAN_OPTIONS="abort_on_error=1:print_stacktrace=1"
-            CC=gcc
-            RUSTFLAGS="-C linker=gcc"
+            CC=clang
+            RUSTFLAGS="-C linker=clang"
           elif [[ $BUILD_TYPE == "release" ]]; then
             cov_prefix=""
             CARGO_FLAGS="--locked --release"
diff --git a/Makefile b/Makefile
index 19459a3211..d5f1822600 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,8 @@ ifeq ($(BUILD_TYPE),release)
 else ifeq ($(BUILD_TYPE),debug)
 	PG_CONFIGURE_OPTS = --enable-debug --with-openssl --enable-cassert --enable-depend
 	PG_CFLAGS = -O0 -g3 $(CFLAGS)
-	CPPFLAGS = -fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fno-sanitize=alignment -Wno-cast-function-type-strict
-	LDFLAGS = -fsanitize=address -fsanitize=undefined -export-dynamic
-	LD_PRELOAD=$(gcc -print-file-name=libasan.so)
+	CPPFLAGS = -fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fno-sanitize=function -fno-sanitize=alignment -Wno-cast-function-type-strict
+	LDFLAGS = -fsanitize=address -fsanitize=undefined -static-libubsan -static-libasan
 else
 	$(error Bad build type '$(BUILD_TYPE)', see Makefile for options)
 endif