diff --git a/contrib/pg_search/Dockerfile b/contrib/pg_search/Dockerfile
new file mode 100644
index 00000000..e50eb9ab
--- /dev/null
+++ b/contrib/pg_search/Dockerfile
@@ -0,0 +1,28 @@
+ARG PG_VERSION=15
+FROM quay.io/coredb/pgrx-builder:pg${PG_VERSION}-pgrx0.9.7
+USER root
+
+ARG RELEASE=v0.2.21
+
+# Extension build dependencies
+RUN apt-get update && apt-get install -y \
+	build-essential
+
+# Install Rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+# Set default Rust version
+RUN /root/.cargo/bin/rustup default stable && /root/.cargo/bin/rustup override set 1.73.0
+
+# Clone repository
+RUN git clone https://github.com/paradedb/paradedb.git && \
+	cd paradedb && \
+    git fetch --tags && \
+    git fetch --depth 1 origin tag ${RELEASE} && \
+    git checkout ${RELEASE}
+
+# Build the extension
+RUN cd paradedb && \
+	cd pg_search && \
+    cargo pgrx init --pg15 /usr/bin/pg_config && \
+    cargo pgrx package
diff --git a/contrib/pg_search/Trunk.toml b/contrib/pg_search/Trunk.toml
new file mode 100644
index 00000000..47639c5e
--- /dev/null
+++ b/contrib/pg_search/Trunk.toml
@@ -0,0 +1,22 @@
+[extension]
+name = "pg_search"
+version = "0.4.0"
+repository = "https://github.com/paradedb/paradedb/tree/dev/pg_search"
+license = "AGPL-3.0"
+description = "Hybrid search for PostgreSQL"
+homepage = "https://www.paradedb.com/"
+documentation = "https://github.com/paradedb/paradedb/tree/dev/pg_search"
+categories = ["search"]
+
+[dependencies]
+apt = ["libc6"]
+
+[build]
+postgres_version = "15"
+platform = "linux/amd64"
+dockerfile = "Dockerfile"
+install_command = """
+    cd paradedb/
+    mv target/release/pg_search-pg15/usr/lib/postgresql/15/lib/* /usr/lib/postgresql/15/lib
+    mv target/release/pg_search-pg15/usr/share/postgresql/15/extension/* /usr/share/postgresql/15/extension
+"""