diff --git a/Dockerfile b/Dockerfile
index b529275..bb29e3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,9 @@
 ARG PG_VERSION=17
 ARG PGVECTOR_VERSION=0.8.0
 ARG POSTGIS_VERSION=3.5.1
-ARG PG_TEXTSEARCH_VERSION=0.6.0
+# Pin to main branch commit that includes the ResourceOwnerEnlarge crash fix (PR #248)
+# No tagged release includes this fix yet (latest release is v0.5.1)
+ARG PG_TEXTSEARCH_COMMIT=ad4f8328780367526fce8997207fa701ef4d014d
 
 #############################################
 # Stage 1: Build extensions
@@ -13,7 +15,7 @@ FROM postgres:${PG_VERSION}-alpine AS builder
 
 ARG PGVECTOR_VERSION
 ARG POSTGIS_VERSION
-ARG PG_TEXTSEARCH_VERSION
+ARG PG_TEXTSEARCH_COMMIT
 
 RUN apk add --no-cache \
     git \
@@ -54,8 +56,11 @@ RUN curl -L https://download.osgeo.org/postgis/source/postgis-${POSTGIS_VERSION}
     make install
 
 # pg_textsearch (BM25)
-RUN git clone --branch v${PG_TEXTSEARCH_VERSION} --depth 1 https://github.com/timescale/pg_textsearch.git && \
+# Build from main at a specific commit to include the ResourceOwnerEnlarge
+# crash fix (PR #248, issue #247). No tagged release includes this fix yet.
+RUN git clone https://github.com/timescale/pg_textsearch.git && \
     cd pg_textsearch && \
+    git checkout ${PG_TEXTSEARCH_COMMIT} && \
     make -j$(nproc) && \
     make install
 
diff --git a/Makefile b/Makefile
index 2d36ed8..2b399f4 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ test: build
 		CREATE EXTENSION vector; \
 		CREATE EXTENSION postgis; \
 		CREATE EXTENSION pg_textsearch; \
-		CREATE EXTENSION pgsodium; \
 		SELECT 'all extensions OK';"
 	@docker stop $(CONTAINER_NAME)-test > /dev/null
 	@docker rm $(CONTAINER_NAME)-test > /dev/null