diff --git a/app/components/Launcher.vue b/app/components/Launcher.vue
index 297bb88b..16000629 100644
--- a/app/components/Launcher.vue
+++ b/app/components/Launcher.vue
@@ -5,22 +5,16 @@
   import { useInfraStore } from "@ogw_front/stores/infra"
 
   const infraStore = useInfraStore()
-
-  watch(
-    () => infraStore.is_captcha_validated,
-    (value, oldValue) => {
-      if (value && !oldValue && import.meta.client) {
-        infraStore.create_backend()
-      }
-    },
-  )
+  if (infraStore.app_mode !== appMode.CLOUD) {
+    infraStore.create_backend()
+  }
 </script>
 
 <template>
   <v-container class="justify">
     <v-row align-content="center" align="center">
       <v-col
-        v-if="!infraStore.is_captcha_validated"
+        v-if="!infraStore.status == Status.NOT_CREATED"
         class="align"
         cols="12"
         align-self="center"
diff --git a/app/components/Recaptcha.vue b/app/components/Recaptcha.vue
index cc5501d2..9ea7ce24 100644
--- a/app/components/Recaptcha.vue
+++ b/app/components/Recaptcha.vue
@@ -1,9 +1,6 @@
 <script setup>
-  import { appMode } from "@ogw_front/utils/app_mode"
   import { useInfraStore } from "@ogw_front/stores/infra"
 
-  const RESPONSE_STATUS_OK = 200
-
   const { button_label, button_color, color } = defineProps({
     button_label: {
       type: String,
@@ -20,7 +17,7 @@
       required: false,
     },
   })
-  const infraStore = useInfraStore()
+
   const name = ref("")
   const email = ref("")
   const launch = ref(false)
@@ -40,28 +37,9 @@
     },
   ]
 
-  onMounted(() => {
-    if (import.meta.client) {
-      if (
-        process.env.NODE_ENV !== "production" ||
-        infraStore.app_mode !== appMode.CLOUD
-      ) {
-        infraStore.$patch({ is_captcha_validated: true })
-      }
-    }
-  })
-  async function submit_recaptcha() {
-    const response = await $fetch.raw(`/.netlify/functions/recaptcha`, {
-      method: "POST",
-      body: {
-        name: name.value,
-        email: email.value,
-        launch: launch.value,
-      },
-    })
-    infraStore.$patch({
-      is_captcha_validated: response.status === RESPONSE_STATUS_OK,
-    })
+  function submit() {
+    const infraStore = useInfraStore()
+    return infraStore.create_backend(name.value, email.value, launch.value)
   }
 </script>
 
@@ -99,7 +77,7 @@
       <VBtn
         :text="button_label"
         :color="color || button_color"
-        @click="submit_recaptcha"
+        @click="submit"
       />
     </VCol>
   </VRow>
diff --git a/app/stores/cloud.js b/app/stores/cloud.js
new file mode 100644
index 00000000..46b5d797
--- /dev/null
+++ b/app/stores/cloud.js
@@ -0,0 +1,63 @@
+import { Status } from "@ogw_front/utils/status"
+import { useAppStore } from "./app"
+import { useFeedbackStore } from "./feedback"
+import { useInfraStore } from "./infra"
+
+export const useCloudStore = defineStore("cloud", {
+  state: () => ({
+    status: Status.NOT_CONNECTED,
+  }),
+  actions: {
+    launch(name, email, launch) {
+      this.status = Status.CONNECTING
+      console.log("[CLOUD] Launching cloud backend...")
+      const schema = {
+        $id: "/api/app/run_cloud",
+        methods: ["POST"],
+        type: "object",
+        properties: {
+          name: { type: "string" },
+          email: { type: "string" },
+          launch: { type: "boolean" },
+        },
+        required: ["name", "email", "launch"],
+        additionalProperties: true,
+      }
+      const params = {
+        name,
+        email,
+        launch,
+      }
+      console.log("[CLOUD] params", params)
+      const appStore = useAppStore()
+      const feedbackStore = useFeedbackStore()
+      return appStore.request(schema, params, {
+        request_error_function: () => {
+          feedbackStore.$patch({ server_error: true })
+          this.status = Status.NOT_CONNECTED
+        },
+        response_function: (response) => {
+          feedbackStore.$patch({ server_error: false })
+          console.log(`[CLOUD] Cloud launched on ${response.url}`)
+          this.status = Status.CONNECTED
+          const infraStore = useInfraStore()
+          infraStore.$patch({
+            domain_name: response.url,
+          })
+        },
+        response_error_function: () => {
+          feedbackStore.$patch({ server_error: true })
+          this.status = Status.NOT_CONNECTED
+        },
+      })
+    },
+    async connect() {
+      console.log("[CLOUD] Cloud connected")
+      this.status = Status.CONNECTED
+      return Promise.resolve()
+    },
+  },
+  share: {
+    omit: ["status"],
+  },
+})
diff --git a/app/stores/geode.js b/app/stores/geode.js
index f87a2444..9fa9df05 100644
--- a/app/stores/geode.js
+++ b/app/stores/geode.js
@@ -33,10 +33,7 @@ export const useGeodeStore = defineStore("geode", {
       const infraStore = useInfraStore()
       let geode_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`
       if (infraStore.app_mode === appMode.CLOUD) {
-        if (infraStore.ID === "") {
-          throw new Error("ID must not be empty in cloud mode")
-        }
-        geode_url += `/${infraStore.ID}/geode`
+        geode_url += `/geode`
       }
       return geode_url
     },
diff --git a/app/stores/infra.js b/app/stores/infra.js
index 5c57239c..fd396d81 100644
--- a/app/stores/infra.js
+++ b/app/stores/infra.js
@@ -1,25 +1,18 @@
 import { appMode, getAppMode } from "@ogw_front/utils/app_mode"
 import { Status } from "@ogw_front/utils/status"
 import { useAppStore } from "@ogw_front/stores/app"
-import { useLambdaStore } from "@ogw_front/stores/lambda"
+import { useCloudStore } from "@ogw_front/stores/cloud"
 
 import { registerRunningExtensions } from "@ogw_front/utils/extension"
 
 export const useInfraStore = defineStore("infra", {
   state: () => ({
     app_mode: getAppMode(),
-    ID: "",
-    is_captcha_validated: false,
     status: Status.NOT_CREATED,
     microservices: [],
+    domain_name: "localhost",
   }),
   getters: {
-    domain_name() {
-      if (this.app_mode === appMode.CLOUD) {
-        return useRuntimeConfig().public.API_URL
-      }
-      return "localhost"
-    },
     microservices_connected() {
       console.log("microservices", this.microservices)
       return this.microservices.every(
@@ -44,7 +37,7 @@ export const useInfraStore = defineStore("infra", {
         console.log("[INFRA] Microservice registered:", store_name)
       }
     },
-    async create_backend() {
+    async create_backend(name, email, launch) {
       console.log("[INFRA] Starting create_backend - Mode:", this.app_mode)
       console.log(
         "[INFRA] Registered microservices:",
@@ -54,20 +47,15 @@ export const useInfraStore = defineStore("infra", {
         return
       }
       return navigator.locks.request("infra.create_backend", async () => {
-        this.status = Status.CREATING
         if (this.status === Status.CREATED) {
           return
         }
+        this.status = Status.CREATING
         console.log("[INFRA] Lock granted for create_backend")
         if (this.app_mode === appMode.CLOUD) {
-          console.log("[INFRA] CLOUD mode - Launching lambda...")
-          const lambdaStore = useLambdaStore()
-          this.ID = await lambdaStore.launch()
-          console.log("[INFRA] Lambda launched successfully")
+          const cloudStore = useCloudStore()
+          await cloudStore.launch(name, email, launch)
         } else {
-          console.log(
-            `[INFRA] ${this.app_mode} mode - Launching microservices...`,
-          )
           const appStore = useAppStore()
           await appStore.createProjectFolder()
           if (this.app_mode === appMode.DESKTOP) {
diff --git a/app/stores/lambda.js b/app/stores/lambda.js
deleted file mode 100644
index e634e5de..00000000
--- a/app/stores/lambda.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Status } from "@ogw_front/utils/status"
-import { useFeedbackStore } from "@ogw_front/stores/feedback"
-
-export const useLambdaStore = defineStore("lambda", {
-  state: () => ({
-    status: Status.NOT_CONNECTED,
-  }),
-  getters: {
-    protocol() {
-      return "https"
-    },
-    port() {
-      return "443"
-    },
-    base_url() {
-      const public_runtime_config = useRuntimeConfig().public
-      const domain_name = public_runtime_config.API_URL
-      const projectPath = `/${public_runtime_config.PROJECT}`
-      const url = `${this.protocol}://${domain_name}:${this.port}${public_runtime_config.SITE_BRANCH}${projectPath}/createbackend`
-      return url
-    },
-    is_busy() {
-      return false
-    },
-  },
-  actions: {
-    async launch() {
-      console.log("[LAMBDA] Launching lambda backend...")
-      const feedbackStore = useFeedbackStore()
-
-      const { data, error } = await useFetch(this.base_url, {
-        method: "POST",
-      })
-
-      if (error.value || !data.value) {
-        this.status = Status.NOT_CONNECTED
-        feedbackStore.server_error = true
-        console.error("[LAMBDA] Failed to launch lambda backend", error.value)
-        throw new Error("Failed to launch lambda backend")
-      }
-
-      this.status = Status.CONNECTED
-      const id = data.value.ID
-
-      console.log("[LAMBDA] Lambda launched, ID:", id)
-      return id
-    },
-    async connect() {
-      console.log("[LAMBDA] Lambda connected")
-      this.status = Status.CONNECTED
-      return Promise.resolve()
-    },
-  },
-  share: {
-    omit: ["status"],
-  },
-})
diff --git a/app/stores/viewer.js b/app/stores/viewer.js
index bd05ee13..e74741ae 100644
--- a/app/stores/viewer.js
+++ b/app/stores/viewer.js
@@ -52,10 +52,7 @@ export const useViewerStore = defineStore(
     const base_url = computed(() => {
       let viewer_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`
       if (infraStore.app_mode === appMode.CLOUD) {
-        if (infraStore.ID === "") {
-          throw new Error("ID must not be empty in cloud mode")
-        }
-        viewer_url += `/${infraStore.ID}/viewer`
+        viewer_url += `/viewer`
       }
       viewer_url += "/ws"
       return viewer_url
diff --git a/app/utils/recaptcha.js b/app/utils/recaptcha.js
deleted file mode 100644
index 37907f8c..00000000
--- a/app/utils/recaptcha.js
+++ /dev/null
@@ -1,24 +0,0 @@
-function check_recaptcha_params(name, email, launch) {
-  console.log("check_recaptcha_params", { name, email, launch })
-  if (name !== "") {
-    return {
-      statusCode: 500,
-      body: JSON.stringify({ message: "INTERNAL_ERROR" }),
-    }
-  }
-  if (email !== "") {
-    return {
-      statusCode: 500,
-      body: JSON.stringify({ message: "INTERNAL_ERROR" }),
-    }
-  }
-  if (launch !== false) {
-    return {
-      statusCode: 500,
-      body: JSON.stringify({ message: "INTERNAL_ERROR" }),
-    }
-  }
-  return { statusCode: 200, body: JSON.stringify({ message: "OK" }) }
-}
-
-export { check_recaptcha_params }
diff --git a/nuxt.config.js b/nuxt.config.js
index 8108fcb4..4ed20c8a 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -10,7 +10,6 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 export default defineNuxtConfig({
   runtimeConfig: {
     public: {
-      API_URL: "api.geode-solutions.com",
       BACK_COMMAND: "opengeodeweb-back",
       BACK_PATH: path.join(
         __dirname,
@@ -21,8 +20,6 @@ export default defineNuxtConfig({
       ),
       BROWSER: process.env.BROWSER ?? false,
       PROJECT: package_json.name,
-      SITE_BRANCH:
-        process.env.NODE_ENV === "production" ? process.env.SITE_BRANCH : "",
       VIEWER_COMMAND: "opengeodeweb-viewer",
       VIEWER_PATH: path.join(
         __dirname,
@@ -45,6 +42,7 @@ export default defineNuxtConfig({
   alias: {
     "@ogw_front": path.resolve(__dirname, "app"),
     "@ogw_internal": path.resolve(__dirname, "internal"),
+    "@ogw_server": path.resolve(__dirname, "server"),
     "@ogw_tests": path.resolve(__dirname, "tests"),
   },
 
diff --git a/package.json b/package.json
index 50c1e101..f9474ebe 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
   "dependencies": {
     "@geode/opengeodeweb-back": "0.0.0",
     "@geode/opengeodeweb-viewer": "0.0.0",
+    "@google-cloud/run": "3.2.0",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",
     "@pinia/nuxt": "0.11.3",
@@ -45,6 +46,8 @@
     "conf": "15.1.0",
     "dexie": "4.2.1",
     "get-port-please": "3.2.0",
+    "google-auth-library": "10.6.1",
+    "googleapis": "171.4.0",
     "is-electron": "2.2.2",
     "js-file-download": "0.4.12",
     "jszip": "3.10.1",
diff --git a/server/api/app/run_cloud.js b/server/api/app/run_cloud.js
new file mode 100644
index 00000000..de46005f
--- /dev/null
+++ b/server/api/app/run_cloud.js
@@ -0,0 +1,53 @@
+// Node imports
+
+// Third party imports
+import { createError, defineEventHandler, readBody } from "h3"
+import { GoogleAuth } from "google-auth-library"
+import { ServicesClient } from "@google-cloud/run"
+
+// Local imports
+import {
+  artifactImages,
+  checkRecaptchaParams,
+  requestConfig,
+} from "@ogw_server/utils/cloud"
+
+export default defineEventHandler(async (event) => {
+  try {
+    const { name, email, launch } = await readBody(event)
+    if (!checkRecaptchaParams(name, email, launch)) {
+      return {
+        statusCode: 500,
+        body: JSON.stringify({ message: "INTERNAL_ERROR" }),
+      }
+    }
+    const credentials = JSON.parse(process.env.GOOGLE_CLOUD_KEY)
+    const location = "europe-west9"
+    const projectId = process.env.GOOGLE_CLOUD_PROJECT
+    const parent = `projects/${projectId}/locations/${location}`
+    const auth = new GoogleAuth({
+      credentials: credentials,
+      scopes: ["https://www.googleapis.com/auth/cloud-platform"],
+    })
+    const authClient = await auth.getClient()
+    const [routerImage, backImage, viewerImage] = await artifactImages(
+      parent,
+      authClient,
+    )
+    const request = requestConfig(parent, routerImage, backImage, viewerImage)
+    const runClient = new ServicesClient({ authClient })
+    const [operation] = await runClient.createService(request)
+    const [response] = await operation.promise()
+    console.log("Service URL created:", response.uri)
+    return {
+      statusCode: 200,
+      url: response.uri.replace(/^https?:\/\//i, ""),
+    }
+  } catch (error) {
+    console.log(error)
+    throw createError({
+      statusCode: 500,
+      statusMessage: error.message,
+    })
+  }
+})
diff --git a/server/utils/cloud.js b/server/utils/cloud.js
new file mode 100644
index 00000000..56af1ea9
--- /dev/null
+++ b/server/utils/cloud.js
@@ -0,0 +1,97 @@
+// Node imports
+
+// Third party imports
+import { google } from "googleapis"
+
+// Local imports
+
+function checkRecaptchaParams(name, email, launch) {
+  console.log("check_recaptcha_params", { name, email, launch })
+  return name === "" && email === "" && launch === false
+}
+
+async function artifactImage(registry, parent, repo) {
+  const branch = process.env.BRANCH
+  const [_, projectId] = parent.split("/")
+  const repository = `${parent}/repositories/ghcr/packages/geode-solutions%2F`
+  const artifactRegistry = `europe-west9-docker.pkg.dev/${projectId}/ghcr/geode-solutions`
+  const response =
+    await registry.projects.locations.repositories.packages.tags.get({
+      name: `${repository}${repo}/tags/${branch}`,
+    })
+  const digest = response.data.version.split("/").pop()
+  const image = `${artifactRegistry}/${repo}@${digest}`
+  console.log("Found image for", repo, image)
+  return image
+}
+
+function artifactImages(parent, authClient) {
+  const projectName = process.env.PROJECT
+  const registry = google.artifactregistry({
+    version: "v1",
+    auth: authClient,
+  })
+  return Promise.all([
+    artifactImage(registry, parent, "opengeodeweb-router"),
+    artifactImage(registry, parent, `${projectName}-back`),
+    artifactImage(registry, parent, `${projectName}-viewer`),
+  ])
+}
+
+// oxlint-disable-next-line max-lines-per-function
+function requestConfig(parent, routerImage, backImage, viewerImage) {
+  const resources = {
+    limits: {
+      cpu: "1000m",
+      memory: "512Mi",
+    },
+  }
+  const volumeMounts = {
+    name: "data",
+    mountPath: "/data",
+  }
+  return {
+    parent,
+    service: {
+      ingress: "INGRESS_TRAFFIC_ALL",
+      invokerIamDisabled: true,
+      scaling: {
+        scalingMode: "MANUAL",
+        manualInstanceCount: 1,
+      },
+      template: {
+        volumes: [
+          {
+            name: "data",
+            emptyDir: {
+              medium: "MEMORY",
+            },
+          },
+        ],
+        containers: [
+          {
+            image: routerImage,
+            ports: [
+              {
+                containerPort: 80,
+              },
+            ],
+            resources,
+          },
+          {
+            image: backImage,
+            resources,
+            volumeMounts: [volumeMounts],
+          },
+          {
+            image: viewerImage,
+            resources,
+            volumeMounts: [volumeMounts],
+          },
+        ],
+      },
+    },
+  }
+}
+
+export { checkRecaptchaParams, artifactImages, requestConfig }
diff --git a/tests/unit/components/Launcher.nuxt.test.js b/tests/unit/components/Launcher.nuxt.test.js
deleted file mode 100644
index 41e57df6..00000000
--- a/tests/unit/components/Launcher.nuxt.test.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { describe, expect, test, vi } from "vitest"
-
-import Launcher from "@ogw_front/components/Launcher"
-import ResizeObserver from "resize-observer-polyfill"
-import { flushPromises } from "@vue/test-utils"
-import { mountSuspended } from "@nuxt/test-utils/runtime"
-
-import { setupActivePinia, vuetify } from "@ogw_tests/utils"
-import { useInfraStore } from "@ogw_front/stores/infra"
-
-// Mock navigator.locks API
-const mockLockRequest = vi
-  .fn()
-  .mockImplementation(async (name, task) => await task({ name }))
-
-vi.stubGlobal("navigator", {
-  ...navigator,
-  locks: {
-    request: mockLockRequest,
-  },
-})
-
-globalThis.ResizeObserver = ResizeObserver
-
-describe(Launcher, async () => {
-  test(`Mount`, async () => {
-    const pinia = setupActivePinia()
-    const infraStore = useInfraStore()
-    const wrapper = await mountSuspended(Launcher, {
-      global: {
-        plugins: [vuetify, pinia],
-      },
-    })
-    expect(wrapper.exists()).toBeTruthy()
-    await infraStore.$patch({ is_captcha_validated: true })
-    await flushPromises()
-    expect(infraStore.create_backend).toHaveBeenCalled()
-  })
-})
diff --git a/tests/unit/composables/project_manager.nuxt.test.js b/tests/unit/composables/project_manager.nuxt.test.js
index e89deb48..2b9ad07c 100644
--- a/tests/unit/composables/project_manager.nuxt.test.js
+++ b/tests/unit/composables/project_manager.nuxt.test.js
@@ -86,7 +86,6 @@ const geodeStoreMock = {
 }
 const infraStoreMock = {
   app_mode: appMode.BROWSER,
-  ID: "1234",
 }
 const viewerStoreMock = {
   ws_connect: vi.fn().mockResolvedValue(),
diff --git a/tests/unit/stores/cloud.nuxt.test.js b/tests/unit/stores/cloud.nuxt.test.js
new file mode 100644
index 00000000..4aeaadc1
--- /dev/null
+++ b/tests/unit/stores/cloud.nuxt.test.js
@@ -0,0 +1,91 @@
+// Third party imports
+import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
+import { registerEndpoint } from "@nuxt/test-utils/runtime"
+
+// Local imports
+import { Status } from "@ogw_front/utils/status"
+import { setupActivePinia } from "@ogw_tests/utils"
+import { useCloudStore } from "@ogw_front/stores/cloud"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
+
+// CONSTANTS
+const PROJECT = "project"
+const STATUS_500 = 500
+
+beforeEach(async () => {
+  setupActivePinia()
+})
+
+function setupConfig() {
+  const config = useRuntimeConfig()
+  config.public.PROJECT = PROJECT
+}
+
+describe("Cloud Store", () => {
+  describe("state", () => {
+    test("initial state", () => {
+      const cloudStore = useCloudStore()
+      expectTypeOf(cloudStore.status).toBeString()
+      expect(cloudStore.status).toBe(Status.NOT_CONNECTED)
+    })
+  })
+
+  describe("actions", () => {
+    describe("launch", () => {
+      const postFakeCall = vi.fn()
+
+      test("successful launch", async () => {
+        setupConfig()
+        const cloudStore = useCloudStore()
+        const feedbackStore = useFeedbackStore()
+
+        registerEndpoint("/api/app/run_cloud", {
+          method: "POST",
+          handler: postFakeCall,
+        })
+
+        postFakeCall.mockImplementation(() => ({
+          url: "http://test.com",
+        }))
+
+        await cloudStore.launch("", "", false)
+
+        expect(cloudStore.status).toBe(Status.CONNECTED)
+        expect(feedbackStore.server_error).toBeFalsy()
+      })
+
+      test("failed launch - error response", async () => {
+        setupConfig()
+        const cloudStore = useCloudStore()
+        const feedbackStore = useFeedbackStore()
+
+        registerEndpoint("/api/app/run_cloud", {
+          method: "POST",
+          handler: postFakeCall,
+        })
+
+        postFakeCall.mockImplementation(() => {
+          throw createError({
+            status: STATUS_500,
+            statusMessage: "Internal Server Error",
+          })
+        })
+
+        await expect(cloudStore.launch("", "", false)).rejects.toThrow(
+          "500 Internal Server Error",
+        )
+
+        expect(cloudStore.status).toBe(Status.NOT_CONNECTED)
+        expect(feedbackStore.server_error).toBeTruthy()
+      })
+    })
+
+    describe("connect", () => {
+      test("successful connect", async () => {
+        const cloudStore = useCloudStore()
+        await cloudStore.connect()
+        expect(cloudStore.status).toBe(Status.CONNECTED)
+      })
+    })
+  })
+})
diff --git a/tests/unit/stores/geode.nuxt.test.js b/tests/unit/stores/geode.nuxt.test.js
index c2ce5ab9..1a8551d8 100644
--- a/tests/unit/stores/geode.nuxt.test.js
+++ b/tests/unit/stores/geode.nuxt.test.js
@@ -88,22 +88,8 @@ describe("geode store", () => {
       const infraStore = useInfraStore()
       const geodeStore = useGeodeStore()
       infraStore.app_mode = appMode.CLOUD
-      infraStore.ID = CLOUD_ID
       infraStore.domain_name = "example.com"
-      expect(geodeStore.base_url).toBe(
-        `https://example.com:${PORT_443}/${CLOUD_ID}/geode`,
-      )
-    })
-
-    test("app_mode CLOUD, ID empty", () => {
-      const infraStore = useInfraStore()
-      const geodeStore = useGeodeStore()
-      infraStore.app_mode = appMode.CLOUD
-      infraStore.ID = ""
-      infraStore.domain_name = "example.com"
-      expect(() => geodeStore.base_url).toThrow(
-        "ID must not be empty in cloud mode",
-      )
+      expect(geodeStore.base_url).toBe(`https://example.com:${PORT_443}/geode`)
     })
   })
 
diff --git a/tests/unit/stores/infra.nuxt.test.js b/tests/unit/stores/infra.nuxt.test.js
index beab6a75..d112f848 100644
--- a/tests/unit/stores/infra.nuxt.test.js
+++ b/tests/unit/stores/infra.nuxt.test.js
@@ -6,9 +6,9 @@ import { registerEndpoint } from "@nuxt/test-utils/runtime"
 import { Status } from "@ogw_front/utils/status"
 import { appMode } from "@ogw_front/utils/app_mode"
 import { setupActivePinia } from "@ogw_tests/utils"
+import { useCloudStore } from "@ogw_front/stores/cloud"
 import { useGeodeStore } from "@ogw_front/stores/geode"
 import { useInfraStore } from "@ogw_front/stores/infra"
-import { useLambdaStore } from "@ogw_front/stores/lambda"
 import { useViewerStore } from "@ogw_front/stores/viewer"
 
 // Mock navigator.locks API
@@ -31,8 +31,7 @@ describe("Infra Store", () => {
   describe("state", () => {
     test("initial state", () => {
       const infraStore = useInfraStore()
-      expectTypeOf(infraStore.ID).toBeString()
-      expectTypeOf(infraStore.is_captcha_validated).toBeBoolean()
+      expectTypeOf(infraStore.domain_name).toBeString()
       expectTypeOf(infraStore.status).toBeString()
     })
   })
@@ -58,7 +57,7 @@ describe("Infra Store", () => {
       test("test app_mode CLOUD", () => {
         const infraStore = useInfraStore()
         infraStore.app_mode = appMode.CLOUD
-        expect(infraStore.domain_name).toBe("api.geode-solutions.com")
+        expect(infraStore.domain_name).toBe("localhost")
       })
     })
 
@@ -273,28 +272,27 @@ describe("Infra Store", () => {
         expect(infraStore.microservices.length).toBe(2)
       })
     })
+  })
 
-    describe("create_backend", () => {
-      // Test without microservices
-      test("test with end-point", async () => {
-        const infraStore = useInfraStore()
-        const geodeStore = useGeodeStore()
-        const viewerStore = useViewerStore()
-        const lambdaStore = useLambdaStore()
-
-        infraStore.app_mode = appMode.CLOUD
-        const ID = "123456"
-        registerEndpoint(lambdaStore.base_url, {
-          method: "POST",
-          handler: () => ({ ID }),
-        })
-        await infraStore.create_backend()
-        expect(infraStore.status).toBe(Status.CREATED)
-        expect(infraStore.ID).toBe(ID)
-
-        expect(geodeStore.status).toBe(Status.NOT_CONNECTED)
-        expect(viewerStore.status).toBe(Status.NOT_CONNECTED)
+  describe("create_backend", () => {
+    // Test without microservices
+    test("test with end-point", async () => {
+      const infraStore = useInfraStore()
+      const geodeStore = useGeodeStore()
+      const viewerStore = useViewerStore()
+
+      infraStore.app_mode = appMode.CLOUD
+      const url = "test.com"
+      registerEndpoint("/api/app/run_cloud", {
+        method: "POST",
+        handler: () => ({ url }),
       })
+      await infraStore.create_backend("", "", false)
+      expect(infraStore.status).toBe(Status.CREATED)
+      expect(infraStore.domain_name).toBe(url)
+
+      expect(geodeStore.status).toBe(Status.NOT_CONNECTED)
+      expect(viewerStore.status).toBe(Status.NOT_CONNECTED)
     })
   })
 })
diff --git a/tests/unit/stores/lambda.nuxt.test.js b/tests/unit/stores/lambda.nuxt.test.js
deleted file mode 100644
index 46a29906..00000000
--- a/tests/unit/stores/lambda.nuxt.test.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Third party imports
-import { beforeEach, describe, expect, expectTypeOf, test, vi } from "vitest"
-import { registerEndpoint } from "@nuxt/test-utils/runtime"
-
-// Local imports
-import { Status } from "@ogw_front/utils/status"
-import { setupActivePinia } from "@ogw_tests/utils"
-import { useFeedbackStore } from "@ogw_front/stores/feedback"
-import { useLambdaStore } from "@ogw_front/stores/lambda"
-
-// CONSTANTS
-const PORT_443 = "443"
-const API_URL = "api.example.com"
-const SITE_BRANCH = "/test"
-const PROJECT = "project"
-const TEST_ID = "test-id-123456"
-const STATUS_500 = 500
-
-beforeEach(async () => {
-  setupActivePinia()
-})
-
-function setupConfig() {
-  const config = useRuntimeConfig()
-  config.public.API_URL = API_URL
-  config.public.SITE_BRANCH = SITE_BRANCH
-  config.public.PROJECT = PROJECT
-}
-
-describe("Lambda Store", () => {
-  describe("state", () => {
-    test("initial state", () => {
-      const lambdaStore = useLambdaStore()
-      expectTypeOf(lambdaStore.status).toBeString()
-      expect(lambdaStore.status).toBe(Status.NOT_CONNECTED)
-    })
-  })
-
-  describe("getters", () => {
-    describe("protocol", () => {
-      test("test protocol is always https", () => {
-        const lambdaStore = useLambdaStore()
-        expect(lambdaStore.protocol).toBe("https")
-      })
-    })
-
-    describe("port", () => {
-      test("test port is always 443", () => {
-        const lambdaStore = useLambdaStore()
-        expect(lambdaStore.port).toBe(PORT_443)
-      })
-    })
-
-    describe("base_url", () => {
-      test("test base_url construction", () => {
-        setupConfig()
-        const lambdaStore = useLambdaStore()
-        expect(lambdaStore.base_url).toBe(
-          `https://${API_URL}:${PORT_443}${SITE_BRANCH}/${PROJECT}/createbackend`,
-        )
-      })
-    })
-
-    describe("is_busy", () => {
-      test("test is_busy is always false", () => {
-        const lambdaStore = useLambdaStore()
-        expect(lambdaStore.is_busy).toBeFalsy()
-      })
-    })
-  })
-
-  describe("actions", () => {
-    describe("launch", () => {
-      const postFakeCall = vi.fn()
-
-      test("successful launch", async () => {
-        setupConfig()
-        const lambdaStore = useLambdaStore()
-        const feedbackStore = useFeedbackStore()
-
-        lambdaStore.base_url = "test-base-url"
-        registerEndpoint(lambdaStore.base_url, {
-          method: "POST",
-          handler: postFakeCall,
-        })
-
-        postFakeCall.mockImplementation(() => ({
-          ID: TEST_ID,
-        }))
-
-        const id = await lambdaStore.launch()
-
-        expect(lambdaStore.status).toBe(Status.CONNECTED)
-        expect(id).toBe(TEST_ID)
-        expect(feedbackStore.server_error).toBeFalsy()
-      })
-
-      test("failed launch - error response", async () => {
-        setupConfig()
-        const lambdaStore = useLambdaStore()
-        const feedbackStore = useFeedbackStore()
-
-        registerEndpoint(lambdaStore.base_url, {
-          method: "POST",
-          handler: postFakeCall,
-        })
-
-        postFakeCall.mockImplementation(() => {
-          throw createError({
-            status: STATUS_500,
-            statusMessage: "Internal Server Error",
-          })
-        })
-
-        await expect(lambdaStore.launch()).rejects.toThrow(
-          "Failed to launch lambda backend",
-        )
-
-        expect(lambdaStore.status).toBe(Status.NOT_CONNECTED)
-        expect(feedbackStore.server_error).toBeTruthy()
-      })
-    })
-
-    describe("connect", () => {
-      test("successful connect", async () => {
-        const lambdaStore = useLambdaStore()
-        await lambdaStore.connect()
-        expect(lambdaStore.status).toBe(Status.CONNECTED)
-      })
-    })
-  })
-})
diff --git a/tests/unit/stores/viewer.nuxt.test.js b/tests/unit/stores/viewer.nuxt.test.js
index 4c7e34fb..3816b186 100644
--- a/tests/unit/stores/viewer.nuxt.test.js
+++ b/tests/unit/stores/viewer.nuxt.test.js
@@ -120,22 +120,8 @@ describe("Viewer Store", () => {
         const infraStore = useInfraStore()
         const viewerStore = useViewerStore()
         infraStore.app_mode = appMode.CLOUD
-        infraStore.ID = "123456"
         infraStore.domain_name = "example.com"
-        expect(viewerStore.base_url).toBe(
-          "wss://example.com:443/123456/viewer/ws",
-        )
-      })
-
-      test("test app_mode CLOUD, ID empty", () => {
-        const infraStore = useInfraStore()
-        const viewerStore = useViewerStore()
-        infraStore.app_mode = appMode.CLOUD
-        infraStore.ID = ""
-        infraStore.domain_name = "example.com"
-        expect(() => viewerStore.base_url).toThrowError(
-          "ID must not be empty in cloud mode",
-        )
+        expect(viewerStore.base_url).toBe("wss://example.com:443/viewer/ws")
       })
     })
     describe("is_busy", () => {
diff --git a/tests/unit/utils/recaptcha.nuxt.test.js b/tests/unit/utils/recaptcha.nuxt.test.js
deleted file mode 100644
index c40b1df3..00000000
--- a/tests/unit/utils/recaptcha.nuxt.test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Third party imports
-import { describe, expect, test } from "vitest"
-
-// Local imports
-import { check_recaptcha_params } from "@ogw_front/utils/recaptcha"
-
-describe("recaptcha", () => {
-  const default_name = ""
-  const default_email = ""
-  const default_launch = false
-  const internal_error = 500
-  const success = 200
-
-  describe("wrong params", () => {
-    test("name", () => {
-      const name = "test"
-      const result = check_recaptcha_params(name, default_email, default_launch)
-      expect(result.statusCode).toBe(internal_error)
-    })
-
-    test("email", () => {
-      const email = "test"
-      const result = check_recaptcha_params(default_name, email, default_launch)
-      expect(result.statusCode).toBe(internal_error)
-    })
-
-    test("launch", () => {
-      const launch = true
-      const result = check_recaptcha_params(default_name, default_email, launch)
-      expect(result.statusCode).toBe(internal_error)
-    })
-  })
-
-  describe("right params", () => {
-    test("name", () => {
-      const result = check_recaptcha_params(
-        default_name,
-        default_email,
-        default_launch,
-      )
-      expect(result.statusCode).toBe(success)
-    })
-  })
-})