diff --git a/.github/workflows/onpremise-amz-01.yaml b/.github/workflows/onpremise-amz-01.yaml
index 35cd8c44..6691020f 100644
--- a/.github/workflows/onpremise-amz-01.yaml
+++ b/.github/workflows/onpremise-amz-01.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/.github/workflows/onpremise-auto-01.yaml b/.github/workflows/onpremise-auto-01.yaml
index 8567ec46..002e28a2 100644
--- a/.github/workflows/onpremise-auto-01.yaml
+++ b/.github/workflows/onpremise-auto-01.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/.github/workflows/onpremise-dds-01.yaml b/.github/workflows/onpremise-dds-01.yaml
index 024363d9..d6543f83 100644
--- a/.github/workflows/onpremise-dds-01.yaml
+++ b/.github/workflows/onpremise-dds-01.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/.github/workflows/onpremise-def-01.yaml b/.github/workflows/onpremise-def-01.yaml
index 6a381fb6..61e7c845 100644
--- a/.github/workflows/onpremise-def-01.yaml
+++ b/.github/workflows/onpremise-def-01.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/.github/workflows/onpremise-hha-01.yaml b/.github/workflows/onpremise-hha-01.yaml
index 46bd7729..b5c264f3 100644
--- a/.github/workflows/onpremise-hha-01.yaml
+++ b/.github/workflows/onpremise-hha-01.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/.github/workflows/onpremise-rl-01.yaml b/.github/workflows/onpremise-rl-01.yaml
index e8d47444..60102898 100644
--- a/.github/workflows/onpremise-rl-01.yaml
+++ b/.github/workflows/onpremise-rl-01.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/.github/workflows/onpremise-tta-01.yaml b/.github/workflows/onpremise-tta-01.yaml
index a993c30e..72b2f944 100644
--- a/.github/workflows/onpremise-tta-01.yaml
+++ b/.github/workflows/onpremise-tta-01.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/.github/workflows/public-demo.yaml b/.github/workflows/public-demo.yaml
index 9b7b5ad4..ca2cf402 100644
--- a/.github/workflows/public-demo.yaml
+++ b/.github/workflows/public-demo.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/.github/workflows/public-dev.yaml b/.github/workflows/public-dev.yaml
index a2fd723e..b390eb9a 100644
--- a/.github/workflows/public-dev.yaml
+++ b/.github/workflows/public-dev.yaml
@@ -30,9 +30,9 @@ jobs:
             --build-arg REACT_APP_KEYCLOAK_CLIENT_ID=${{ secrets.REACT_APP_KEYCLOAK_CLIENT_ID }} \
             --build-arg REACT_APP_DEFAULT_MODE=${{ secrets.REACT_APP_DEFAULT_MODE }} \
             --build-arg REACT_APP_SWITCHABLE_MODE=${{ secrets.REACT_APP_SWITCHABLE_MODE }} \
-            --build-arg REACT_APP_CREATE_ORGANIZATION=${{ secrets.REACT_APP_CREATE_ORGANIZATION }} \
-            --build-arg REACT_APP_CREATE_REGION=${{ secrets.REACT_APP_CREATE_REGION }} \
-            --build-arg REACT_APP_CREATE_INSTANCE=${{ secrets.REACT_APP_CREATE_INSTANCE }} \
+            --build-arg REACT_APP_CREATABLE_ORGANIZATION=${{ secrets.REACT_APP_CREATABLE_ORGANIZATION }} \
+            --build-arg REACT_APP_CREATABLE_REGION=${{ secrets.REACT_APP_CREATABLE_REGION }} \
+            --build-arg REACT_APP_CREATABLE_INSTANCE=${{ secrets.REACT_APP_CREATABLE_INSTANCE }} \
             .
 
       - name: Login to Docker Hub
diff --git a/Dockerfile b/Dockerfile
index 46de68f0..ae0bdc9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,11 @@ ARG REACT_APP_BACKEND_URL
 ARG REACT_APP_KEYCLOAK_URL
 ARG REACT_APP_KEYCLOAK_REALM
 ARG REACT_APP_KEYCLOAK_CLIENT_ID
-ARG REACT_APP_APPLICATION
-ARG REACT_APP_CREATE_ORGANIZATION
-ARG REACT_APP_CREATE_REGION
-ARG REACT_APP_CREATE_INSTANCE
+ARG REACT_APP_DEFAULT_MODE
+ARG REACT_APP_SWITCHABLE_MODE
+ARG REACT_APP_CREATABLE_ORGANIZATION
+ARG REACT_APP_CREATABLE_REGION
+ARG REACT_APP_CREATABLE_INSTANCE
 COPY . /app
 WORKDIR /app
 RUN npm install
diff --git a/package.json b/package.json
index d7b7dfb0..20f91b1e 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "ui",
-  "version": "0.30.7",
+  "version": "0.30.8",
   "private": true,
   "scripts": {
     "dev": "react-scripts start",
     "watch": "npx tailwindcss -i ./tailwind.css -o ./public/css/style.css --watch",
-    "build": "react-scripts build",
+    "build": "react-scripts --max_old_space_size=4096 build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },