diff --git a/Dockerfile b/Dockerfile
index 4555836..9ea8fff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,19 @@ RUN \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# Install pg_search extension
+ARG PG_SEARCH_VERSION=0.18.8
+# There is no trixie version, so wie install an additional version of libicu
+RUN \
+    curl -o pg-search.deb -L https://github.com/paradedb/paradedb/releases/download/v${PG_SEARCH_VERSION}/postgresql-${PG_MAJOR}-pg-search_${PG_SEARCH_VERSION}-1PARADEDB-bookworm_amd64.deb && \
+    dpkg -i pg-search.deb && \
+    echo "shared_preload_libraries='pg_search'" >> /usr/share/postgresql/postgresql.conf.sample && \
+    rm pg-search.deb
+RUN \
+    curl -o libicu72.deb -L http://ftp.de.debian.org/debian/pool/main/i/icu/libicu72_72.1-6_amd64.deb && \
+    dpkg -i libicu72.deb && \
+    rm libicu72.deb
+
 # Setup database
 # script to create DB, roles, grants etc
 COPY setup-roles-and-db.sh /docker-entrypoint-initdb.d/0_setup-db.sh
diff --git a/README.md b/README.md
index b620e5f..5848bb8 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ These images are designed to be configured in a `docker-compose.yml` as follows
 Note:
 
 * **You need to set a non-empty `POSTGRES_PASSWORD` ENV variable**.
-* You can set passwords for roles in `qwc_services` database with ENV variables: `QGIS_SERVER_PASSWORD`, `QWC_ADMIN_PASSWORD`, `QWC_SERVICE_PASSWORD`, `QWC_SERVICE_WRITE_PASSWORD`. These variables have default values (`qgis_server`, `qwc_admin`, `qwc_service`, `qwc_service_write`).
+* You can set passwords for roles in `qwc_services` database with ENV variables: `QWC_ADMIN_PASSWORD`, `QWC_SERVICE_PASSWORD`, `QWC_SERVICE_WRITE_PASSWORD`. These variables have default values (`qgis_server`, `qwc_admin`, `qwc_service`, `qwc_service_write`).
 * For persistent storage, mount folder volume to `/var/lib/postgresql/docker`.
 * The `sourcepole/qwc-base-db` images are versioned according to the Postgres major version (i.e. 13, 14, 15, ...).
 * The `sourcepole/qwc-base-db-migrate` images are versioned by date (`vYYYY.MM.DD`)
@@ -65,7 +65,7 @@ By default, the DB specified by the `qwc_configdb` connection will be upgraded.
 
 You can use an external DB instead of the `qwc-base-db` dockerized DB.
 
-To set up the external DB, set passwords for roles with ENV variables (`QGIS_SERVER_PASSWORD`, `QWC_ADMIN_PASSWORD`, `QWC_SERVICE_PASSWORD`, `QWC_SERVICE_WRITE_PASSWORD`) and run the SQL commands in `setup-roles-and-db.sh` on your external DB.
+To set up the external DB, set passwords for roles with ENV variables (`QWC_ADMIN_PASSWORD`, `QWC_SERVICE_PASSWORD`, `QWC_SERVICE_WRITE_PASSWORD`) and run the SQL commands in `setup-roles-and-db.sh` on your external DB.
 
 To apply the migrations, both as part as the initial setup and subsequently to keep the Config DB up-to-date: