diff --git a/ct/tandoor.sh b/ct/tandoor.sh
index e58c03f2d..6d6132d9a 100644
--- a/ct/tandoor.sh
+++ b/ct/tandoor.sh
@@ -42,7 +42,7 @@ function update_script() {
     mv /opt/tandoor /opt/tandoor.bak
     msg_ok "Backup Created"
 
-    NODE_VERSION="20" NODE_MODULE="yarn" setup_nodejs
+    NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
     PYTHON_VERSION="3.13" setup_uv
     fetch_and_deploy_gh_release "tandoor" "TandoorRecipes/recipes" "tarball" "latest" "/opt/tandoor"
 
diff --git a/install/tandoor-install.sh b/install/tandoor-install.sh
index 0f0b84f97..2e606b5c6 100644
--- a/install/tandoor-install.sh
+++ b/install/tandoor-install.sh
@@ -30,9 +30,9 @@ $STD apt-get install -y --no-install-recommends \
   libxmlsec1-openssl
 msg_ok "Installed Dependencies"
 
-NODE_VERSION="20" NODE_MODULE="yarn" setup_nodejs
+NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
 fetch_and_deploy_gh_release "tandoor" "TandoorRecipes/recipes" "tarball" "latest" "/opt/tandoor"
-PG_VERSION="16" setup_postgresql
+PG_VERSION="17" PG_MODULES="contrib" setup_postgresql
 PYTHON_VERSION="3.13" setup_uv
 
 msg_info "Set up PostgreSQL Database"
@@ -45,6 +45,8 @@ $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER TEMP
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET client_encoding TO 'utf8';"
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET default_transaction_isolation TO 'read committed';"
 $STD sudo -u postgres psql -c "ALTER ROLE $DB_USER SET timezone TO 'UTC'"
+$STD sudo -u postgres psql -d "$DB_NAME" -c "CREATE EXTENSION IF NOT EXISTS unaccent;"
+$STD sudo -u postgres psql -d "$DB_NAME" -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
 {
   echo "Tandoor-Credentials"
   echo "Tandoor Database Name: $DB_NAME"