diff --git a/.github/workflows/postgres-extension-ci.yml b/.github/workflows/postgres-extension-ci.yml
index 16e0de9d..57d6d4f0 100644
--- a/.github/workflows/postgres-extension-ci.yml
+++ b/.github/workflows/postgres-extension-ci.yml
@@ -27,15 +27,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        pg_version: [14, 15, 16, 17, 18]
+        pg_version: [14, 15, 16, 17]
         rust: [stable]
         include:
-          # Test on macOS for pg16 and pg18
+          # Test on macOS for pg16 and pg17
           - os: macos-latest
             pg_version: 16
             rust: stable
           - os: macos-latest
-            pg_version: 18
+            pg_version: 17
             rust: stable
 
     services:
diff --git a/crates/ruvector-postgres/Cargo.toml b/crates/ruvector-postgres/Cargo.toml
index 5b399941..5d7d6187 100644
--- a/crates/ruvector-postgres/Cargo.toml
+++ b/crates/ruvector-postgres/Cargo.toml
@@ -22,7 +22,7 @@ pg14 = ["pgrx/pg14", "pgrx-tests/pg14"]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
 pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
 pg17 = ["pgrx/pg17", "pgrx-tests/pg17"]
-pg18 = ["pgrx/pg18", "pgrx-tests/pg18"]
+# Note: pg18 requires pgrx 0.15.0+ (planned for future release)
 pg_test = []
 
 # SIMD features for compile-time selection
diff --git a/crates/ruvector-postgres/docker/Dockerfile b/crates/ruvector-postgres/docker/Dockerfile
index 58d98ee2..7fd2bfd5 100644
--- a/crates/ruvector-postgres/docker/Dockerfile
+++ b/crates/ruvector-postgres/docker/Dockerfile
@@ -1,8 +1,9 @@
 # RuVector-Postgres Development & Testing Dockerfile
-# Multi-stage build with PostgreSQL version support (14-18)
-# Default: PostgreSQL 18 (latest stable)
+# Multi-stage build with PostgreSQL version support (14-17)
+# Default: PostgreSQL 17 (latest with pgrx 0.12 support)
+# Note: PostgreSQL 18 requires pgrx 0.15.0+ (planned for future release)
 
-ARG PG_VERSION=18
+ARG PG_VERSION=17
 
 # ============================================================================
 # Builder Stage