diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 6c160b79..f2d7ef45 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -122,14 +122,12 @@ jobs:
           if [[ "${{ github.ref_type }}" == "tag" ]]; then
             echo "🔎 Checking for @mintel dependencies in package.json..."
             # Extract any @mintel/ version (they should be synced in monorepo)
-            UPSTREAM_VERSION=$(grep -o '"@mintel/.*": "[^"]*"' package.json | grep -v "patch:" | head -n1 | cut -d'"' -f4 | sed 's/[\^~]//')
+            UPSTREAM_VERSION=$(grep -o '"@mintel/.*": "[^"]*"' package.json | grep -v "next-utils" | cut -d'"' -f4 | sed 's/\^//; s/\~//' | sort -V | tail -1)
             TAG_TO_WAIT="v$UPSTREAM_VERSION"
             
             if [[ -n "$UPSTREAM_VERSION" && "$UPSTREAM_VERSION" != "workspace:"* ]]; then
               # 1. Discovery (Works without token for public repositories)
-              REMOTE_URL="https://git.infra.mintel.me/mmintel/at-mintel.git"
-              if [[ -n "$POLL_TOKEN" ]]; then REMOTE_URL="https://${POLL_TOKEN}@git.infra.mintel.me/mmintel/at-mintel.git"; fi
-              UPSTREAM_SHA=$(git ls-remote --tags "$REMOTE_URL" "$TAG_TO_WAIT" | grep "$TAG_TO_WAIT" | tail -n1 | awk '{print $1}')
+              UPSTREAM_SHA=$(git ls-remote --tags https://git.infra.mintel.me/mmintel/at-mintel.git "$TAG_TO_WAIT" | grep "$TAG_TO_WAIT" | tail -n1 | awk '{print $1}')
               
               if [[ -z "$UPSTREAM_SHA" ]]; then
                 echo "❌ Error: Tag $TAG_TO_WAIT not found in mmintel/at-mintel."
diff --git a/next.config.mjs b/next.config.mjs
index 019ed1e1..35ef4142 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -7,7 +7,7 @@ import { withPayload } from '@payloadcms/next/withPayload';
 const isProd = process.env.NODE_ENV === 'production';
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  transpilePackages: ['react-image-crop', '@react-three/fiber'],
+  transpilePackages: ['react-image-crop', '@react-three/fiber', '@mintel/payload-ai'],
   onDemandEntries: {
     // Keep compiled pages/routes in memory for 5 minutes (reduced from 25m to prevent OOM)
     maxInactiveAge: 5 * 60 * 1000,
diff --git a/package.json b/package.json
index c972a70d..7fbc7308 100644
--- a/package.json
+++ b/package.json
@@ -6,11 +6,11 @@
   "dependencies": {
     "@ai-sdk/google": "^3.0.31",
     "@ai-sdk/openai": "^3.0.36",
-    "@mintel/mail": "1.9.11",
-    "@mintel/next-config": "1.9.11",
-    "@mintel/next-feedback": "1.9.11",
-    "@mintel/next-utils": "1.9.11",
-    "@mintel/payload-ai": "1.9.11",
+    "@mintel/mail": "^1.9.17",
+    "@mintel/next-config": "^1.9.17",
+    "@mintel/next-feedback": "^1.9.17",
+    "@mintel/next-utils": "^1.9.17",
+    "@mintel/payload-ai": "^1.9.17",
     "@payloadcms/db-postgres": "^3.77.0",
     "@payloadcms/email-nodemailer": "^3.77.0",
     "@payloadcms/next": "^3.77.0",
@@ -65,8 +65,8 @@
     "@commitlint/config-conventional": "^20.4.0",
     "@cspell/dict-de-de": "^4.1.2",
     "@lhci/cli": "^0.15.1",
-    "@mintel/eslint-config": "1.9.11",
-    "@mintel/tsconfig": "1.9.11",
+    "@mintel/eslint-config": "^1.9.17",
+    "@mintel/tsconfig": "^1.9.17",
     "@next/bundle-analyzer": "^16.1.6",
     "@tailwindcss/cli": "^4.1.18",
     "@tailwindcss/postcss": "^4.1.18",
@@ -160,7 +160,7 @@
     "prepare": "husky",
     "preinstall": "npx only-allow pnpm"
   },
-  "version": "2.3.7",
+  "version": "2.3.8",
   "pnpm": {
     "onlyBuiltDependencies": [
       "@parcel/watcher",
@@ -174,7 +174,7 @@
       "minimatch": ">=10.2.2"
     },
     "patchedDependencies": {
-      "@mintel/payload-ai@1.9.11": "patches/@mintel__payload-ai@1.9.11.patch"
+      "@mintel/payload-ai@1.9.17": "patches/@mintel__payload-ai@1.9.15.patch"
     }
   },
   "browserslist": [