diff --git a/full/Makefile b/full/Makefile
index c968526..e328467 100644
--- a/full/Makefile
+++ b/full/Makefile
@@ -2,9 +2,9 @@ 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_TAG := 17-6.1.0
 LIBPG_QUERY_REPO := https://github.com/constructive-io/libpg_query.git
-LIBPG_QUERY_TAG := 18-constructive
+LIBPG_QUERY_TAG := 17-constructive
 
 CACHE_DIR := .cache
 
diff --git a/full/README.md b/full/README.md
index 72b5940..2091d08 100644
--- a/full/README.md
+++ b/full/README.md
@@ -300,7 +300,7 @@ pnpm run test
 
 ## Versions
 
-Built with the `18-latest` branch from libpg_query (tag `18.0.0`), based on PostgreSQL 18.
+Built from the `17-constructive` branch of [constructive-io/libpg_query](https://github.com/constructive-io/libpg_query) (PostgreSQL 17, with PL/pgSQL serializer fixes).
 
 
 ## Troubleshooting
diff --git a/full/package.json b/full/package.json
index 6848207..74e41cd 100644
--- a/full/package.json
+++ b/full/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@libpg-query/parser",
-  "version": "17.6.9",
+  "version": "17.6.10",
   "description": "The real PostgreSQL query parser",
   "homepage": "https://github.com/constructive-io/libpg-query-node",
   "main": "./wasm/index.cjs",
@@ -34,7 +34,7 @@
     "@yamlize/cli": "^0.8.0"
   },
   "dependencies": {
-    "@pgsql/types": "^18.0.0"
+    "@pgsql/types": "^17.6.2"
   },
   "keywords": [
     "sql",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 15c62e7..712b71b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -75,8 +75,8 @@ importers:
   full:
     dependencies:
       '@pgsql/types':
-        specifier: ^18.0.0
-        version: 18.0.0
+        specifier: ^17.6.2
+        version: 17.6.2
     devDependencies:
       '@yamlize/cli':
         specifier: ^0.8.0