diff --git a/gui/.dockerignore b/gui/.dockerignore
index 9414382..ae89e39 100644
--- a/gui/.dockerignore
+++ b/gui/.dockerignore
@@ -1 +1,6 @@
-Dockerfile
+**/node_modules
+**/dist
+/gerrit
+/licenses
+.env*
+!.env.docker
diff --git a/gui/.env.development b/gui/.env.development
deleted file mode 100644
index 8edc2f8..0000000
--- a/gui/.env.development
+++ /dev/null
@@ -1,3 +0,0 @@
-NODE_ENV=development
-VITE_API_URL=http://localhost:3000
-VITE_API_URL=https://exz-nebulous-backend-staging-2003f98f736b.herokuapp.com
diff --git a/gui/.env.docker b/gui/.env.docker
new file mode 100644
index 0000000..6529b96
--- /dev/null
+++ b/gui/.env.docker
@@ -0,0 +1,2 @@
+VITE_API_URL=VITE_API_URL_PLACEHOLDER
+CFSB_API_URL=CFSB_API_URL_PLACEHOLDER
\ No newline at end of file
diff --git a/gui/.gitignore b/gui/.gitignore
index e0c3de1..6dc0973 100644
--- a/gui/.gitignore
+++ b/gui/.gitignore
@@ -6,7 +6,7 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
-
+/*.env.*
 node_modules
 dist
 dist-ssr
@@ -24,4 +24,7 @@ dist-ssr
 
 # we are using pnpm-lock.yaml
 package-lock.json
-yarn.lock
\ No newline at end of file
+yarn.lock
+/gerrit
+
+!.env.docker
diff --git a/gui/.nvmrc b/gui/.nvmrc
new file mode 100644
index 0000000..67d2ffe
--- /dev/null
+++ b/gui/.nvmrc
@@ -0,0 +1 @@
+v20.13.1
\ No newline at end of file
diff --git a/gui/Dockerfile b/gui/Dockerfile
index b0365c2..5dd7ece 100644
--- a/gui/Dockerfile
+++ b/gui/Dockerfile
@@ -1,4 +1,19 @@
-FROM docker.io/library/node:21.4.0-bookworm
-COPY . /app
+# Build the Vue app
+FROM node:20 as build-stage
 WORKDIR /app
-RUN corepack enable pnpm && pnpm install && npx vue-tsc
+COPY package*.json ./
+COPY .env.docker ./.env
+
+RUN npm install
+COPY ./ .
+RUN npm run build
+
+# Copy the compiled app in an NGINX contaier
+FROM nginx:alpine as production-stage
+RUN mkdir /app
+COPY --from=build-stage /app/dist /usr/share/nginx/html
+
+# Executing the script at container runtime
+COPY set_env.sh /docker-entrypoint.d/
+RUN chmod +x /docker-entrypoint.d/set_env.sh
+
diff --git a/gui/package.json b/gui/package.json
index 14435b1..4ecec78 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "engines": {
-    "node": "v21.4.0"
+    "node": "v20.9.0"
   },
   "scripts": {
     "serve": "vite",
diff --git a/gui/set_env.sh b/gui/set_env.sh
new file mode 100644
index 0000000..a36f127
--- /dev/null
+++ b/gui/set_env.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+ROOT_DIR=/usr/share/nginx/html
+
+# Replace env vars in files served by NGINX
+for file in $ROOT_DIR/assets/*.js* $ROOT_DIR/index.html;
+do
+  echo "Setting VITE_API_URL_PLACEHOlDER environment variables ${VITE_API_URL}"
+  sed -i 's|VITE_API_URL_PLACEHOLDER|'${VITE_API_URL}'|g' $file
+
+  echo "Setting CFSB_API_URL_PLACEHOLDER environment variables ${CFSB_API_URL}"
+  sed -i 's|CFSB_API_URL_PLACEHOLDER|'${CFSB_API_URL}'|g' $file
+  # Your other variables here...
+done
+
+
+exec "$@"
\ No newline at end of file
diff --git a/gui/src/components/Application/Details.vue b/gui/src/components/Application/Details.vue
index d9fcd88..1d0e777 100644
--- a/gui/src/components/Application/Details.vue
+++ b/gui/src/components/Application/Details.vue
@@ -129,7 +129,7 @@
                             v-model="env.name"
                             type="text"
                             :class="{
-                              'input--invalid': v.name?.$error || hasBackendError(`env[${index}].name`)
+                              'input--invalid': v.name?.$error || hasBackendError(`environmentVariables[${index}].name`)
                             }"
                           />
                         </div>
@@ -142,7 +142,7 @@
                             v-model="env.value"
                             :type="env.secret ==true ? 'password' : 'text' "
                             :class="{
-                              'input--invalid': v.value?.$error || hasBackendError(`env[${index}].value`)
+                              'input--invalid': v.value?.$error || hasBackendError(`environmentVariables[${index}].value`)
                             }"
                           />
                         </div>
@@ -150,7 +150,11 @@
                     </Table.Td>
                     <Table.Td class="w-1/6">
                       <FormSwitch class="ml-auto w-auto">
-                        <FormSwitch.Input id="env-{{index}}-secret" v-model="env.secret" type="checkbox" />
+                        <FormSwitch.Input id="env-{{String(index)}}-secret" v-model="env.secret" type="checkbox"
+                            :class="{
+                              'input--invalid': v.value?.$error || hasBackendError(`environmentVariables[${index}].secret`)
+                            }"
+                        />
                       </FormSwitch>
                     </Table.Td>
                     <Table.Td class="w-1/6">
diff --git a/gui/src/components/Application/Metrics/index.vue b/gui/src/components/Application/Metrics/index.vue
index af7fcd3..708b298 100644
--- a/gui/src/components/Application/Metrics/index.vue
+++ b/gui/src/components/Application/Metrics/index.vue
@@ -3,7 +3,8 @@
     <Templates :templates="templates" />
     <Parameters :parameters="parameters" :templateNames="templateNames" />
 
-    <Metrics :metrics="metrics" :componentList="props.payload.componentList"
+    <Metrics :metrics="metrics"
+             :componentList="props.payload.componentList"
       :templateNames="templateNames"/>
 
     <div class="flex flex-col space-y-5">
diff --git a/gui/src/components/Application/Resources.vue b/gui/src/components/Application/Resources.vue
index 043e796..26f6b46 100644
--- a/gui/src/components/Application/Resources.vue
+++ b/gui/src/components/Application/Resources.vue
@@ -62,6 +62,7 @@ const resources = computed<Array<IAppResource>>(() =>
       uuid: resource.uuid,
       title: resource.title,
       platform: resource.platform.title,
+      regions: resource.regions,
       enabled: isEnabled
     }
   })
diff --git a/gui/src/components/Modal/ResourceCreation.vue b/gui/src/components/Modal/ResourceCreation.vue
index 9c16944..280c490 100644
--- a/gui/src/components/Modal/ResourceCreation.vue
+++ b/gui/src/components/Modal/ResourceCreation.vue
@@ -33,6 +33,7 @@ const resourceData = reactive<IResourcePayload>({
   platform: {"uuid":'','title':''} as IPlatform,
   _platform: [{"uuid":'','title':''} as IPlatform], // TODO Remove this
   securityGroup:"",
+  regions:"",
   subnet:"",
   endpoint:"",
   identityVersion:"",
diff --git a/gui/src/components/Modal/ResourceForm.vue b/gui/src/components/Modal/ResourceForm.vue
index e7e4920..40db4e2 100644
--- a/gui/src/components/Modal/ResourceForm.vue
+++ b/gui/src/components/Modal/ResourceForm.vue
@@ -1,11 +1,12 @@
 <template>
+  <form>
   <Dialog.Description class="grid grid-cols-3 gap-4 p-4" :class=" availableInPlatform(['OPENSTACK','AWS']) ?  'grid-cols-3' : 'grid-cols-2' "
   >
     <div class="col-span-3 p-0">
       <div class="mb-3">
         <Label>Name</Label>
         <Input
-            type="email"
+            type="text"
             v-model="resourceData.title"
             :class="{
             'input--invalid': v$.title.$error
@@ -25,6 +26,35 @@
           </option>
         </Select>
       </div>
+      <div v-if="availableInPlatform(['OPENSTACK','AWS'])"
+           class="flex flex-col"
+      >
+        <div class="mt-4 mb-3">
+          <Label>Regions</Label>
+          <div               v-if="availableInPlatform(['AWS'])"
+          >
+
+          <TomSelect
+              v-model="resourceData.regions"
+              class="w-full"
+              multiple
+          >
+            <template v-if="availableRegions['AWS'].length">
+              <option
+                  v-for="(option, componentOptionIndex) in availableRegions['AWS']"
+                  :key="componentOptionIndex"
+                  :value="option.region"
+              >
+                {{ option.region }} ({{option.region_name}})
+              </option>
+            </template>
+          </TomSelect>
+          </div>
+          <Input type="text"
+                 v-if="availableInPlatform(['OPENSTACK'])"
+                 v-model="resourceData.regions"/>
+        </div>
+      </div>
     </div>
     <div class="flex flex-col">
       <h3 class="font-bold text-lg mb-2">General</h3>
@@ -118,7 +148,8 @@
       >
         <Label>Key Pair Name</Label>
         <Input
-            type="text"
+            autocomplete="false"
+            type="password"
             v-model="resourceData.sshCredentials.keyPairName"
         />
       </div>
@@ -127,13 +158,16 @@
            v-if="availableInPlatform(['OPENSTACK','AWS'])"
       >
         <Label>Key Private Key</Label>
-        <FormTextarea
+        <Input
+            autocomplete="false"
+            type="password"
             v-model="resourceData.sshCredentials.privateKey"
         />
       </div>
 
     </div>
   </Dialog.Description>
+  </form>
 </template>
 <script setup lang="ts">
 import { reactive, ref } from "vue"
@@ -147,16 +181,309 @@ import {IPlatform} from "@/interfaces/platform.interface.ts";
 import {useResourceStore} from "@/store/modules/resources.ts";
 import {IResourcePayload} from "@/types/resource.ts";
 import {useVuelidate} from "@vuelidate/core";
+import TomSelect from "@/base-components/TomSelect";
 
 const resourceStore = useResourceStore()
 
 const props = defineProps(['resourceData','rules'])
 
 const resourceData = ref<IResourcePayload>(props.resourceData)
+console.log(resourceData)
+const availableRegions = {
+  'AWS':[
+    {
+      "region_name": "US East (Ohio)",
+      "region": "us-east-2",
+      "endpoints": [
+        "rds.us-east-2.amazonaws.com",
+        "rds-fips.us-east-2.api.aws",
+        "rds.us-east-2.api.aws",
+        "rds-fips.us-east-2.amazonaws.com"
+      ],
+      "protocol": ["HTTPS", "HTTPS", "HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "US East (N. Virginia)",
+      "region": "us-east-1",
+      "endpoints": [
+        "rds.us-east-1.amazonaws.com",
+        "rds-fips.us-east-1.api.aws",
+        "rds-fips.us-east-1.amazonaws.com",
+        "rds.us-east-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS", "HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "US West (N. California)",
+      "region": "us-west-1",
+      "endpoints": [
+        "rds.us-west-1.amazonaws.com",
+        "rds.us-west-1.api.aws",
+        "rds-fips.us-west-1.amazonaws.com",
+        "rds-fips.us-west-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS", "HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "US West (Oregon)",
+      "region": "us-west-2",
+      "endpoints": [
+        "rds.us-west-2.amazonaws.com",
+        "rds-fips.us-west-2.amazonaws.com",
+        "rds.us-west-2.api.aws",
+        "rds-fips.us-west-2.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS", "HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Africa (Cape Town)",
+      "region": "af-south-1",
+      "endpoints": [
+        "rds.af-south-1.amazonaws.com",
+        "rds.af-south-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Hong Kong)",
+      "region": "ap-east-1",
+      "endpoints": [
+        "rds.ap-east-1.amazonaws.com",
+        "rds.ap-east-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Hyderabad)",
+      "region": "ap-south-2",
+      "endpoints": [
+        "rds.ap-south-2.amazonaws.com",
+        "rds.ap-south-2.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Jakarta)",
+      "region": "ap-southeast-3",
+      "endpoints": [
+        "rds.ap-southeast-3.amazonaws.com",
+        "rds.ap-southeast-3.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Melbourne)",
+      "region": "ap-southeast-4",
+      "endpoints": [
+        "rds.ap-southeast-4.amazonaws.com",
+        "rds.ap-southeast-4.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Mumbai)",
+      "region": "ap-south-1",
+      "endpoints": [
+        "rds.ap-south-1.amazonaws.com",
+        "rds.ap-south-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Osaka)",
+      "region": "ap-northeast-3",
+      "endpoints": [
+        "rds.ap-northeast-3.amazonaws.com",
+        "rds.ap-northeast-3.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Seoul)",
+      "region": "ap-northeast-2",
+      "endpoints": [
+        "rds.ap-northeast-2.amazonaws.com",
+        "rds.ap-northeast-2.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Singapore)",
+      "region": "ap-southeast-1",
+      "endpoints": [
+        "rds.ap-southeast-1.amazonaws.com",
+        "rds.ap-southeast-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Sydney)",
+      "region": "ap-southeast-2",
+      "endpoints": [
+        "rds.ap-southeast-2.amazonaws.com",
+        "rds.ap-southeast-2.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Asia Pacific (Tokyo)",
+      "region": "ap-northeast-1",
+      "endpoints": [
+        "rds.ap-northeast-1.amazonaws.com",
+        "rds.ap-northeast-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Canada (Central)",
+      "region": "ca-central-1",
+      "endpoints": [
+        "rds.ca-central-1.amazonaws.com",
+        "rds.ca-central-1.api.aws",
+        "rds-fips.ca-central-1.api.aws",
+        "rds-fips.ca-central-1.amazonaws.com"
+      ],
+      "protocol": ["HTTPS", "HTTPS", "HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Canada West (Calgary)",
+      "region": "ca-west-1",
+      "endpoints": [
+        "rds.ca-west-1.amazonaws.com",
+        "rds-fips.ca-west-1.amazonaws.com"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Europe (Frankfurt)",
+      "region": "eu-central-1",
+      "endpoints": [
+        "rds.eu-central-1.amazonaws.com",
+        "rds.eu-central-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Europe (Ireland)",
+      "region": "eu-west-1",
+      "endpoints": [
+        "rds.eu-west-1.amazonaws.com",
+        "rds.eu-west-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Europe (London)",
+      "region": "eu-west-2",
+      "endpoints": [
+        "rds.eu-west-2.amazonaws.com",
+        "rds.eu-west-2.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Europe (Milan)",
+      "region": "eu-south-1",
+      "endpoints": [
+        "rds.eu-south-1.amazonaws.com",
+        "rds.eu-south-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Europe (Paris)",
+      "region": "eu-west-3",
+      "endpoints": [
+        "rds.eu-west-3.amazonaws.com",
+        "rds.eu-west-3.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Europe (Spain)",
+      "region": "eu-south-2",
+      "endpoints": [
+        "rds.eu-south-2.amazonaws.com",
+        "rds.eu-south-2.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Europe (Stockholm)",
+      "region": "eu-north-1",
+      "endpoints": [
+        "rds.eu-north-1.amazonaws.com",
+        "rds.eu-north-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Europe (Zurich)",
+      "region": "eu-central-2",
+      "endpoints": [
+        "rds.eu-central-2.amazonaws.com",
+        "rds.eu-central-2.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Israel (Tel Aviv)",
+      "region": "il-central-1",
+      "endpoints": [
+        "rds.il-central-1.amazonaws.com",
+        "rds.il-central-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Middle East (Bahrain)",
+      "region": "me-south-1",
+      "endpoints": [
+        "rds.me-south-1.amazonaws.com",
+        "rds.me-south-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "Middle East (UAE)",
+      "region": "me-central-1",
+      "endpoints": [
+        "rds.me-central-1.amazonaws.com",
+        "rds.me-central-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "South America (São Paulo)",
+      "region": "sa-east-1",
+      "endpoints": [
+        "rds.sa-east-1.amazonaws.com",
+        "rds.sa-east-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "AWS GovCloud (US-East)",
+      "region": "us-gov-east-1",
+      "endpoints": [
+        "rds.us-gov-east-1.amazonaws.com",
+        "rds.us-gov-east-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    },
+    {
+      "region_name": "AWS GovCloud (US-West)",
+      "region": "us-gov-west-1",
+      "endpoints": [
+        "rds.us-gov-west-1.amazonaws.com",
+        "rds.us-gov-west-1.api.aws"
+      ],
+      "protocol": ["HTTPS", "HTTPS"]
+    }
+  ]
+}
 const rules = ref<IResourcePayload>(props.rules)
 
-console.log("Resource Data", resourceData)
-
 const $externalResults = reactive({})
 const v$ = useVuelidate(rules.value, resourceData.value, { $externalResults })
 
@@ -164,8 +491,12 @@ const v$ = useVuelidate(rules.value, resourceData.value, { $externalResults })
 const platformsOptions = ref<Array<IPlatform>>([])
 const availableInPlatform = (platforms:Array<string>): boolean => {
 
+  if(!platformsOptions.value){
+    return false
+  }
+
   const to_uuid:Array<string> = []
-  const availableOptions = _.each(platformsOptions.value, (k)=>{
+  _.each(platformsOptions.value, (k)=>{
     if(platforms.includes(k.title)){
       to_uuid.push(k.uuid)
     }
@@ -173,7 +504,10 @@ const availableInPlatform = (platforms:Array<string>): boolean => {
   return to_uuid.includes(resourceData.value.platform.uuid)
 }
 const getPlatforms = async () => {
-  platformsOptions.value = await resourceStore.getPlatforms()
+  console.log(resourceStore)
+  const p = await resourceStore.getPlatforms()
+  console.log(p)
+  platformsOptions.value =p
 }
 getPlatforms()
 
diff --git a/gui/src/containers/Applications/Resources/NodeCandidatesTable.vue b/gui/src/containers/Applications/Resources/NodeCandidatesTable.vue
deleted file mode 100644
index 365532a..0000000
--- a/gui/src/containers/Applications/Resources/NodeCandidatesTable.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <div class="flex-grow overflow-x-auto">
-    <Table class="border-spacing-y-[10px] border-separate -mt-2 min-w-full max-w-max w-max">
-      <Table.Thead>
-        <Table.Tr>
-          <Table.Th class="border-b-0 whitespace-nowrap"> Region </Table.Th>
-          <Table.Th class="border-b-0 whitespace-nowrap"> Instance Type </Table.Th>
-          <Table.Th class="border-b-0 whitespace-nowrap"> Vcores </Table.Th>
-          <Table.Th class="border-b-0 whitespace-nowrap"> Memory (GB) </Table.Th>
-        </Table.Tr>
-      </Table.Thead>
-      <Table.Tbody>
-        <Table.Tr v-for="(node, index) in nodeCandidates" :key="index">
-          <Table.Td
-            class="first:rounded-l-md last:rounded-r-md bg-white border-b-0 dark:bg-darkmode-600 shadow-[20px_3px_20px_#0000000b]"
-          >
-            {{ node.region }}
-          </Table.Td>
-          <Table.Td
-            class="first:rounded-l-md last:rounded-r-md bg-white border-b-0 dark:bg-darkmode-600 shadow-[20px_3px_20px_#0000000b]"
-          >
-            {{ node.instanceType }}
-          </Table.Td>
-          <Table.Td
-            class="first:rounded-l-md last:rounded-r-md bg-white border-b-0 dark:bg-darkmode-600 shadow-[20px_3px_20px_#0000000b]"
-          >
-            {{ node.virtualCores }}
-          </Table.Td>
-          <Table.Td
-            class="first:rounded-l-md last:rounded-r-md bg-white border-b-0 dark:bg-darkmode-600 shadow-[20px_3px_20px_#0000000b]"
-          >
-            {{ node.memory }}
-          </Table.Td>
-        </Table.Tr>
-      </Table.Tbody>
-    </Table>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue"
-import Table from "@/base-components/Table"
-interface INodeCandidates {
-  id: number
-  region: string
-  instanceType: string
-  virtualCores: number
-  memory: number
-}
-
-const nodeCandidates = ref<Array<INodeCandidates>>([
-  {
-    id: 1,
-    region: "eu-west",
-    instanceType: "m7g.xlarge",
-    virtualCores: 2,
-    memory: 6
-  },
-  {
-    id: 2,
-    region: "eu-west",
-    instanceType: "m7g.xlarge",
-    virtualCores: 2,
-    memory: 6
-  },
-  {
-    id: 3,
-    region: "eu-west",
-    instanceType: "m7g.xlarge",
-    virtualCores: 2,
-    memory: 6
-  },
-  {
-    id: 4,
-    region: "eu-west",
-    instanceType: "m7g.xlarge",
-    virtualCores: 2,
-    memory: 6
-  },
-  {
-    id: 5,
-    region: "eu-west",
-    instanceType: "m7g.xlarge",
-    virtualCores: 2,
-    memory: 6
-  },
-  {
-    id: 6,
-    region: "eu-west",
-    instanceType: "m7g.xlarge",
-    virtualCores: 2,
-    memory: 6
-  },
-  {
-    id: 7,
-    region: "eu-west",
-    instanceType: "m7g.xlarge",
-    virtualCores: 2,
-    memory: 6
-  },
-  {
-    id: 8,
-    region: "eu-west",
-    instanceType: "m7g.xlarge",
-    virtualCores: 2,
-    memory: 6
-  }
-])
-</script>
diff --git a/gui/src/interfaces/resources.interface.ts b/gui/src/interfaces/resources.interface.ts
index 6c83629..9a634c1 100644
--- a/gui/src/interfaces/resources.interface.ts
+++ b/gui/src/interfaces/resources.interface.ts
@@ -18,6 +18,7 @@ export interface ICredentials{
 export interface IResource {
   uuid: string
   title: string
+  regions: string
   securityGroup: string
   subnet: string
   endpoint: string
@@ -35,6 +36,7 @@ export interface IAppResource {
   uuid: string
   title: string
   platform: string
+  regions: string
   enabled: boolean
 }
 
diff --git a/gui/src/store/modules/resources.ts b/gui/src/store/modules/resources.ts
index dfc7cfb..659015c 100644
--- a/gui/src/store/modules/resources.ts
+++ b/gui/src/store/modules/resources.ts
@@ -26,7 +26,14 @@ export const useResourceStore = defineStore("resource", {
     },
     async getAllResources(): Promise<IPagination<IResource>> {
       this.platforms = await this.getPlatforms()
-      this.resources = await resourceService.getAllResources()
+      let resources = await resourceService.getAllResources()
+
+      resources.results.forEach((r)=>{
+        if(!r.regions){
+          r.regions = ''
+        }
+      })
+      this.resources = resources
       return this.resources
     },
     async getAllNodeCandidate(uuid:string): Promise<Array<INodeCandidate>> {