diff --git a/full/Makefile b/full/Makefile
index cdbf4db..c968526 100644
--- a/full/Makefile
+++ b/full/Makefile
@@ -1,8 +1,10 @@
 WASM_OUT_DIR := wasm
 WASM_OUT_NAME := libpg-query
 WASM_MODULE_NAME := PgQueryModule
-LIBPG_QUERY_REPO := https://github.com/pganalyze/libpg_query.git
-LIBPG_QUERY_TAG := 18.0.0
+# LIBPG_QUERY_REPO := https://github.com/pganalyze/libpg_query.git
+# LIBPG_QUERY_TAG := 18.0.0
+LIBPG_QUERY_REPO := https://github.com/constructive-io/libpg_query.git
+LIBPG_QUERY_TAG := 18-constructive
 
 CACHE_DIR := .cache
 
diff --git a/versions/17/Makefile b/versions/17/Makefile
index 6674f7a..2d091cb 100644
--- a/versions/17/Makefile
+++ b/versions/17/Makefile
@@ -6,8 +6,10 @@
 WASM_OUT_DIR := wasm
 WASM_OUT_NAME := libpg-query
 WASM_MODULE_NAME := PgQueryModule
-LIBPG_QUERY_REPO := https://github.com/pganalyze/libpg_query.git
-LIBPG_QUERY_TAG := 17-6.1.0
+# LIBPG_QUERY_REPO := https://github.com/pganalyze/libpg_query.git
+# LIBPG_QUERY_TAG := 17-6.1.0
+LIBPG_QUERY_REPO := https://github.com/constructive-io/libpg_query.git
+LIBPG_QUERY_TAG := 17-constructive
 
 CACHE_DIR := .cache
 
diff --git a/versions/18/Makefile b/versions/18/Makefile
index b66d7d4..27bec91 100644
--- a/versions/18/Makefile
+++ b/versions/18/Makefile
@@ -6,8 +6,10 @@
 WASM_OUT_DIR := wasm
 WASM_OUT_NAME := libpg-query
 WASM_MODULE_NAME := PgQueryModule
-LIBPG_QUERY_REPO := https://github.com/pganalyze/libpg_query.git
-LIBPG_QUERY_TAG := 18.0.0
+# LIBPG_QUERY_REPO := https://github.com/pganalyze/libpg_query.git
+# LIBPG_QUERY_TAG := 18.0.0
+LIBPG_QUERY_REPO := https://github.com/constructive-io/libpg_query.git
+LIBPG_QUERY_TAG := 18-constructive
 
 CACHE_DIR := .cache