diff --git a/documentation/OpenAPI.md b/documentation/OpenAPI.md
index 415050c1..35194223 100644
--- a/documentation/OpenAPI.md
+++ b/documentation/OpenAPI.md
@@ -40,7 +40,7 @@ Install the `openapi-generator-cli`:
 
 ```bash
 npm install @openapitools/openapi-generator-cli -g
-openapi-generator-cli version-manager set 6.6.0
+openapi-generator-cli version-manager set 7.8.0
 ```
 
 Use the `openapi-generator-cli` from the root of this repository:
diff --git a/node/common/package.json b/node/common/package.json
index 8d40ce16..df57c92e 100644
--- a/node/common/package.json
+++ b/node/common/package.json
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@types/uuid": "^8.3.4",
-    "axios": "^0.27.2",
+    "axios": "^1.6.1",
     "uuid": "^8.3.2"
   }
 }
diff --git a/node/common/src/client.ts b/node/common/src/client.ts
index b7ee7131..9717d4f4 100644
--- a/node/common/src/client.ts
+++ b/node/common/src/client.ts
@@ -1,14 +1,25 @@
+/* eslint-disable indent */
 import { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { v4 as uuidv4 } from 'uuid';
 
 import {
   LaunchRequest as ClientLaunchRequest,
-  PingRequest as ClientPingRequest, RootResourceApi, SessionActivityRequest as ClientSessionActivityRequest, SessionListRequest as ClientSessionListRequest,
-  SessionPerformance, SessionPerformanceRequest as ClientSessionPerformanceRequest,
-  SessionResourceApi, SessionSpec, SessionStartRequest as ClientSessionStartRequest, SessionStopRequest as ClientSessionStopRequest,
-  UserWorkspace, WorkspaceCreationRequest as ClientWorkspaceCreationRequest,
-  WorkspaceDeletionRequest as ClientWorkspaceDeletionRequest, WorkspaceListRequest as ClientWorkspaceListRequest,
-  WorkspaceResourceApi } from './client/api';
+  PingRequest as ClientPingRequest,
+  RootResourceApi,
+  SessionActivityRequest as ClientSessionActivityRequest,
+  SessionListRequest as ClientSessionListRequest,
+  SessionPerformance,
+  SessionPerformanceRequest as ClientSessionPerformanceRequest,
+  SessionResourceApi,
+  SessionSpec,
+  SessionStartRequest as ClientSessionStartRequest,
+  SessionStopRequest as ClientSessionStopRequest,
+  UserWorkspace,
+  WorkspaceCreationRequest as ClientWorkspaceCreationRequest,
+  WorkspaceDeletionRequest as ClientWorkspaceDeletionRequest,
+  WorkspaceListRequest as ClientWorkspaceListRequest,
+  WorkspaceResourceApi
+} from './client/api';
 import { Configuration } from './client/configuration';
 
 export const DEFAULT_CALL_TIMEOUT = 30000;
@@ -44,17 +55,37 @@ export type LaunchRequest = ClientLaunchRequest & ServiceRequest;
 export namespace LaunchRequest {
   export const KIND = 'launchRequest';
 
-  export function ephemeral(serviceUrl: string, appId: string, appDefinition: string, timeout?: number, user: string = createUser()): LaunchRequest {
+  export function ephemeral(
+    serviceUrl: string,
+    appId: string,
+    appDefinition: string,
+    timeout?: number,
+    user: string = createUser()
+  ): LaunchRequest {
     return { serviceUrl, appId, appDefinition, user, ephemeral: true, timeout };
   }
 
-  export function createWorkspace(serviceUrl: string, appId: string, appDefinition: string, timeout?: number, user: string = createUser(),
-    workspaceName?: string, label?: string): LaunchRequest {
+  export function createWorkspace(
+    serviceUrl: string,
+    appId: string,
+    appDefinition: string,
+    timeout?: number,
+    user: string = createUser(),
+    workspaceName?: string,
+    label?: string
+  ): LaunchRequest {
     return { serviceUrl, appId, appDefinition, user, label, workspaceName, ephemeral: false, timeout };
   }
 
   // eslint-disable-next-line max-len
-  export function existingWorkspace(serviceUrl: string, appId: string, workspaceName: string, timeout?: number, appDefinition?: string, user: string = createUser()): LaunchRequest {
+  export function existingWorkspace(
+    serviceUrl: string,
+    appId: string,
+    workspaceName: string,
+    timeout?: number,
+    appDefinition?: string,
+    user: string = createUser()
+  ): LaunchRequest {
     return { serviceUrl, appId, workspaceName, appDefinition, user, timeout };
   }
 }
@@ -114,13 +145,19 @@ export namespace TheiaCloud {
 
   export async function ping(request: PingRequest, options: RequestOptions = {}): Promise<boolean> {
     const { accessToken, retries, timeout } = options;
-    return call(() => rootApi(request.serviceUrl, accessToken).serviceAppIdGet(request.appId, createConfig(timeout)), retries);
+    return call(
+      () => rootApi(request.serviceUrl, accessToken).serviceAppIdGet(request.appId, createConfig(timeout)),
+      retries
+    );
   }
 
   export async function launch(request: LaunchRequest, options: RequestOptions = {}): Promise<string> {
     const { accessToken, retries, timeout } = options;
     const launchRequest = { kind: LaunchRequest.KIND, ...request };
-    return call(() => rootApi(request.serviceUrl, accessToken).servicePost(launchRequest, createConfig(timeout)), retries);
+    return call(
+      () => rootApi(request.serviceUrl, accessToken).servicePost(launchRequest, createConfig(timeout)),
+      retries
+    );
   }
 
   export async function launchAndRedirect(request: LaunchRequest, options: RequestOptions = {}): Promise<string> {
@@ -131,54 +168,122 @@ export namespace TheiaCloud {
   }
 
   export namespace Session {
-    export async function listSessions(request: SessionListRequest, options: RequestOptions = {}): Promise<SessionSpec[]> {
+    export async function listSessions(
+      request: SessionListRequest,
+      options: RequestOptions = {}
+    ): Promise<SessionSpec[]> {
       const { accessToken, retries, timeout } = options;
-      return call(() => sessionApi(request.serviceUrl, accessToken).serviceSessionAppIdUserGet(request.appId, request.user, createConfig(timeout)), retries);
+      return call(
+        () =>
+          sessionApi(request.serviceUrl, accessToken).serviceSessionAppIdUserGet(
+            request.appId,
+            request.user,
+            createConfig(timeout)
+          ),
+        retries
+      );
     }
 
     export async function startSession(request: SessionStartRequest, options: RequestOptions = {}): Promise<string> {
       const { accessToken, retries, timeout } = options;
       const sessionStartRequest = { kind: SessionStartRequest.KIND, ...request };
-      return call(() => sessionApi(request.serviceUrl, accessToken).serviceSessionPost(sessionStartRequest, createConfig(timeout)), retries);
+      return call(
+        () =>
+          sessionApi(request.serviceUrl, accessToken).serviceSessionPost(sessionStartRequest, createConfig(timeout)),
+        retries
+      );
     }
 
     export async function stopSession(request: SessionStopRequest, options: RequestOptions = {}): Promise<boolean> {
       const { accessToken, retries, timeout } = options;
       const sessionStopRequest = { kind: SessionStopRequest.KIND, ...request };
-      return call(() => sessionApi(request.serviceUrl, accessToken).serviceSessionDelete(sessionStopRequest, createConfig(timeout)), retries);
+      return call(
+        () =>
+          sessionApi(request.serviceUrl, accessToken).serviceSessionDelete(sessionStopRequest, createConfig(timeout)),
+        retries
+      );
     }
 
-    export async function reportSessionActivity(request: SessionActivityRequest, options: RequestOptions = {}): Promise<boolean> {
+    export async function reportSessionActivity(
+      request: SessionActivityRequest,
+      options: RequestOptions = {}
+    ): Promise<boolean> {
       const { accessToken, retries, timeout } = options;
       const sessionActivityRequest = { kind: SessionActivityRequest.KIND, ...request };
-      return call(() => sessionApi(request.serviceUrl, accessToken).serviceSessionPatch(sessionActivityRequest, createConfig(timeout)), retries);
+      return call(
+        () =>
+          sessionApi(request.serviceUrl, accessToken).serviceSessionPatch(
+            sessionActivityRequest,
+            createConfig(timeout)
+          ),
+        retries
+      );
     }
 
-    export async function getSessionPerformance(request: SessionPerformanceRequest, options: RequestOptions = {}): Promise<SessionPerformance> {
+    export async function getSessionPerformance(
+      request: SessionPerformanceRequest,
+      options: RequestOptions = {}
+    ): Promise<SessionPerformance> {
       const { accessToken, retries, timeout } = options;
       return call(
-        () => sessionApi(request.serviceUrl, accessToken).serviceSessionPerformanceAppIdSessionNameGet(request.appId, request.sessionName, createConfig(timeout)),
+        () =>
+          sessionApi(request.serviceUrl, accessToken).serviceSessionPerformanceAppIdSessionNameGet(
+            request.appId,
+            request.sessionName,
+            createConfig(timeout)
+          ),
         retries
       );
     }
   }
 
   export namespace Workspace {
-    export async function listWorkspaces(request: WorkspaceListRequest, options: RequestOptions = {}): Promise<UserWorkspace[]> {
+    export async function listWorkspaces(
+      request: WorkspaceListRequest,
+      options: RequestOptions = {}
+    ): Promise<UserWorkspace[]> {
       const { accessToken, retries, timeout } = options;
-      return call(() => workspaceApi(request.serviceUrl, accessToken).serviceWorkspaceAppIdUserGet(request.appId, request.user, createConfig(timeout)), retries);
+      return call(
+        () =>
+          workspaceApi(request.serviceUrl, accessToken).serviceWorkspaceAppIdUserGet(
+            request.appId,
+            request.user,
+            createConfig(timeout)
+          ),
+        retries
+      );
     }
 
-    export async function createWorkspace(request: WorkspaceCreationRequest, options: RequestOptions = {}): Promise<UserWorkspace> {
+    export async function createWorkspace(
+      request: WorkspaceCreationRequest,
+      options: RequestOptions = {}
+    ): Promise<UserWorkspace> {
       const { accessToken, retries, timeout } = options;
       const workspaceCreationRequest = { kind: WorkspaceCreationRequest.KIND, ...request };
-      return call(() => workspaceApi(request.serviceUrl, accessToken).serviceWorkspacePost(workspaceCreationRequest, createConfig(timeout)), retries);
+      return call(
+        () =>
+          workspaceApi(request.serviceUrl, accessToken).serviceWorkspacePost(
+            workspaceCreationRequest,
+            createConfig(timeout)
+          ),
+        retries
+      );
     }
 
-    export async function deleteWorkspace(request: WorkspaceDeletionRequest, options: RequestOptions = {}): Promise<boolean> {
+    export async function deleteWorkspace(
+      request: WorkspaceDeletionRequest,
+      options: RequestOptions = {}
+    ): Promise<boolean> {
       const { accessToken, retries, timeout } = options;
       const workspaceDeletionRequest = { kind: WorkspaceDeletionRequest.KIND, ...request };
-      return call(() => workspaceApi(request.serviceUrl, accessToken).serviceWorkspaceDelete(workspaceDeletionRequest, createConfig(timeout)), retries);
+      return call(
+        () =>
+          workspaceApi(request.serviceUrl, accessToken).serviceWorkspaceDelete(
+            workspaceDeletionRequest,
+            createConfig(timeout)
+          ),
+        retries
+      );
     }
   }
 }
@@ -218,7 +323,13 @@ export namespace TheiaCloudErrorResponse {
 export class TheiaCloudError extends Error {
   static INTERNAL_ERROR = 500;
 
-  constructor(message: string, public status: number, public originalError: Error, public serverError?: TheiaCloudErrorResponse, public request?: ServiceRequest) {
+  constructor(
+    message: string,
+    public status: number,
+    public originalError: Error,
+    public serverError?: TheiaCloudErrorResponse,
+    public request?: ServiceRequest
+  ) {
     super(message);
   }
 
@@ -228,14 +339,21 @@ export class TheiaCloudError extends Error {
       const errorResponse = TheiaCloudErrorResponse.is(responseData) ? responseData : undefined;
       const message = errorResponse ? errorResponse.reason : error.message;
 
-      const requestData = typeof error.config.data === 'string' ? JSON.parse(error.config.data) : error.config.data;
-      const serviceRequest = ServiceRequest.is(requestData) ? requestData : undefined;
-
-      const status = error.status ? parseInt(error.status, 10)
-        : error.response ? error.response.status
-          : errorResponse ? errorResponse.code
-            : TheiaCloudError.INTERNAL_ERROR;
-      return new TheiaCloudError(message, status, error, errorResponse, serviceRequest);
+      const status = error.status
+        ? error.status
+        : error.response
+        ? error.response.status
+        : errorResponse
+        ? errorResponse.code
+        : TheiaCloudError.INTERNAL_ERROR;
+
+      if (error.config === undefined) {
+        return new TheiaCloudError(message, status, error, errorResponse);
+      } else {
+        const requestData = typeof error.config.data === 'string' ? JSON.parse(error.config.data) : error.config.data;
+        const serviceRequest = ServiceRequest.is(requestData) ? requestData : undefined;
+        return new TheiaCloudError(message, status, error, errorResponse, serviceRequest);
+      }
     }
     return new TheiaCloudError(error.message, TheiaCloudError.INTERNAL_ERROR, error);
   }
diff --git a/node/common/src/client/api.ts b/node/common/src/client/api.ts
index 9122cda5..fbcd72b3 100644
--- a/node/common/src/client/api.ts
+++ b/node/common/src/client/api.ts
@@ -14,14 +14,14 @@
 
 
 import type { Configuration } from './configuration';
-import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
+import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 // Some imports not used depending on template conditions
 // @ts-ignore
 import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common';
 import type { RequestArgs } from './base';
 // @ts-ignore
-import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base';
+import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from './base';
 
 /**
  * An object to hold all the ways environment variables can be passed. Not to be used by itself.
@@ -97,36 +97,11 @@ export interface LaunchRequest {
      */
     'timeout'?: number;
     /**
-     * 
-     * @type {LaunchRequestEnv}
+     * Environment variables
+     * @type {EnvironmentVars}
      * @memberof LaunchRequest
      */
-    'env'?: LaunchRequestEnv;
-}
-/**
- * Environment variables
- * @export
- * @interface LaunchRequestEnv
- */
-export interface LaunchRequestEnv {
-    /**
-     * Map of environment variables to be passed to Deployment.  Ignored if Theia applications are started eagerly.  Empty by default.
-     * @type {{ [key: string]: string; }}
-     * @memberof LaunchRequestEnv
-     */
-    'fromMap'?: { [key: string]: string; };
-    /**
-     * List of ConfigMaps (by name) containing environment variables to be passed to Deployment as envFrom.configMapRef.  Ignored if Theia applications are started eagerly.  Empty by default.
-     * @type {Array<string>}
-     * @memberof LaunchRequestEnv
-     */
-    'fromConfigMaps'?: Array<string>;
-    /**
-     * List of Secrets (by name) containing environment variables to be passed to Deployment as envFrom.secretRef.  Ignored if Theia applications are started eagerly.  Empty by default.
-     * @type {Array<string>}
-     * @memberof LaunchRequestEnv
-     */
-    'fromSecrets'?: Array<string>;
+    'env'?: EnvironmentVars;
 }
 /**
  * Request to ping the availability of the service.
@@ -327,11 +302,11 @@ export interface SessionStartRequest {
      */
     'timeout'?: number;
     /**
-     * 
-     * @type {LaunchRequestEnv}
+     * Environment variables
+     * @type {EnvironmentVars}
      * @memberof SessionStartRequest
      */
-    'env'?: LaunchRequestEnv;
+    'env'?: EnvironmentVars;
 }
 /**
  * A request to stop a session
@@ -484,7 +459,7 @@ export const RootResourceApiAxiosParamCreator = function (configuration?: Config
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceAppIdGet: async (appId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceAppIdGet: async (appId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'appId' is not null or undefined
             assertParamExists('serviceAppIdGet', 'appId', appId)
             const localVarPath = `/service/{appId}`
@@ -522,7 +497,7 @@ export const RootResourceApiAxiosParamCreator = function (configuration?: Config
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        servicePost: async (launchRequest?: LaunchRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        servicePost: async (launchRequest?: LaunchRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/service`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -570,9 +545,11 @@ export const RootResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceAppIdGet(appId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<boolean>> {
+        async serviceAppIdGet(appId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<boolean>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceAppIdGet(appId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['RootResourceApi.serviceAppIdGet']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Launches a session and creates a workspace if required. Responds with the URL of the launched session.
@@ -581,9 +558,11 @@ export const RootResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async servicePost(launchRequest?: LaunchRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+        async servicePost(launchRequest?: LaunchRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.servicePost(launchRequest, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['RootResourceApi.servicePost']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -602,7 +581,7 @@ export const RootResourceApiFactory = function (configuration?: Configuration, b
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceAppIdGet(appId: string, options?: any): AxiosPromise<boolean> {
+        serviceAppIdGet(appId: string, options?: RawAxiosRequestConfig): AxiosPromise<boolean> {
             return localVarFp.serviceAppIdGet(appId, options).then((request) => request(axios, basePath));
         },
         /**
@@ -612,7 +591,7 @@ export const RootResourceApiFactory = function (configuration?: Configuration, b
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        servicePost(launchRequest?: LaunchRequest, options?: any): AxiosPromise<string> {
+        servicePost(launchRequest?: LaunchRequest, options?: RawAxiosRequestConfig): AxiosPromise<string> {
             return localVarFp.servicePost(launchRequest, options).then((request) => request(axios, basePath));
         },
     };
@@ -633,7 +612,7 @@ export class RootResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof RootResourceApi
      */
-    public serviceAppIdGet(appId: string, options?: AxiosRequestConfig) {
+    public serviceAppIdGet(appId: string, options?: RawAxiosRequestConfig) {
         return RootResourceApiFp(this.configuration).serviceAppIdGet(appId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -645,12 +624,13 @@ export class RootResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof RootResourceApi
      */
-    public servicePost(launchRequest?: LaunchRequest, options?: AxiosRequestConfig) {
+    public servicePost(launchRequest?: LaunchRequest, options?: RawAxiosRequestConfig) {
         return RootResourceApiFp(this.configuration).servicePost(launchRequest, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * SessionResourceApi - axios parameter creator
  * @export
@@ -665,7 +645,7 @@ export const SessionResourceApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionAppIdUserGet: async (appId: string, user: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceSessionAppIdUserGet: async (appId: string, user: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'appId' is not null or undefined
             assertParamExists('serviceSessionAppIdUserGet', 'appId', appId)
             // verify required parameter 'user' is not null or undefined
@@ -706,7 +686,7 @@ export const SessionResourceApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionDelete: async (sessionStopRequest?: SessionStopRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceSessionDelete: async (sessionStopRequest?: SessionStopRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/service/session`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -744,7 +724,7 @@ export const SessionResourceApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionPatch: async (sessionActivityRequest?: SessionActivityRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceSessionPatch: async (sessionActivityRequest?: SessionActivityRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/service/session`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -783,7 +763,7 @@ export const SessionResourceApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionPerformanceAppIdSessionNameGet: async (appId: string, sessionName: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceSessionPerformanceAppIdSessionNameGet: async (appId: string, sessionName: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'appId' is not null or undefined
             assertParamExists('serviceSessionPerformanceAppIdSessionNameGet', 'appId', appId)
             // verify required parameter 'sessionName' is not null or undefined
@@ -824,7 +804,7 @@ export const SessionResourceApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionPost: async (sessionStartRequest?: SessionStartRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceSessionPost: async (sessionStartRequest?: SessionStartRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/service/session`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -873,9 +853,11 @@ export const SessionResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceSessionAppIdUserGet(appId: string, user: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<SessionSpec>>> {
+        async serviceSessionAppIdUserGet(appId: string, user: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<SessionSpec>>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceSessionAppIdUserGet(appId, user, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['SessionResourceApi.serviceSessionAppIdUserGet']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Stops a session.
@@ -884,9 +866,11 @@ export const SessionResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceSessionDelete(sessionStopRequest?: SessionStopRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<boolean>> {
+        async serviceSessionDelete(sessionStopRequest?: SessionStopRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<boolean>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceSessionDelete(sessionStopRequest, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['SessionResourceApi.serviceSessionDelete']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Updates the last activity timestamp for a session to monitor activity.
@@ -895,9 +879,11 @@ export const SessionResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceSessionPatch(sessionActivityRequest?: SessionActivityRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<boolean>> {
+        async serviceSessionPatch(sessionActivityRequest?: SessionActivityRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<boolean>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceSessionPatch(sessionActivityRequest, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['SessionResourceApi.serviceSessionPatch']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Returns the current CPU and memory usage of the session\'s pod.
@@ -907,9 +893,11 @@ export const SessionResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceSessionPerformanceAppIdSessionNameGet(appId: string, sessionName: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SessionPerformance>> {
+        async serviceSessionPerformanceAppIdSessionNameGet(appId: string, sessionName: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SessionPerformance>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceSessionPerformanceAppIdSessionNameGet(appId, sessionName, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['SessionResourceApi.serviceSessionPerformanceAppIdSessionNameGet']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Starts a new session for an existing workspace and responds with the URL of the started session.
@@ -918,9 +906,11 @@ export const SessionResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceSessionPost(sessionStartRequest?: SessionStartRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+        async serviceSessionPost(sessionStartRequest?: SessionStartRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceSessionPost(sessionStartRequest, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['SessionResourceApi.serviceSessionPost']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -940,7 +930,7 @@ export const SessionResourceApiFactory = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionAppIdUserGet(appId: string, user: string, options?: any): AxiosPromise<Array<SessionSpec>> {
+        serviceSessionAppIdUserGet(appId: string, user: string, options?: RawAxiosRequestConfig): AxiosPromise<Array<SessionSpec>> {
             return localVarFp.serviceSessionAppIdUserGet(appId, user, options).then((request) => request(axios, basePath));
         },
         /**
@@ -950,7 +940,7 @@ export const SessionResourceApiFactory = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionDelete(sessionStopRequest?: SessionStopRequest, options?: any): AxiosPromise<boolean> {
+        serviceSessionDelete(sessionStopRequest?: SessionStopRequest, options?: RawAxiosRequestConfig): AxiosPromise<boolean> {
             return localVarFp.serviceSessionDelete(sessionStopRequest, options).then((request) => request(axios, basePath));
         },
         /**
@@ -960,7 +950,7 @@ export const SessionResourceApiFactory = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionPatch(sessionActivityRequest?: SessionActivityRequest, options?: any): AxiosPromise<boolean> {
+        serviceSessionPatch(sessionActivityRequest?: SessionActivityRequest, options?: RawAxiosRequestConfig): AxiosPromise<boolean> {
             return localVarFp.serviceSessionPatch(sessionActivityRequest, options).then((request) => request(axios, basePath));
         },
         /**
@@ -971,7 +961,7 @@ export const SessionResourceApiFactory = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionPerformanceAppIdSessionNameGet(appId: string, sessionName: string, options?: any): AxiosPromise<SessionPerformance> {
+        serviceSessionPerformanceAppIdSessionNameGet(appId: string, sessionName: string, options?: RawAxiosRequestConfig): AxiosPromise<SessionPerformance> {
             return localVarFp.serviceSessionPerformanceAppIdSessionNameGet(appId, sessionName, options).then((request) => request(axios, basePath));
         },
         /**
@@ -981,7 +971,7 @@ export const SessionResourceApiFactory = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceSessionPost(sessionStartRequest?: SessionStartRequest, options?: any): AxiosPromise<string> {
+        serviceSessionPost(sessionStartRequest?: SessionStartRequest, options?: RawAxiosRequestConfig): AxiosPromise<string> {
             return localVarFp.serviceSessionPost(sessionStartRequest, options).then((request) => request(axios, basePath));
         },
     };
@@ -1003,7 +993,7 @@ export class SessionResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SessionResourceApi
      */
-    public serviceSessionAppIdUserGet(appId: string, user: string, options?: AxiosRequestConfig) {
+    public serviceSessionAppIdUserGet(appId: string, user: string, options?: RawAxiosRequestConfig) {
         return SessionResourceApiFp(this.configuration).serviceSessionAppIdUserGet(appId, user, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -1015,7 +1005,7 @@ export class SessionResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SessionResourceApi
      */
-    public serviceSessionDelete(sessionStopRequest?: SessionStopRequest, options?: AxiosRequestConfig) {
+    public serviceSessionDelete(sessionStopRequest?: SessionStopRequest, options?: RawAxiosRequestConfig) {
         return SessionResourceApiFp(this.configuration).serviceSessionDelete(sessionStopRequest, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -1027,7 +1017,7 @@ export class SessionResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SessionResourceApi
      */
-    public serviceSessionPatch(sessionActivityRequest?: SessionActivityRequest, options?: AxiosRequestConfig) {
+    public serviceSessionPatch(sessionActivityRequest?: SessionActivityRequest, options?: RawAxiosRequestConfig) {
         return SessionResourceApiFp(this.configuration).serviceSessionPatch(sessionActivityRequest, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -1040,7 +1030,7 @@ export class SessionResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SessionResourceApi
      */
-    public serviceSessionPerformanceAppIdSessionNameGet(appId: string, sessionName: string, options?: AxiosRequestConfig) {
+    public serviceSessionPerformanceAppIdSessionNameGet(appId: string, sessionName: string, options?: RawAxiosRequestConfig) {
         return SessionResourceApiFp(this.configuration).serviceSessionPerformanceAppIdSessionNameGet(appId, sessionName, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -1052,12 +1042,13 @@ export class SessionResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SessionResourceApi
      */
-    public serviceSessionPost(sessionStartRequest?: SessionStartRequest, options?: AxiosRequestConfig) {
+    public serviceSessionPost(sessionStartRequest?: SessionStartRequest, options?: RawAxiosRequestConfig) {
         return SessionResourceApiFp(this.configuration).serviceSessionPost(sessionStartRequest, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * WorkspaceResourceApi - axios parameter creator
  * @export
@@ -1072,7 +1063,7 @@ export const WorkspaceResourceApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceWorkspaceAppIdUserGet: async (appId: string, user: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceWorkspaceAppIdUserGet: async (appId: string, user: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'appId' is not null or undefined
             assertParamExists('serviceWorkspaceAppIdUserGet', 'appId', appId)
             // verify required parameter 'user' is not null or undefined
@@ -1113,7 +1104,7 @@ export const WorkspaceResourceApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceWorkspaceDelete: async (workspaceDeletionRequest?: WorkspaceDeletionRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceWorkspaceDelete: async (workspaceDeletionRequest?: WorkspaceDeletionRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/service/workspace`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -1151,7 +1142,7 @@ export const WorkspaceResourceApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceWorkspacePost: async (workspaceCreationRequest?: WorkspaceCreationRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        serviceWorkspacePost: async (workspaceCreationRequest?: WorkspaceCreationRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/service/workspace`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -1200,9 +1191,11 @@ export const WorkspaceResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceWorkspaceAppIdUserGet(appId: string, user: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserWorkspace>>> {
+        async serviceWorkspaceAppIdUserGet(appId: string, user: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserWorkspace>>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceWorkspaceAppIdUserGet(appId, user, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['WorkspaceResourceApi.serviceWorkspaceAppIdUserGet']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Deletes a workspace.
@@ -1211,9 +1204,11 @@ export const WorkspaceResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceWorkspaceDelete(workspaceDeletionRequest?: WorkspaceDeletionRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<boolean>> {
+        async serviceWorkspaceDelete(workspaceDeletionRequest?: WorkspaceDeletionRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<boolean>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceWorkspaceDelete(workspaceDeletionRequest, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['WorkspaceResourceApi.serviceWorkspaceDelete']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Creates a new workspace for a user.
@@ -1222,9 +1217,11 @@ export const WorkspaceResourceApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async serviceWorkspacePost(workspaceCreationRequest?: WorkspaceCreationRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserWorkspace>> {
+        async serviceWorkspacePost(workspaceCreationRequest?: WorkspaceCreationRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserWorkspace>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.serviceWorkspacePost(workspaceCreationRequest, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['WorkspaceResourceApi.serviceWorkspacePost']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -1244,7 +1241,7 @@ export const WorkspaceResourceApiFactory = function (configuration?: Configurati
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceWorkspaceAppIdUserGet(appId: string, user: string, options?: any): AxiosPromise<Array<UserWorkspace>> {
+        serviceWorkspaceAppIdUserGet(appId: string, user: string, options?: RawAxiosRequestConfig): AxiosPromise<Array<UserWorkspace>> {
             return localVarFp.serviceWorkspaceAppIdUserGet(appId, user, options).then((request) => request(axios, basePath));
         },
         /**
@@ -1254,7 +1251,7 @@ export const WorkspaceResourceApiFactory = function (configuration?: Configurati
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceWorkspaceDelete(workspaceDeletionRequest?: WorkspaceDeletionRequest, options?: any): AxiosPromise<boolean> {
+        serviceWorkspaceDelete(workspaceDeletionRequest?: WorkspaceDeletionRequest, options?: RawAxiosRequestConfig): AxiosPromise<boolean> {
             return localVarFp.serviceWorkspaceDelete(workspaceDeletionRequest, options).then((request) => request(axios, basePath));
         },
         /**
@@ -1264,7 +1261,7 @@ export const WorkspaceResourceApiFactory = function (configuration?: Configurati
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        serviceWorkspacePost(workspaceCreationRequest?: WorkspaceCreationRequest, options?: any): AxiosPromise<UserWorkspace> {
+        serviceWorkspacePost(workspaceCreationRequest?: WorkspaceCreationRequest, options?: RawAxiosRequestConfig): AxiosPromise<UserWorkspace> {
             return localVarFp.serviceWorkspacePost(workspaceCreationRequest, options).then((request) => request(axios, basePath));
         },
     };
@@ -1286,7 +1283,7 @@ export class WorkspaceResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof WorkspaceResourceApi
      */
-    public serviceWorkspaceAppIdUserGet(appId: string, user: string, options?: AxiosRequestConfig) {
+    public serviceWorkspaceAppIdUserGet(appId: string, user: string, options?: RawAxiosRequestConfig) {
         return WorkspaceResourceApiFp(this.configuration).serviceWorkspaceAppIdUserGet(appId, user, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -1298,7 +1295,7 @@ export class WorkspaceResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof WorkspaceResourceApi
      */
-    public serviceWorkspaceDelete(workspaceDeletionRequest?: WorkspaceDeletionRequest, options?: AxiosRequestConfig) {
+    public serviceWorkspaceDelete(workspaceDeletionRequest?: WorkspaceDeletionRequest, options?: RawAxiosRequestConfig) {
         return WorkspaceResourceApiFp(this.configuration).serviceWorkspaceDelete(workspaceDeletionRequest, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -1310,9 +1307,10 @@ export class WorkspaceResourceApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof WorkspaceResourceApi
      */
-    public serviceWorkspacePost(workspaceCreationRequest?: WorkspaceCreationRequest, options?: AxiosRequestConfig) {
+    public serviceWorkspacePost(workspaceCreationRequest?: WorkspaceCreationRequest, options?: RawAxiosRequestConfig) {
         return WorkspaceResourceApiFp(this.configuration).serviceWorkspacePost(workspaceCreationRequest, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
diff --git a/node/common/src/client/base.ts b/node/common/src/client/base.ts
index b413614a..eea5e2fd 100644
--- a/node/common/src/client/base.ts
+++ b/node/common/src/client/base.ts
@@ -16,7 +16,7 @@
 import type { Configuration } from './configuration';
 // Some imports not used depending on template conditions
 // @ts-ignore
-import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
+import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 
 export const BASE_PATH = "http://localhost".replace(/\/+$/, "");
@@ -39,7 +39,7 @@ export const COLLECTION_FORMATS = {
  */
 export interface RequestArgs {
     url: string;
-    options: AxiosRequestConfig;
+    options: RawAxiosRequestConfig;
 }
 
 /**
@@ -53,7 +53,7 @@ export class BaseAPI {
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
         if (configuration) {
             this.configuration = configuration;
-            this.basePath = configuration.basePath || this.basePath;
+            this.basePath = configuration.basePath ?? basePath;
         }
     }
 };
@@ -70,3 +70,17 @@ export class RequiredError extends Error {
         this.name = "RequiredError"
     }
 }
+
+interface ServerMap {
+    [key: string]: {
+        url: string,
+        description: string,
+    }[];
+}
+
+/**
+ *
+ * @export
+ */
+export const operationServerMap: ServerMap = {
+}
diff --git a/node/common/src/client/common.ts b/node/common/src/client/common.ts
index ef7a9b22..378f5d5f 100644
--- a/node/common/src/client/common.ts
+++ b/node/common/src/client/common.ts
@@ -144,7 +144,7 @@ export const toPathString = function (url: URL) {
  */
 export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
     return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-        const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
+        const axiosRequestArgs = {...axiosArgs.options, url: (axios.defaults.baseURL ? '' : configuration?.basePath ?? basePath) + axiosArgs.url};
         return axios.request<T, R>(axiosRequestArgs);
     };
 }
diff --git a/node/common/src/client/configuration.ts b/node/common/src/client/configuration.ts
index 42258f32..f4fac408 100644
--- a/node/common/src/client/configuration.ts
+++ b/node/common/src/client/configuration.ts
@@ -19,6 +19,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
     basePath?: string;
+    serverIndex?: number;
     baseOptions?: any;
     formDataCtor?: new () => any;
 }
@@ -58,6 +59,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * override server index
+     *
+     * @type {number}
+     * @memberof Configuration
+     */
+    serverIndex?: number;
     /**
      * base options for axios calls
      *
@@ -80,6 +88,7 @@ export class Configuration {
         this.password = param.password;
         this.accessToken = param.accessToken;
         this.basePath = param.basePath;
+        this.serverIndex = param.serverIndex;
         this.baseOptions = param.baseOptions;
         this.formDataCtor = param.formDataCtor;
     }
diff --git a/node/monitor/package-lock.json b/node/monitor/package-lock.json
index d62713e4..6bf3948e 100644
--- a/node/monitor/package-lock.json
+++ b/node/monitor/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.12.0-next",
       "license": "EPL-2.0",
       "dependencies": {
-        "express": "^4.18.1",
+        "express": "^4.19.2",
         "express-formidable": "^1.2.0"
       },
       "devDependencies": {
@@ -1056,12 +1056,12 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -1069,7 +1069,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -1378,9 +1378,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -1969,16 +1969,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -3508,9 +3508,9 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
diff --git a/node/monitor/package.json b/node/monitor/package.json
index a58ebceb..d76abed4 100644
--- a/node/monitor/package.json
+++ b/node/monitor/package.json
@@ -39,7 +39,7 @@
     "update:demo:monitor": "npm run build:vsix && rm ../../demo/dockerfiles/demo-theia-monitor-vscode/*vsix && mv *.vsix ../../demo/dockerfiles/demo-theia-monitor-vscode"
   },
   "dependencies": {
-    "express": "^4.18.1",
+    "express": "^4.19.2",
     "express-formidable": "^1.2.0"
   },
   "devDependencies": {
@@ -55,4 +55,4 @@
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0"
   }
-}
\ No newline at end of file
+}
diff --git a/node/package-lock.json b/node/package-lock.json
index d4009038..957b285e 100644
--- a/node/package-lock.json
+++ b/node/package-lock.json
@@ -38,7 +38,7 @@
       "license": "EPL-2.0",
       "dependencies": {
         "@types/uuid": "^8.3.4",
-        "axios": "^0.27.2",
+        "axios": "^1.6.1",
         "uuid": "^8.3.2"
       }
     },
@@ -7521,13 +7521,13 @@
       }
     },
     "node_modules/axios": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-      "license": "MIT",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
       "dependencies": {
-        "follow-redirects": "^1.14.9",
-        "form-data": "^4.0.0"
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
     "node_modules/axobject-query": {
@@ -16216,18 +16216,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/nano/node_modules/axios": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
-      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
     "node_modules/nano/node_modules/qs": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
@@ -18784,8 +18772,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/ps-tree": {
       "version": "1.2.0",