diff --git a/.env.example b/.env.example
index 86db571..be1ec9c 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,5 @@
 PUBLIC_ENVIRONMENT=env
+OAUTH2_AUTH_URL=/oauth2/auth
 LOCAL_BEAM_SECRET_SPOT=spot_pwd
 LOCAL_BEAM_ID=cce-site-name
 BROKER_HOST=cce-broker
diff --git a/docker-compose.yml b/docker-compose.yml
index 26afa21..cd2d6c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,8 @@ services:
     ports:
       - "3000:3000"
     environment:
-      # PUBLIC_ENVIRONMENT: ${PUBLIC_ENVIRONMENT}
+      PUBLIC_ENVIRONMENT: ${PUBLIC_ENVIRONMENT}
+      PUBLIC_OAUTH2_AUTH_URL: ${OAUTH2_AUTH_URL:-}
       PUBLIC_SPOT_URL: http://localhost:8055
 
   spot:
diff --git a/package-lock.json b/package-lock.json
index 2a97484..e8791f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "cce-explorer",
       "version": "0.0.1",
       "dependencies": {
-        "@samply/lens": "^0.6.4",
+        "@samply/lens": "^0.6.6",
         "uuid": "^13.0.0"
       },
       "devDependencies": {
@@ -1195,9 +1195,9 @@
       ]
     },
     "node_modules/@samply/lens": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@samply/lens/-/lens-0.6.4.tgz",
-      "integrity": "sha512-ycICFGpGW/z4Eu8BGDztAN1UD7M2WOZumfOvUlQduBT2NtmG5vJsK0UQDklcQEK5XVpjTsliCTlykisHSVVViw==",
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/@samply/lens/-/lens-0.6.6.tgz",
+      "integrity": "sha512-5yBUMShqcodD7DEx3QYIHWFgQbGaOLc16ynKtXt7pU9rb4tL5fv1GKXDF4gHzzVZi/LEil9zPD0KPgY7C0m/5w==",
       "license": "Apache-2.0",
       "dependencies": {
         "ajv": "^8.17.1",
@@ -1207,9 +1207,9 @@
       }
     },
     "node_modules/@samply/lens/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
+      "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -1277,6 +1277,7 @@
       "integrity": "sha512-1in76dftrofUt138rVLvYuwiQLkg9K3cG8agXEE6ksf7gCGs8oIr3+pFrVtbRmY9JvW+psW5fvLM/IwVybOLBA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
         "@sveltejs/acorn-typescript": "^1.0.5",
@@ -1319,6 +1320,7 @@
       "integrity": "sha512-ou/d51QSdTyN26D7h6dSpusAKaZkAiGM55/AKYi+9AGZw7q85hElbjK3kEyzXHhLSnRISHOYzVge6x0jRZ7DXA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0",
         "deepmerge": "^4.3.1",
@@ -1432,6 +1434,7 @@
       "integrity": "sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.56.0",
         "@typescript-eslint/types": "8.56.0",
@@ -1662,6 +1665,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2043,6 +2047,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/devalue": {
       "version": "5.6.3",
       "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.6.3.tgz",
@@ -2111,6 +2126,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -2842,6 +2858,237 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/lightningcss-android-arm64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
+      "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-arm64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
+      "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-x64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
+      "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-freebsd-x64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
+      "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm-gnueabihf": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
+      "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-gnu": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
+      "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-musl": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
+      "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-gnu": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
+      "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-musl": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
+      "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-arm64-msvc": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
+      "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-x64-msvc": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
+      "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/lilconfig": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -3129,6 +3376,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -3262,6 +3510,7 @@
       "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -3353,6 +3602,7 @@
       "integrity": "sha512-jVG20NvbhTYDkGAty2/Yh7HK6/q3DGSRH4o8ALKGArmMuaauM9kLfoMZ+WliPwA5+JHr2lTn3g557FxBV87ifg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -3520,6 +3770,7 @@
       "integrity": "sha512-7dhHkSamGS2vtoBmIW2hRab+gl5Z60alEHZB4910ePqqJNxAWnDAxsofVmlZ2tREmWyHNE+A1nCKwICAquoD2A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jridgewell/remapping": "^2.3.4",
         "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -3655,6 +3906,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -3723,6 +3975,7 @@
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
diff --git a/package.json b/package.json
index e5468ae..aadcd86 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "vite": "^7.3.1"
   },
   "dependencies": {
-    "@samply/lens": "^0.6.4",
+    "@samply/lens": "^0.6.6",
     "uuid": "^13.0.0"
   }
 }
diff --git a/src/App.svelte b/src/App.svelte
index e4ebecb..376f383 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -13,10 +13,11 @@
   import { v4 as uuidv4 } from "uuid";
   import { VITAL_STATUS_LOINC_CODE } from "$lib/constants";
   import { negotiate } from "./lib/project-manager";
-  import { options } from "./lib/env-options";
   import { onMount } from "svelte";
   import { SvelteMap } from "svelte/reactivity";
   import catalogueProd from "./config/catalogue.json";
+  import optionsProd from "./config/options.json";
+  import optionsTest from "./config/options-test.json";
   import { env } from "$env/dynamic/public";
 
   let abortController = new AbortController();
@@ -125,8 +126,13 @@
   });
 
   onMount(() => {
-    let newoptions: LensOptions = options;
-    newoptions.spotUrl = env.PUBLIC_SPOT_URL;
+    let options: LensOptions = optionsProd;
+    if (env.PUBLIC_ENVIRONMENT === "test") {
+      options = optionsTest;
+    }
+    if (env.PUBLIC_SPOT_URL) {
+      options.spotUrl = env.PUBLIC_SPOT_URL;
+    }
     setOptions(options);
 
     // Set the catalogue based on the environment
@@ -186,31 +192,31 @@
   <div class="header-wrapper">
     <div class="logo">
       <a href="https://www.gustaveroussy.fr/" target="_blank">
-        <img src="../logo-CCE-GR.jpg" alt="Gustave Roussy" />
+        <img src="logo-CCE-GR.jpg" alt="Gustave Roussy" />
       </a>
     </div>
     <div class="logo">
       <a href="https://ki.se/en/" target="_blank">
-        <img src="../logo-CCE-KI.svg" alt="Karlosinska Institutet" />
+        <img src="logo-CCE-KI.svg" alt="Karlosinska Institutet" />
       </a>
     </div>
     <div class="logo">
       <a href="https://vhio.net/es/inicio/" target="_blank">
         <img
-          src="../logo-CCE-VHIO.png"
+          src="logo-CCE-VHIO.png"
           alt="Vall d’Hebron Instituto de Oncología"
         />
       </a>
     </div>
     <div class="logo">
       <a href="https://www.nki.nl/" target="_blank">
-        <img src="../logo-CCE-NKI.svg" alt="Netherlands Cancer Institute" />
+        <img src="logo-CCE-NKI.svg" alt="Netherlands Cancer Institute" />
       </a>
     </div>
     <div class="logo">
       <a href="https://www.istitutotumori.mi.it/" target="_blank">
         <img
-          src="../logo-CCE-INT.jpg"
+          src="logo-CCE-INT.jpg"
           alt="Fondazione IRCCS Istituto Nazionale dei Tumori"
         />
       </a>
@@ -218,14 +224,14 @@
     <div class="logo">
       <a href="https://crukcambridgecentre.org.uk/" target="_blank">
         <img
-          src="../logo-CCE-CRUK.png"
+          src="logo-CCE-CRUK.png"
           alt="Cancer Research UK Cambridge Centre"
         />
       </a>
     </div>
     <div class="logo">
       <a href="https://www.dkfz.de/en/" target="_blank">
-        <img src="../logo-CCE-DKFZ.svg" alt="German Cancer Research Center" />
+        <img src="logo-CCE-DKFZ.svg" alt="German Cancer Research Center" />
       </a>
     </div>
     <h1>CCE VDC Explorer</h1>
@@ -269,10 +275,8 @@
     <div class="charts">
       <div class="chart-wrapper result-summary">
         <lens-result-summary></lens-result-summary>
-        {#if options.projectManagerOptions}
-          <lens-negotiate-button
-            type="ProjectManager"
-            title="Data and sample requests"
+        {#if env.PUBLIC_ENVIRONMENT === "test"}
+          <lens-negotiate-button type="ProjectManager" title="Request Data"
           ></lens-negotiate-button>
         {/if}
         <lens-search-modified-display>
diff --git a/src/config/options-test.json b/src/config/options-test.json
index 7d74131..dcde6a7 100644
--- a/src/config/options-test.json
+++ b/src/config/options-test.json
@@ -2,14 +2,38 @@
   "language": "en",
   "siteMappings": {
     "proxy2": "proxy2",
-    "cce-dkfz": "🇩🇪 German Cancer Research Center (Test)",
-    "cce-dkfz-nct": "🇩🇪 German Cancer Research Center",
-    "cce-gr": "🇫🇷 Gustave Roussy",
-    "cce-ki": "🇸🇪 Karolinska Institutet",
-    "cce-nki": "🇳🇱 Netherlands Cancer Institute",
-    "cce-vhio": "🇪🇸 Vall d'Hebron Institute of Oncology",
-    "cce-cruk-cc": "🇬🇧 Cancer Research UK Cambridge Center (Prod)",
-    "cce-cruk-cc-dev": "🇬🇧 Cancer Research UK Cambridge Center"
+    "cce-dkfz": {
+      "displayName": "🇩🇪 German Cancer Research Center (Test)",
+      "collectionId": "lens-cce-dkfz"
+    },
+    "cce-master": {
+      "displayName": "🇩🇪 German Cancer Research Center",
+      "collectionId": "lens-cce-dkfz-nct"
+    },
+    "cce-gr": {
+      "displayName": "🇫🇷 Gustave Roussy",
+      "collectionId": "lens-cce-gr"
+    },
+    "cce-ki": {
+      "displayName": "🇸🇪 Karolinska Institutet",
+      "collectionId": "lens-cce-ki"
+    },
+    "cce-nki": {
+      "displayName": "🇳🇱 Netherlands Cancer Institute",
+      "collectionId": "lens-cce-nki"
+    },
+    "cce-vhio": {
+      "displayName": "🇪🇸 Vall d'Hebron Institute of Oncology",
+      "collectionId": "lens-cce-vhio"
+    },
+    "cce-cruk-cc": {
+      "displayName": "🇬🇧 Cancer Research UK Cambridge Center (Prod)",
+      "collectionId": "lens-cce-cruk-cc"
+    },
+    "cce-cruk-cc-dev": {
+      "displayName": "🇬🇧 Cancer Research UK Cambridge Center",
+      "collectionId": "lens-cce-cruk-cc-dev"
+    }
   },
   "chartOptions": {
     "gender": {
@@ -66,5 +90,9 @@
         "dataKey": "diagnosis"
       }
     ]
+  },
+  "projectManagerOptions": {
+    "newProjectUrl": "https://cce-central.vms.verbis.dkfz.de/requester-api/create-query-and-design-project",
+    "editProjectUrl": "https://cce-central.vms.verbis.dkfz.de/requester-api/project/edit"
   }
 }
diff --git a/src/config/options.json b/src/config/options.json
index ea00be8..efa7d31 100644
--- a/src/config/options.json
+++ b/src/config/options.json
@@ -1,7 +1,7 @@
 {
   "language": "en",
   "siteMappings": {
-    "cce-dkfz-nct": "🇩🇪 German Cancer Research Center",
+    "cce-master": "🇩🇪 German Cancer Research Center",
     "cce-gr": "🇫🇷 Gustave Roussy",
     "cce-ki": "🇸🇪 Karolinska Institutet",
     "cce-nki": "🇳🇱 Netherlands Cancer Institute",
diff --git a/src/lib/options.ts b/src/lib/options.ts
index 4833b39..2009b45 100644
--- a/src/lib/options.ts
+++ b/src/lib/options.ts
@@ -8,13 +8,7 @@ export type Options = LensOptions & {
   projectManagerOptions?: ProjectManagerOptions;
 };
 
-export type ProjectManagerOptionsSiteMapping = {
-  site: string;
-  collection: string;
-};
-
 export type ProjectManagerOptions = {
   newProjectUrl: string;
   editProjectUrl: string;
-  siteMappings: ProjectManagerOptionsSiteMapping[];
 };
diff --git a/src/lib/project-manager.ts b/src/lib/project-manager.ts
index 35a4d4c..147b81c 100644
--- a/src/lib/project-manager.ts
+++ b/src/lib/project-manager.ts
@@ -3,12 +3,10 @@ import {
   getQueryStore,
   getSelectedSites,
   getHumanReadableQuery,
+  getOptions,
 } from "@samply/lens";
-import { options } from "./env-options";
-import type {
-  ProjectManagerOptions,
-  ProjectManagerOptionsSiteMapping,
-} from "$lib/options";
+import { env } from "$env/dynamic/public";
+import { v4 as uuidv4 } from "uuid";
 
 type PmBody = {
   query: string;
@@ -17,139 +15,178 @@ type PmBody = {
   "human-readable": string;
   "project-code": string;
   "explorer-url": string;
+  "query-details": string;
 };
 
 type ProjectManagerResponse = Response & {
   redirect_uri?: string;
 };
 
+type ProjectManagerOptions = {
+  newProjectUrl: string;
+  editProjectUrl: string;
+};
+
+function isProjectManagerOptions(obj: unknown): obj is ProjectManagerOptions {
+  return (
+    typeof obj === "object" &&
+    obj !== null &&
+    "newProjectUrl" in obj &&
+    "editProjectUrl" in obj &&
+    typeof obj.newProjectUrl === "string" &&
+    typeof obj.editProjectUrl === "string"
+  );
+}
+
 export const negotiate = async (): Promise<void> => {
-  if (options.projectManagerOptions === undefined) {
-    console.error('"projectManagerOptions" is missing from the options');
+  const options = getOptions();
+  if (
+    !options ||
+    !isProjectManagerOptions(options.projectManagerOptions) ||
+    !options.siteMappings
+  ) {
+    console.error("Project Manager options not set");
     return;
   }
 
-  const humanReadable: string = getHumanReadableQuery();
-  const collections = options.projectManagerOptions.siteMappings.filter(
-    (mapping) => getSelectedSites().includes(mapping.site),
-  );
-
-  const response: ProjectManagerResponse = await sendRequestToProjectManager(
-    options.projectManagerOptions,
+  const humanReadable = getHumanReadableQuery();
+  const selectedSites = getSelectedSites();
+  const collectionIds = Object.entries(options.siteMappings)
+    .filter(([siteId]) => selectedSites.includes(siteId))
+    .map(([, siteInfo]) =>
+      typeof siteInfo === "object" ? siteInfo.collectionId : undefined,
+    )
+    .filter((collectionId) => collectionId !== undefined);
+
+  const response = await sendRequestToProjectManager(
+    options.projectManagerOptions.editProjectUrl,
+    options.projectManagerOptions.newProjectUrl,
     humanReadable,
-    collections,
+    collectionIds,
+    selectedSites,
   );
 
   if (!response.redirect_uri) {
-    console.error("ProjectManager response does not contain redirect uri");
+    console.error("Project Manager response does not contain a redirect URI");
     return;
   }
 
   window.location.href = response.redirect_uri;
 };
 
-/**
- * handle redirect to project manager url
- */
-//     // project manager
-
-/**
- * @param currentProjectManagerOptions the current project manager options
- * @param humanReadable a human readable query string to view in the negotiator project
- * @param collections the collections to negotiate with
- * @returns a promise containing the response from the project manager. The response contains the redirect uri
- */
 async function sendRequestToProjectManager(
-  currentProjectManagerOptions: ProjectManagerOptions,
+  editProjectUrl: string,
+  newProjectUrl: string,
   humanReadable: string,
-  collections: ProjectManagerOptionsSiteMapping[],
+  collectionIds: string[],
+  selectedSites: string[],
 ): Promise<ProjectManagerResponse> {
-  /**
-   * get temporary token from oauth2
-   */
-  let temporaryToken: string | null = "";
-
-  try {
-    const res = await fetch(`/oauth2/auth`, {
-      method: "GET",
-      credentials: "include",
-    });
-
-    temporaryToken = res.headers.get("Authorization");
-  } catch (error) {
-    console.log("error", error);
-    return new Response() as Response & { redirect_uri: string };
+  let temporaryToken: string | null = null;
+
+  if (env.PUBLIC_OAUTH2_AUTH_URL) {
+    try {
+      const response = await fetch(env.PUBLIC_OAUTH2_AUTH_URL, {
+        method: "GET",
+        credentials: "include",
+      });
+      temporaryToken = response.headers.get("Authorization");
+    } catch (error) {
+      console.error("Failed to obtain an OAuth token", error);
+      return new Response() as ProjectManagerResponse;
+    }
   }
 
-  const negotiationPartners = collections
-    .map((collection) => collection.collection.toLocaleLowerCase())
-    .join(",");
-  const returnURL: string = `${window.location.protocol}//${window.location.host}/?collections=${negotiationPartners}`;
-  const urlParams: URLSearchParams = new URLSearchParams(
-    window.location.search,
+  const negotiationPartners = collectionIds.join(",");
+  const urlParams = new URLSearchParams(window.location.search);
+  const projectCode = urlParams.get("project-code");
+  const returnUrl = buildExplorerUrl(
+    negotiationPartners,
+    selectedSites,
+    projectCode,
   );
-
-  const projectCode: string | null = urlParams.get("project-code");
-  const negotiateUrl = projectCode
-    ? currentProjectManagerOptions.editProjectUrl
-    : currentProjectManagerOptions.newProjectUrl;
-
-  let response!: ProjectManagerResponse;
-
-  /**
-   * send request to project manager
-   * Explorer IDS = Options Struktur = lens-<standortname>
-   */
-
-  const pmRequestUrl = `${negotiateUrl}`;
+  const projectManagerUrl = projectCode ? editProjectUrl : newProjectUrl;
+  const headers: Record<string, string> = {
+    returnAccept: "application/json; charset=utf-8",
+    "Content-Type": "application/json",
+  };
+  if (temporaryToken) {
+    headers.Authorization = temporaryToken;
+  }
 
   try {
-    response = await fetch(pmRequestUrl, {
-      method: "POST",
-      headers: {
-        returnAccept: "application/json; charset=utf-8",
-        "Content-Type": "application/json",
-        Authorization: temporaryToken ? temporaryToken : "",
-      },
-      body: buildPMBody(
+    return await fetch(projectManagerUrl, {
+      method: projectCode ? "PUT" : "POST",
+      headers,
+      body: buildProjectManagerBody(
         humanReadable,
         negotiationPartners,
-        returnURL,
-        projectCode ? projectCode : "",
+        returnUrl,
+        projectCode ?? "",
       ),
     }).then((response) => response.json());
-
-    return response;
   } catch (error) {
-    console.log("error", error);
+    console.error("Project Manager request failed", error);
     return new Response() as ProjectManagerResponse;
   }
 }
 
-/**
- * @param humanReadable the human readable string of the query
- * @param negotiationPartners all the selected sites in a string with , separated
- * @param returnURL the url to return to lens
- * @param projectCode if the project already exists
- * @returns a base64 encoded CQL query
- */
-function buildPMBody(
+function buildProjectManagerBody(
   humanReadable: string,
   negotiationPartners: string,
-  returnURL: string,
+  returnUrl: string,
   projectCode: string,
 ): string {
+  const base64Encode = (utf8String: string) =>
+    btoa(String.fromCharCode(...new TextEncoder().encode(utf8String)));
+
+  const queryDetails = base64Encode(JSON.stringify(getQueryStore()));
   const body: PmBody = {
-    query: JSON.stringify(getAst()),
+    query: base64Encode(
+      JSON.stringify({
+        lang: "ast",
+        payload: base64Encode(JSON.stringify({ ast: getAst(), id: uuidv4() })),
+      }),
+    ),
     "explorer-ids": negotiationPartners,
-    "query-format": "CQL_DATA",
+    "query-format": "AST_DATA",
     "human-readable": humanReadable,
     "project-code": projectCode,
-    "explorer-url":
-      returnURL +
-      projectCode +
-      "&query=" +
-      btoa(JSON.stringify(getQueryStore())),
+    "explorer-url": addQueryToExplorerUrl(returnUrl, queryDetails),
+    "query-details": queryDetails,
   };
+
   return JSON.stringify(body);
 }
+
+/**
+ * Build the URL used to return from Project Manager. Lens restores the selected
+ * bridgeheads from the base64-encoded `datarequests` URL parameter.
+ */
+function buildExplorerUrl(
+  negotiationPartners: string,
+  selectedSites: string[],
+  projectCode: string | null,
+): string {
+  const url = new URL(window.location.pathname, window.location.origin);
+  url.searchParams.set("collections", negotiationPartners);
+  url.searchParams.set(
+    "datarequests",
+    btoa(
+      String.fromCharCode(
+        ...new TextEncoder().encode(JSON.stringify(selectedSites)),
+      ),
+    ),
+  );
+
+  if (projectCode) {
+    url.searchParams.set("project-code", projectCode);
+  }
+
+  return url.toString();
+}
+
+function addQueryToExplorerUrl(returnUrl: string, query: string): string {
+  const url = new URL(returnUrl);
+  url.searchParams.set("query", query);
+  return url.toString();
+}
diff --git a/svelte.config.js b/svelte.config.js
index bbef2bb..4b88cae 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -12,6 +12,9 @@ const config = {
     // If your environment is not supported, or you settled on a specific environment, switch out the adapter.
     // See https://svelte.dev/docs/kit/adapters for more information about adapters.
     adapter: adapter(),
+    paths: {
+      base: "/lens",
+    },
   },
 };