diff --git a/Makefile b/Makefile
index 3c0ac05..3e4b928 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ MINIMUM_DUCKDB_VERSION=v0.0.1
 all: configure debug
 
 # Include makefiles from DuckDB
-include extension-ci-tools/makefiles/duckdb_extension_c_api.Makefile
-include extension-ci-tools/makefiles/duckdb_extension_rs.Makefile
+include extension-ci-tools/makefiles/c_api_extensions/base.Makefile
+include extension-ci-tools/makefiles/c_api_extensions/rust.Makefile
 
 configure: venv platform extension_version
 
diff --git a/extension-ci-tools b/extension-ci-tools
index d3a5766..871db4d 160000
--- a/extension-ci-tools
+++ b/extension-ci-tools
@@ -1 +1 @@
-Subproject commit d3a57666450bbf38e72711fddd7beffd85635998
+Subproject commit 871db4d06e0d71769f737fb16301b287b25351cc