From c6fad2264d6064f67d05672f09f0df05b7cf0dc8 Mon Sep 17 00:00:00 2001
From: Ehab-hassan <ehab-hassan@users.noreply.github.com>
Date: Thu, 2 Jan 2025 09:22:11 +0200
Subject: [PATCH 1/9] fix SSD sise at all size (#3777)

---
 .../src/components/connect_wallet_landing.vue     | 11 +++++++++--
 .../src/components/logged_in_landing.vue          | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/packages/playground/src/components/connect_wallet_landing.vue b/packages/playground/src/components/connect_wallet_landing.vue
index f75854bc1b..d9df242737 100644
--- a/packages/playground/src/components/connect_wallet_landing.vue
+++ b/packages/playground/src/components/connect_wallet_landing.vue
@@ -43,8 +43,8 @@
                     class="mx-auto"
                     :src="baseUrl + 'images/icons/live-and-operational/' + s.image"
                   />
-                  <v-card-text>
-                    <p class="text-center tf-header text-h6 font-weight-regular mb-2">
+                  <v-card-text class="card_stats">
+                    <p class="text-center tf-header font-weight-regular mb-2">
                       {{ s.value }}
                     </p>
                     <p class="text-center text-subtitle-1 font-weight-light sub-header">
@@ -103,6 +103,13 @@ export default {
 </script>
 
 <style scoped>
+.tf-header {
+  font-size: 1rem;
+}
+.card_stats {
+  padding: 1rem 0.4rem;
+}
+
 @media only screen and (max-width: 600px) {
   .v-col {
     flex-basis: auto !important;
diff --git a/packages/playground/src/components/logged_in_landing.vue b/packages/playground/src/components/logged_in_landing.vue
index f55564c6ad..b4648d7ab2 100644
--- a/packages/playground/src/components/logged_in_landing.vue
+++ b/packages/playground/src/components/logged_in_landing.vue
@@ -26,7 +26,7 @@
                     class="mx-auto"
                     :src="baseUrl + 'images/icons/live-and-operational/' + s.image"
                   />
-                  <v-card-text>
+                  <v-card-text class="card_stats">
                     <p class="text-center tf-header font-weight-regular mb-2">
                       {{ s.value }}
                     </p>
@@ -158,7 +158,11 @@ export default {
 
 <style scoped>
 .tf-header {
-  font-size: 1rem;
+  font-size: 0.9rem;
+}
+
+.card_stats {
+  padding: 1rem 0.4rem;
 }
 
 .card-opacity {
@@ -170,6 +174,9 @@ export default {
     min-height: 220px !important;
     /* Adjust height for mobile */
   }
+  .tf-header {
+    font-size: 1rem;
+  }
 }
 
 @media only screen and (max-width: 600px) {
@@ -177,6 +184,10 @@ export default {
     flex-basis: auto !important;
   }
 
+  .tf-header {
+    font-size: 1rem;
+  }
+
   .v-card-title {
     white-space: normal !important;
   }

From ac2b854d004bf842802df5e294918fb7705aae2d Mon Sep 17 00:00:00 2001
From: Ehab-hassan <ehab-hassan@users.noreply.github.com>
Date: Sun, 5 Jan 2025 14:28:59 +0200
Subject: [PATCH 2/9] Improve alert and connect button when non-logged (#3779)

* update alert and connect button

* add loading inside button
---
 .../src/components/connect_wallet_landing.vue     |  3 ++-
 .../playground/src/weblets/profile_manager.vue    | 15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/playground/src/components/connect_wallet_landing.vue b/packages/playground/src/components/connect_wallet_landing.vue
index d9df242737..05dc2ea51e 100644
--- a/packages/playground/src/components/connect_wallet_landing.vue
+++ b/packages/playground/src/components/connect_wallet_landing.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <v-alert type="info" variant="tonal">
+    <v-alert color="warning" variant="tonal"
+      ><v-icon size="24" class="pb-1">mdi-alert-circle</v-icon>
       Connect your TFChain
       <a class="app-link" @click="$emit('openProfile')">Wallet</a>
       to view {{ pageTitle }}
diff --git a/packages/playground/src/weblets/profile_manager.vue b/packages/playground/src/weblets/profile_manager.vue
index 23456a5512..e922a0222e 100644
--- a/packages/playground/src/weblets/profile_manager.vue
+++ b/packages/playground/src/weblets/profile_manager.vue
@@ -8,13 +8,16 @@
     eager
   >
     <template #activator="{ props }">
-      <VCard v-bind="props" class="pa-3 d-inline-flex align-center">
-        <VProgressCircular v-if="activating" class="mr-2" indeterminate color="primary" size="25" width="2" />
-        <VIcon icon="mdi-account" size="x-large" class="mr-2" v-else />
+      <VCard v-bind="props" class="pa-3 d-inline-flex align-center bg-transparent elevation-0">
         <div>
-          <p v-if="!profileManager.profile">
-            <strong>Connect your TFChain Wallet</strong>
-          </p>
+          <v-btn v-if="!profileManager.profile" variant="elevated"
+            ><VProgressCircular v-if="activating" class="mr-2" indeterminate color="white" size="20" width="2" /><v-icon
+              size="20"
+              class="pr-2"
+              >mdi-wallet-outline</v-icon
+            >
+            Connect your TFChain Wallet
+          </v-btn>
           <p v-else-if="loadingBalance">
             <strong>Loading...</strong>
           </p>

From 3d4d6d569dec7b6c2a454039b9baa4f4aa822a5f Mon Sep 17 00:00:00 2001
From: ramezsaeed <saeedr@incubaid.com>
Date: Sun, 5 Jan 2025 14:51:26 +0200
Subject: [PATCH 3/9] fix hompepage tests (#3773)

---
 .../tests/frontend_selenium/pages/dashboard.py         |  9 +++++----
 .../frontend_selenium/tests/TFChain/test_homepage.py   | 10 +++++-----
 .../tests/frontend_selenium/utils/grid_proxy.py        |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/playground/tests/frontend_selenium/pages/dashboard.py b/packages/playground/tests/frontend_selenium/pages/dashboard.py
index 8778999278..a6af0ec7a7 100644
--- a/packages/playground/tests/frontend_selenium/pages/dashboard.py
+++ b/packages/playground/tests/frontend_selenium/pages/dashboard.py
@@ -36,16 +36,16 @@ class DashboardPage:
     login_button = (By.XPATH, "//button[.//span[text()='Login']]")
     login_password_input = (By.XPATH, "//label[text()='Password']/following-sibling::input")
     accept_terms_condition_button = (By.XPATH, "//button[.//span[text()='Accept terms and conditions']]")
-    connect_manual_button = (By.XPATH, "//p[@class='mb-4 text-center']/a")
-    connect_google_button = (By.XPATH, "//a[@title='play-store']")
-    connect_apple_button = (By.XPATH, "//a[@title='app-store']")
+    connect_manual_button = (By.XPATH,"//*[contains(text(), 'Threefold Connect')]")
+    connect_google_button = (By.XPATH, "//a[@title='Threefold Connect on Google Play Store']")
+    connect_apple_button = (By.XPATH, "//a[@title='Threefold Connect on Apple App Store']")
     iframe_load_label = (By.XPATH, "//*[contains(text(), 'THESE TERMS AND CONDITIONS')]")
     mnemonic_input_reveal_button = (By.XPATH, "//i[@aria-label='Your Mnemonic appended action']")
     mnemonic_login_label = (By.XPATH, "//label[text()='Your Mnemonic']/following-sibling::input")
     email_login_label = (By.XPATH, "//label[text()='Email']/following-sibling::input")
     id_login_label = (By.XPATH, "//label[text()='Twin ID']/following-sibling::input")
     address_login_label = (By.XPATH, "//label[text()='Address']/following-sibling::input")
-    capacity_stats = (By.XPATH, "//p[contains(@class, 'text-center') and following-sibling::p[text()='Capacity']]")
+    capacity_stats = (By.XPATH, "//p[contains(@class, 'text-center') and following-sibling::p[text()='SSD Capacity']]")
     nodes_stats = (By.XPATH, "//p[contains(@class, 'text-center') and following-sibling::p[text()='Nodes']]")
     countries_stats = (By.XPATH, "//p[contains(@class, 'text-center') and following-sibling::p[text()='Countries']]")
     cores_stats = (By.XPATH, "//p[contains(@class, 'text-center') and following-sibling::p[text()='Cores']]")
@@ -210,6 +210,7 @@ def manual_link(self):
         WebDriverWait(self.browser, 30).until(EC.visibility_of_element_located(self.logout_button))
         WebDriverWait(self.browser, 30).until(EC.presence_of_element_located(self.qr_code_img))
         WebDriverWait(self.browser, 30).until(EC.element_to_be_clickable(self.connect_manual_button))
+        WebDriverWait(self.browser, 30).until(EC.element_to_be_clickable(self.manual_button))
         WebDriverWait(self.browser, 30).until(EC.element_to_be_clickable(self.manual_button)).click()
         return self.get_link()
     
diff --git a/packages/playground/tests/frontend_selenium/tests/TFChain/test_homepage.py b/packages/playground/tests/frontend_selenium/tests/TFChain/test_homepage.py
index 8cfb1b3604..9120a365eb 100644
--- a/packages/playground/tests/frontend_selenium/tests/TFChain/test_homepage.py
+++ b/packages/playground/tests/frontend_selenium/tests/TFChain/test_homepage.py
@@ -5,7 +5,7 @@
 from utils.base import Base
 import pytest
 
-#  Time required for the run (12 cases) is approximately 2 minutes.
+#  Time required for the run (8 cases) is approximately 03:40 minutes.
 
 
 def before_test_setup(browser):
@@ -50,7 +50,6 @@ def test_tft_price(browser):
     assert 0.99 < tft_in_usd * usd_in_tft < 1.1
 
 
-@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3753")
 def test_stats(browser):
     """
       Test Case: TC1674 - TFT stats
@@ -118,7 +117,7 @@ def test_create_account(browser):
     dashboard_page.logout_account()
     assert dashboard_page.wait_for_button(dashboard_page.login_account(password)).is_enabled() == True
 
-@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3753")
+
 def test_account_validation(browser):
     """
       Test Cases: TC1777 - Connect your wallet Validation
@@ -153,7 +152,7 @@ def test_account_validation(browser):
     assert dashboard_page.wait_for('Passwords should match')
     dashboard_page.click_button(dashboard_page.connect_your_wallet(get_email(), '123456'))
     dashboard_page.open_profile()
-    assert dashboard_page.manual_link() == 'https://www.manual.grid.tf/documentation/threefold_token/storing_tft/tf_connect_app.html'
+    assert dashboard_page.manual_link() == 'https://www.manual.grid.tf/documentation/dashboard/wallet_connector.html'
     assert dashboard_page.get_mnemonic() == get_seed()
     assert dashboard_page.get_email() == get_email()
     assert grid_proxy.get_twin_address(dashboard_page.get_id()) == dashboard_page.get_address()
@@ -167,7 +166,7 @@ def test_account_validation(browser):
     assert dashboard_page.wait_for('Password is required')
     assert dashboard_page.wait_for_button(dashboard_page.login_account('123456')).is_enabled() == True
 
-@pytest.mark.skip(reason="https://github.com/threefoldtech/tfgrid-sdk-ts/issues/3753")
+
 def test_login_links(browser):
     """
       Test Case: TC1801 - Verify login profile manager links
@@ -183,6 +182,7 @@ def test_login_links(browser):
     dashboard_page.import_account(get_seed())
     dashboard_page.click_button(dashboard_page.connect_your_wallet(get_email(), password))
     dashboard_page.open_profile()
+    assert dashboard_page.manual_link() == 'https://www.manual.grid.tf/documentation/dashboard/wallet_connector.html'
     assert dashboard_page.connect_manual_link() == 'https://www.manual.grid.tf/documentation/threefold_token/storing_tft/tf_connect_app.html'
     assert dashboard_page.get_connect_google_link() == 'https://play.google.com/store/apps/details?id=org.jimber.threebotlogin&hl=en&gl=US'
     assert dashboard_page.get_connect_apple_link() == 'https://apps.apple.com/us/app/threefold-connect/id1459845885'
diff --git a/packages/playground/tests/frontend_selenium/utils/grid_proxy.py b/packages/playground/tests/frontend_selenium/utils/grid_proxy.py
index 4f301144c8..19cfee8f4f 100644
--- a/packages/playground/tests/frontend_selenium/utils/grid_proxy.py
+++ b/packages/playground/tests/frontend_selenium/utils/grid_proxy.py
@@ -69,7 +69,7 @@ def get_stats_capicity(self):
             stats_url = 'https://stats.' + Base.net + '.grid.tf/api/stats-summary'
         r = requests.post(stats_url, timeout=10)
         stats_json = r.json()
-        return list(stats_json.values())
+        return list(stats_json.values())[1::] #Avoid selecting HDD capacity; as its not shown in the dashboard anymore.
 
     def get_stats(self):
         up = requests.get(Base.gridproxy_url + 'stats?status=up', timeout=10).json()

From b5aa618f7bad2e3c3d204b7c84c171f81b4e869d Mon Sep 17 00:00:00 2001
From: Amira <56790126+amiraabouhadid@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:32:26 +0200
Subject: [PATCH 4/9] add hide-details to reduce spacing (#3782)

---
 packages/playground/src/components/caprover_worker.vue | 4 ++--
 packages/playground/src/components/k8s_worker.vue      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/playground/src/components/caprover_worker.vue b/packages/playground/src/components/caprover_worker.vue
index c717e4abad..73f9f8d72b 100644
--- a/packages/playground/src/components/caprover_worker.vue
+++ b/packages/playground/src/components/caprover_worker.vue
@@ -33,10 +33,10 @@
     />
 
     <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-      <v-switch color="primary" inset label="Dedicated" v-model="$props.modelValue.dedicated" />
+      <v-switch color="primary" inset label="Dedicated" v-model="$props.modelValue.dedicated" hide-details />
     </input-tooltip>
     <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">
-      <v-switch color="primary" inset label="Certified" v-model="$props.modelValue.certified" />
+      <v-switch color="primary" inset label="Certified" v-model="$props.modelValue.certified" hide-details />
     </input-tooltip>
 
     <TfSelectionDetails
diff --git a/packages/playground/src/components/k8s_worker.vue b/packages/playground/src/components/k8s_worker.vue
index 437c772f06..81854cebc2 100644
--- a/packages/playground/src/components/k8s_worker.vue
+++ b/packages/playground/src/components/k8s_worker.vue
@@ -77,11 +77,11 @@
     />
 
     <input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
-      <v-switch color="primary" inset label="Dedicated" v-model="$props.modelValue.dedicated" />
+      <v-switch color="primary" inset label="Dedicated" v-model="$props.modelValue.dedicated" hide-details />
     </input-tooltip>
 
     <input-tooltip inline tooltip="Renting capacity on certified nodes is charged 25% extra.">
-      <v-switch color="primary" inset label="Certified" v-model="$props.modelValue.certified" />
+      <v-switch color="primary" inset label="Certified" v-model="$props.modelValue.certified" hide-details />
     </input-tooltip>
 
     <TfSelectionDetails

From 761fc1e83b80d1e491e045bdb1bfc424dda5b420 Mon Sep 17 00:00:00 2001
From: Omar Kassem <omarksm09@gmail.com>
Date: Thu, 9 Jan 2025 16:16:20 +0200
Subject: [PATCH 5/9] chore: upgrade lerna to 8.0.0 (#3795)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1231ab92c2..57b8f8e1d5 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "eslint-plugin-svelte3": "^4.0.0",
     "eslint-plugin-vue": "^9.10.0",
     "husky": "^8.0.3",
-    "lerna": "^6.6.1",
+    "lerna": "8.0.0",
     "lint-staged": "^13.2.0",
     "prettier": "^2.8.7",
     "prettier-plugin-svelte": "^2.10.0"

From b5ce9cde18bbf1d36f41c759faaff8cf1adec52f Mon Sep 17 00:00:00 2001
From: Mayar Osama Fouad Ali <66883096+maayarosama@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:09:37 +0200
Subject: [PATCH 6/9] Added Hex seed to profile manager (#3765)

* Added Hex seed to profile manager

* Fixed the copy button and added a tooltip

* Added Link to Threefold connect in manual

* Centering the qrcode section

* Removing the threefold connect link

* Only showing mnemonics field if it's different than the hexseed
---
 .../playground/src/stores/profile_manager.ts   |  1 +
 packages/playground/src/utils/grid.ts          |  1 +
 .../playground/src/weblets/profile_manager.vue | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/playground/src/stores/profile_manager.ts b/packages/playground/src/stores/profile_manager.ts
index c8d6cb1f97..b71fccf54e 100644
--- a/packages/playground/src/stores/profile_manager.ts
+++ b/packages/playground/src/stores/profile_manager.ts
@@ -14,6 +14,7 @@ export interface Profile {
   pk: string;
   keypairType: KeypairType | undefined;
   email: string;
+  hexSeed: string;
 }
 
 export interface State {
diff --git a/packages/playground/src/utils/grid.ts b/packages/playground/src/utils/grid.ts
index ae598a72d4..9171894174 100644
--- a/packages/playground/src/utils/grid.ts
+++ b/packages/playground/src/utils/grid.ts
@@ -97,6 +97,7 @@ export async function loadProfile(grid: GridClient): Promise<Profile> {
     pk: (await grid.twins.get({ id: grid!.twinId })).pk,
     keypairType: grid.clientOptions!.keypairType,
     email: await readEmail(grid),
+    hexSeed: grid.clientOptions!.mnemonic,
   };
 }
 
diff --git a/packages/playground/src/weblets/profile_manager.vue b/packages/playground/src/weblets/profile_manager.vue
index e922a0222e..33ae90af70 100644
--- a/packages/playground/src/weblets/profile_manager.vue
+++ b/packages/playground/src/weblets/profile_manager.vue
@@ -356,19 +356,23 @@
       <template v-if="profileManager.profile">
         <v-row>
           <v-col cols="12" md="6" lg="6" xl="6">
-            <PasswordInputWrapper #="{ props }">
+            <PasswordInputWrapper
+              #="{ props }"
+              v-if="profileManager.profile.mnemonic !== profileManager.profile.hexSeed"
+            >
               <VTextField
-                :label="
-                  profileManager.profile.mnemonic.startsWith('0x') || profileManager.profile.mnemonic.length === 64
-                    ? 'Your Hex Seed'
-                    : 'Your Mnemonic'
-                "
+                :label="'Your Mnemonic'"
                 readonly
                 v-model="profileManager.profile.mnemonic"
                 v-bind="props"
                 :disabled="activating || creatingAccount || activatingAccount"
               />
             </PasswordInputWrapper>
+            <CopyInputWrapper :data="profileManager.profile.hexSeed" #="{ props }">
+              <input-tooltip tooltip=" Please use this hex seed to import your wallet in Threefold Connect">
+                <VTextField label="Your Hex Seed" readonly v-model="profileManager.profile.hexSeed" v-bind="props" />
+              </input-tooltip>
+            </CopyInputWrapper>
 
             <CopyInputWrapper :data="profileManager.profile.twinId.toString()" #="{ props }">
               <VTextField label="Twin ID" readonly v-model="profileManager.profile.twinId" v-bind="props" />
@@ -386,7 +390,7 @@
             </CopyInputWrapper>
           </v-col>
 
-          <v-col cols="12" md="6" lg="6" xl="6">
+          <v-col cols="12" md="6" lg="6" xl="6" class="d-flex justify-center align-center">
             <section class="qr d-flex flex-column align-center">
               <QRPlayStore
                 :qr="'TFT:' + bridge + '?message=twin_' + profileManager.profile.twinId + '&sender=me&amount=100'"

From b7d2f962546168781fe547ae5844cfa1ad39221d Mon Sep 17 00:00:00 2001
From: Khaled Youssef <110984055+khaledyoussef24@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:19:19 +0200
Subject: [PATCH 7/9] Add deployment scripts for Gitea, Jenkins and Jitsi
 (#3689)

* Add deployment scripts for Gitea, Jenkins, Jitsi, and Nostr

* fixed jitsi and nostr

* fixes for gitea

* randomize name generation fixing gateway creation

* using public ip for gitea

* removing the nostor script for working on it seperatly , fixing the gitea issues

* adding comment for smtp server
---
 .../grid_client/scripts/applications/gitea.ts | 128 ++++++++++++++++++
 .../scripts/applications/jenkins.ts           | 119 ++++++++++++++++
 .../grid_client/scripts/applications/jitsi.ts | 117 ++++++++++++++++
 3 files changed, 364 insertions(+)
 create mode 100644 packages/grid_client/scripts/applications/gitea.ts
 create mode 100644 packages/grid_client/scripts/applications/jenkins.ts
 create mode 100644 packages/grid_client/scripts/applications/jitsi.ts

diff --git a/packages/grid_client/scripts/applications/gitea.ts b/packages/grid_client/scripts/applications/gitea.ts
new file mode 100644
index 0000000000..b57ea39b94
--- /dev/null
+++ b/packages/grid_client/scripts/applications/gitea.ts
@@ -0,0 +1,128 @@
+import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { config, getClient } from "../client_loader";
+import { log, pingNodes } from "../utils";
+
+async function deploy(client, vms, subdomain, gatewayNode) {
+  const resultVM = await client.machines.deploy(vms);
+  log("================= Deploying VM =================");
+  log(resultVM);
+  log("================= Deploying VM =================");
+
+  const vmPlanetary = (await client.machines.getObj(vms.name))[0].planetary;
+
+  // Name Gateway Model
+  const gw: GatewayNameModel = {
+    name: subdomain,
+    node_id: gatewayNode.nodeId,
+    tls_passthrough: false,
+    backends: [`http://[${vmPlanetary}]:3000`],
+  };
+
+  const resultGateway = await client.gateway.deploy_name(gw);
+  log("================= Deploying name gateway =================");
+  log(resultGateway);
+  log("================= Deploying name gateway =================");
+}
+
+async function getDeployment(client, vms, gw) {
+  const resultVM = await client.machines.getObj(vms.name);
+  const resultGateway = await client.gateway.getObj(gw);
+  log("================= Getting deployment information =================");
+  log(resultVM);
+  log(resultGateway);
+  log("https://" + resultGateway[0].domain);
+  log("================= Getting deployment information =================");
+}
+
+async function cancel(client, vms, gw) {
+  const resultVM = await client.machines.delete(vms);
+  const resultGateway = await client.gateway.delete_name(gw);
+  log("================= Canceling the deployment =================");
+  log(resultVM);
+  log(resultGateway);
+  log("================= Canceling the deployment =================");
+}
+
+async function main() {
+  const name = "giteainstance";
+  const networkName = "giteanetwork";
+  const grid3 = await getClient(`gitea/${name}`);
+  const subdomain = "gt" + grid3.twinId + name;
+  const instanceCapacity = { cru: 2, mru: 4, sru: 50 };
+
+  // VM Node Selection
+  const vmQueryOptions: FilterOptions = {
+    cru: instanceCapacity.cru,
+    mru: instanceCapacity.mru,
+    sru: instanceCapacity.sru,
+    availableFor: grid3.twinId,
+    farmId: 1,
+  };
+
+  // Gateway Node Selection
+  const gatewayQueryOptions: FilterOptions = {
+    gateway: true,
+    availableFor: grid3.twinId,
+  };
+  const gatewayNode = (await grid3.capacity.filterNodes(gatewayQueryOptions))[0];
+  const nodes = await grid3.capacity.filterNodes(vmQueryOptions);
+  const vmNode = await pingNodes(grid3, nodes);
+  const domain = subdomain + "." + gatewayNode.publicConfig.domain;
+
+  const vms: MachinesModel = {
+    name,
+    network: {
+      name: networkName,
+      ip_range: "10.249.0.0/16",
+    },
+    machines: [
+      {
+        name: "giteavm",
+        node_id: vmNode,
+        disks: [
+          {
+            name: "giteadisk",
+            size: instanceCapacity.sru,
+            mountpoint: "/mnt/data",
+          },
+        ],
+        planetary: true,
+        public_ip: false,
+        public_ip6: false,
+        mycelium: true,
+        cpu: instanceCapacity.cru,
+        memory: 1024 * instanceCapacity.mru,
+        rootfs_size: 0,
+        flist: "https://hub.grid.tf/petep.3bot/threefolddev-gitea-latest.flist",
+        entrypoint: "/sbin/zinit init",
+        env: {
+          SSH_KEY: config.ssh_key,
+          GITEA__HOSTNAME: domain,
+          //Uncomment incase of using smtp server
+          // GITEA__mailer__PROTOCOL: "smtp",
+          // GITEA__mailer__ENABLED: "true",
+          // GITEA__mailer__HOST: "smtp.example.com",
+          // GITEA__mailer__FROM: "admin@example.com",
+          // GITEA__mailer__PORT: "587",
+          // GITEA__mailer__USER: "admin",
+          // GITEA__mailer__PASSWD: "password123",
+        },
+      },
+    ],
+    metadata: "",
+    description: "Deploying Gitea via TS Grid3 client",
+  };
+
+  // Deploy VMs
+  await deploy(grid3, vms, subdomain, gatewayNode);
+
+  // Get the deployment
+  await getDeployment(grid3, vms, subdomain);
+
+  // Uncomment the line below to cancel the deployment
+  // await cancel(grid3, { name }, { name: subdomain });
+
+  await grid3.disconnect();
+}
+
+main();
diff --git a/packages/grid_client/scripts/applications/jenkins.ts b/packages/grid_client/scripts/applications/jenkins.ts
new file mode 100644
index 0000000000..d9e6595302
--- /dev/null
+++ b/packages/grid_client/scripts/applications/jenkins.ts
@@ -0,0 +1,119 @@
+import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { config, getClient } from "../client_loader";
+import { log, pingNodes } from "../utils";
+
+async function deploy(client, vms, subdomain, gatewayNode) {
+  const resultVM = await client.machines.deploy(vms);
+  log("================= Deploying VM =================");
+  log(resultVM);
+  log("================= Deploying VM =================");
+
+  const vmPlanetary = (await client.machines.getObj(vms.name))[0].planetary;
+  // Name Gateway Model
+  const gw: GatewayNameModel = {
+    name: subdomain,
+    node_id: gatewayNode.nodeId,
+    tls_passthrough: false,
+    backends: ["http://[" + vmPlanetary + "]:80"],
+  };
+
+  const resultGateway = await client.gateway.deploy_name(gw);
+  log("================= Deploying name gateway =================");
+  log(resultGateway);
+  log("================= Deploying name gateway =================");
+}
+
+async function getDeployment(client, vms, gw) {
+  const resultVM = await client.machines.getObj(vms.name);
+  const resultGateway = await client.gateway.getObj(gw);
+  log("================= Getting deployment information =================");
+  log(resultVM);
+  log(resultGateway);
+  log("https://" + resultGateway[0].domain);
+  log("================= Getting deployment information =================");
+}
+
+async function cancel(client, vms, gw) {
+  const resultVM = await client.machines.delete(vms);
+  const resultGateway = await client.gateway.delete_name(gw);
+  log("================= Canceling the deployment =================");
+  log(resultVM);
+  log(resultGateway);
+  log("================= Canceling the deployment =================");
+}
+
+async function main() {
+  const name = "newjenkins";
+  const grid3 = await getClient(`jenkins/${name}`);
+  const subdomain = "jk" + grid3.twinId + name;
+  const instanceCapacity = { cru: 2, mru: 4, sru: 50 }; // Medium flavor as an example
+
+  // VMNode Selection
+  const vmQueryOptions: FilterOptions = {
+    cru: instanceCapacity.cru,
+    mru: instanceCapacity.mru,
+    sru: instanceCapacity.sru,
+    availableFor: grid3.twinId,
+    farmId: 1,
+  };
+  // GatewayNode Selection
+  const gatewayQueryOptions: FilterOptions = {
+    gateway: true,
+    availableFor: grid3.twinId,
+  };
+  const gatewayNode = (await grid3.capacity.filterNodes(gatewayQueryOptions))[0];
+  const nodes = await grid3.capacity.filterNodes(vmQueryOptions);
+  const vmNode = await pingNodes(grid3, nodes);
+  const domain = subdomain + "." + gatewayNode.publicConfig.domain;
+
+  const vms: MachinesModel = {
+    name,
+    network: {
+      name: "jknet",
+      ip_range: "10.254.0.0/16",
+    },
+    machines: [
+      {
+        name: "jenkins",
+        node_id: vmNode,
+        disks: [
+          {
+            name: "jkDisk",
+            size: instanceCapacity.sru,
+            mountpoint: "/mnt/data",
+          },
+        ],
+        planetary: true,
+        public_ip: false,
+        public_ip6: false,
+        mycelium: true,
+        cpu: instanceCapacity.cru,
+        memory: 1024 * instanceCapacity.mru,
+        rootfs_size: 0,
+        flist: "https://hub.grid.tf/tf-official-apps/jenkins-latest.flist",
+        entrypoint: "/sbin/zinit init",
+        env: {
+          SSH_KEY: config.ssh_key,
+          JENKINS_HOSTNAME: domain,
+          JENKINS_ADMIN_USERNAME: "admin", // Default username
+          JENKINS_ADMIN_PASSWORD: "12345678", // Default password
+        },
+      },
+    ],
+    metadata: "",
+    description: "test deploying Jenkins via ts grid3 client",
+  };
+
+  // Deploy VMs
+  await deploy(grid3, vms, subdomain, gatewayNode);
+
+  // Get the deployment
+  await getDeployment(grid3, vms, subdomain);
+
+  // Uncomment the line below to cancel the deployment
+  // await cancel(grid3, { name }, { name: subdomain });
+
+  await grid3.disconnect();
+}
+
+main();
diff --git a/packages/grid_client/scripts/applications/jitsi.ts b/packages/grid_client/scripts/applications/jitsi.ts
new file mode 100644
index 0000000000..6975143435
--- /dev/null
+++ b/packages/grid_client/scripts/applications/jitsi.ts
@@ -0,0 +1,117 @@
+import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { config, getClient } from "../client_loader";
+import { log, pingNodes } from "../utils";
+
+async function deploy(client, vms, subdomain, gatewayNode) {
+  const resultVM = await client.machines.deploy(vms);
+  log("================= Deploying VM =================");
+  log(resultVM);
+  log("================= Deploying VM =================");
+
+  const vmPlanetary = (await client.machines.getObj(vms.name))[0].planetary;
+  // Name Gateway Model
+  const gw: GatewayNameModel = {
+    name: subdomain,
+    node_id: gatewayNode.nodeId,
+    tls_passthrough: false,
+    backends: ["http://[" + vmPlanetary + "]:80"],
+  };
+
+  const resultGateway = await client.gateway.deploy_name(gw);
+  log("================= Deploying name gateway =================");
+  log(resultGateway);
+  log("================= Deploying name gateway =================");
+}
+
+async function getDeployment(client, vms, gw) {
+  const resultVM = await client.machines.getObj(vms.name);
+  const resultGateway = await client.gateway.getObj(gw);
+  log("================= Getting deployment information =================");
+  log(resultVM);
+  log(resultGateway);
+  log("https://" + resultGateway[0].domain);
+  log("================= Getting deployment information =================");
+}
+
+async function cancel(client, vms, gw) {
+  const resultVM = await client.machines.delete(vms);
+  const resultGateway = await client.gateway.delete_name(gw);
+  log("================= Canceling the deployment =================");
+  log(resultVM);
+  log(resultGateway);
+  log("================= Canceling the deployment =================");
+}
+
+async function main() {
+  const name = "newjitsi";
+  const grid3 = await getClient(`jitsi/${name}`);
+  const subdomain = "jt" + grid3.twinId + name;
+  const instanceCapacity = { cru: 2, mru: 4, sru: 50 }; // Update the instance capacity values according to your requirements.
+
+  // VMNode Selection
+  const vmQueryOptions: FilterOptions = {
+    cru: instanceCapacity.cru,
+    mru: instanceCapacity.mru,
+    sru: instanceCapacity.sru,
+    availableFor: grid3.twinId,
+    farmId: 1,
+  };
+  // GatewayNode Selection
+  const gatewayQueryOptions: FilterOptions = {
+    gateway: true,
+    availableFor: grid3.twinId,
+  };
+  const gatewayNode = (await grid3.capacity.filterNodes(gatewayQueryOptions))[0];
+  const nodes = await grid3.capacity.filterNodes(vmQueryOptions);
+  const vmNode = await pingNodes(grid3, nodes);
+  const domain = subdomain + "." + gatewayNode.publicConfig.domain;
+
+  const vms: MachinesModel = {
+    name,
+    network: {
+      name: "jitnet",
+      ip_range: "10.251.0.0/16",
+    },
+    machines: [
+      {
+        name: "jitsi",
+        node_id: vmNode,
+        disks: [
+          {
+            name: "jitDisk",
+            size: instanceCapacity.sru,
+            mountpoint: "/mnt/data",
+          },
+        ],
+        planetary: true,
+        public_ip: false,
+        public_ip6: false,
+        mycelium: true,
+        cpu: instanceCapacity.cru,
+        memory: 1024 * instanceCapacity.mru,
+        rootfs_size: 0,
+        flist: "https://hub.grid.tf/tf-official-apps/jitsi-latest.flist",
+        entrypoint: "/sbin/zinit init",
+        env: {
+          SSH_KEY: config.ssh_key,
+          JITSI_HOSTNAME: domain,
+        },
+      },
+    ],
+    metadata: "",
+    description: "test deploying Jitsi via ts grid3 client",
+  };
+
+  // Deploy VMs
+  await deploy(grid3, vms, subdomain, gatewayNode);
+
+  // Get the deployment
+  await getDeployment(grid3, vms, subdomain);
+
+  // Uncomment the line below to cancel the deployment
+  // await cancel(grid3, { name }, { name: subdomain });
+
+  await grid3.disconnect();
+}
+
+main();

From 8dbc0697f23622806501e2d5f53481e84e7dcb62 Mon Sep 17 00:00:00 2001
From: Ehab-hassan <ehab-hassan@users.noreply.github.com>
Date: Mon, 13 Jan 2025 09:43:43 +0200
Subject: [PATCH 8/9] Update Deploy button (#3785)

* update Deploy button

* updates Deploy at all Apps

* fix repeating button code

* fix button
---
 packages/playground/src/components/weblet_layout.vue | 2 +-
 packages/playground/src/weblets/full_vm.vue          | 7 ++++++-
 packages/playground/src/weblets/jenkins.vue          | 7 ++++++-
 packages/playground/src/weblets/micro_vm.vue         | 7 ++++++-
 packages/playground/src/weblets/tf_algorand.vue      | 7 ++++++-
 packages/playground/src/weblets/tf_caprover.vue      | 7 ++++++-
 packages/playground/src/weblets/tf_casperlabs.vue    | 7 ++++++-
 packages/playground/src/weblets/tf_discourse.vue     | 7 ++++++-
 packages/playground/src/weblets/tf_domains.vue       | 7 ++++++-
 packages/playground/src/weblets/tf_funkwhale.vue     | 7 ++++++-
 packages/playground/src/weblets/tf_jitsi.vue         | 7 ++++++-
 packages/playground/src/weblets/tf_kubernetes.vue    | 7 ++++++-
 packages/playground/src/weblets/tf_mattermost.vue    | 7 ++++++-
 packages/playground/src/weblets/tf_nextcloud.vue     | 7 ++++++-
 packages/playground/src/weblets/tf_node_pilot.vue    | 7 ++++++-
 packages/playground/src/weblets/tf_owncloud.vue      | 7 ++++++-
 packages/playground/src/weblets/tf_peertube.vue      | 7 ++++++-
 packages/playground/src/weblets/tf_presearch.vue     | 7 ++++++-
 packages/playground/src/weblets/tf_staticwebsite.vue | 7 ++++++-
 packages/playground/src/weblets/tf_subsquid.vue      | 7 ++++++-
 packages/playground/src/weblets/tf_taiga.vue         | 7 ++++++-
 packages/playground/src/weblets/tf_umbrel.vue        | 7 ++++++-
 packages/playground/src/weblets/tf_wordpress.vue     | 7 ++++++-
 23 files changed, 133 insertions(+), 23 deletions(-)

diff --git a/packages/playground/src/components/weblet_layout.vue b/packages/playground/src/components/weblet_layout.vue
index d26c217648..90654b99cf 100644
--- a/packages/playground/src/components/weblet_layout.vue
+++ b/packages/playground/src/components/weblet_layout.vue
@@ -90,7 +90,7 @@
         </a>
       </v-alert>
       <v-divider class="mt-3" />
-      <v-card-actions class="justify-end my-1 mr-2">
+      <v-card-actions class="justify-end my-1 mr-2 py-4">
         <slot name="footer-actions" :validateBeforeDeploy="validateBeforeDeploy" v-if="!status" />
         <v-btn v-else color="secondary" :loading="status === 'deploy'" @click="reset"> Back </v-btn>
       </v-card-actions>
diff --git a/packages/playground/src/weblets/full_vm.vue b/packages/playground/src/weblets/full_vm.vue
index 921a576edf..d43bd35264 100644
--- a/packages/playground/src/weblets/full_vm.vue
+++ b/packages/playground/src/weblets/full_vm.vue
@@ -131,7 +131,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/jenkins.vue b/packages/playground/src/weblets/jenkins.vue
index a7d1479c60..e9b3ba21d5 100644
--- a/packages/playground/src/weblets/jenkins.vue
+++ b/packages/playground/src/weblets/jenkins.vue
@@ -105,7 +105,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/micro_vm.vue b/packages/playground/src/weblets/micro_vm.vue
index b1de6b137d..c6ab865369 100644
--- a/packages/playground/src/weblets/micro_vm.vue
+++ b/packages/playground/src/weblets/micro_vm.vue
@@ -171,7 +171,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_algorand.vue b/packages/playground/src/weblets/tf_algorand.vue
index 7ea99ef289..3603cca18a 100644
--- a/packages/playground/src/weblets/tf_algorand.vue
+++ b/packages/playground/src/weblets/tf_algorand.vue
@@ -103,7 +103,12 @@
       <manage-ssh-deployemnt @selected-keys="updateSSHkeyEnv($event)" />
     </d-tabs>
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_caprover.vue b/packages/playground/src/weblets/tf_caprover.vue
index a4094dbd02..e11ad78d0c 100644
--- a/packages/playground/src/weblets/tf_caprover.vue
+++ b/packages/playground/src/weblets/tf_caprover.vue
@@ -101,7 +101,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_casperlabs.vue b/packages/playground/src/weblets/tf_casperlabs.vue
index 8832217257..9eab8f5558 100644
--- a/packages/playground/src/weblets/tf_casperlabs.vue
+++ b/packages/playground/src/weblets/tf_casperlabs.vue
@@ -73,7 +73,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_discourse.vue b/packages/playground/src/weblets/tf_discourse.vue
index 00bfb969c9..62dd0d42e9 100644
--- a/packages/playground/src/weblets/tf_discourse.vue
+++ b/packages/playground/src/weblets/tf_discourse.vue
@@ -102,7 +102,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_domains.vue b/packages/playground/src/weblets/tf_domains.vue
index 80abe8778c..7832d8fdc8 100644
--- a/packages/playground/src/weblets/tf_domains.vue
+++ b/packages/playground/src/weblets/tf_domains.vue
@@ -65,7 +65,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_funkwhale.vue b/packages/playground/src/weblets/tf_funkwhale.vue
index 325f11ef56..7fdeea0122 100644
--- a/packages/playground/src/weblets/tf_funkwhale.vue
+++ b/packages/playground/src/weblets/tf_funkwhale.vue
@@ -125,7 +125,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_jitsi.vue b/packages/playground/src/weblets/tf_jitsi.vue
index 87046d8232..75045c4440 100644
--- a/packages/playground/src/weblets/tf_jitsi.vue
+++ b/packages/playground/src/weblets/tf_jitsi.vue
@@ -74,7 +74,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_kubernetes.vue b/packages/playground/src/weblets/tf_kubernetes.vue
index c8d4385b92..558466ce30 100644
--- a/packages/playground/src/weblets/tf_kubernetes.vue
+++ b/packages/playground/src/weblets/tf_kubernetes.vue
@@ -79,7 +79,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_mattermost.vue b/packages/playground/src/weblets/tf_mattermost.vue
index 417ddceebb..d0aa7b487b 100644
--- a/packages/playground/src/weblets/tf_mattermost.vue
+++ b/packages/playground/src/weblets/tf_mattermost.vue
@@ -83,7 +83,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_nextcloud.vue b/packages/playground/src/weblets/tf_nextcloud.vue
index 347f492299..8c45d1a657 100644
--- a/packages/playground/src/weblets/tf_nextcloud.vue
+++ b/packages/playground/src/weblets/tf_nextcloud.vue
@@ -72,7 +72,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_node_pilot.vue b/packages/playground/src/weblets/tf_node_pilot.vue
index 53ff55b0ec..cbab1cadcf 100644
--- a/packages/playground/src/weblets/tf_node_pilot.vue
+++ b/packages/playground/src/weblets/tf_node_pilot.vue
@@ -72,7 +72,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_owncloud.vue b/packages/playground/src/weblets/tf_owncloud.vue
index 62a6367b86..104d034acd 100644
--- a/packages/playground/src/weblets/tf_owncloud.vue
+++ b/packages/playground/src/weblets/tf_owncloud.vue
@@ -122,7 +122,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_peertube.vue b/packages/playground/src/weblets/tf_peertube.vue
index 68e39d1df5..b4798c40ab 100644
--- a/packages/playground/src/weblets/tf_peertube.vue
+++ b/packages/playground/src/weblets/tf_peertube.vue
@@ -99,7 +99,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_presearch.vue b/packages/playground/src/weblets/tf_presearch.vue
index 9cb1d8136c..61226feac8 100644
--- a/packages/playground/src/weblets/tf_presearch.vue
+++ b/packages/playground/src/weblets/tf_presearch.vue
@@ -106,7 +106,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_staticwebsite.vue b/packages/playground/src/weblets/tf_staticwebsite.vue
index 3e81ad2132..c71bb70548 100644
--- a/packages/playground/src/weblets/tf_staticwebsite.vue
+++ b/packages/playground/src/weblets/tf_staticwebsite.vue
@@ -97,7 +97,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_subsquid.vue b/packages/playground/src/weblets/tf_subsquid.vue
index f2304f4723..e370a08880 100644
--- a/packages/playground/src/weblets/tf_subsquid.vue
+++ b/packages/playground/src/weblets/tf_subsquid.vue
@@ -87,7 +87,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_taiga.vue b/packages/playground/src/weblets/tf_taiga.vue
index 73ddcc8b1c..b2d352a4f1 100644
--- a/packages/playground/src/weblets/tf_taiga.vue
+++ b/packages/playground/src/weblets/tf_taiga.vue
@@ -135,7 +135,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_umbrel.vue b/packages/playground/src/weblets/tf_umbrel.vue
index 0a1774423c..b1c24e5926 100644
--- a/packages/playground/src/weblets/tf_umbrel.vue
+++ b/packages/playground/src/weblets/tf_umbrel.vue
@@ -112,7 +112,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>
diff --git a/packages/playground/src/weblets/tf_wordpress.vue b/packages/playground/src/weblets/tf_wordpress.vue
index 584a2f09bb..2bc13ad3c5 100644
--- a/packages/playground/src/weblets/tf_wordpress.vue
+++ b/packages/playground/src/weblets/tf_wordpress.vue
@@ -126,7 +126,12 @@
     </d-tabs>
 
     <template #footer-actions="{ validateBeforeDeploy }">
-      <v-btn color="secondary" @click="validateBeforeDeploy(deploy)" text="Deploy" />
+      <v-btn
+        variant="elevated"
+        class="text-primery px-10 py-3 h-auto text-subtitle-1"
+        @click="validateBeforeDeploy(deploy)"
+        text="Deploy"
+      />
     </template>
   </weblet-layout>
 </template>

From fd63f335d277e1b3585aee2448adbbf565790ec0 Mon Sep 17 00:00:00 2001
From: Mayar Osama Fouad Ali <66883096+maayarosama@users.noreply.github.com>
Date: Mon, 13 Jan 2025 11:38:01 +0200
Subject: [PATCH 9/9] Supporting deployments on zos4 nodes (#3497)

* Supporting deployments on zos4 nodes

* Fixing tests, adding vmlight primitive and adding a match method

* Adding networklight class in primitives

* Updating networklight class in primitives

* Adjusting FilterOptions to support features in automatic and manual node selection

* Adding wiregaurd to filters

* Adjusting getFeaturesFromFilters method and adding planetary, mycelium and wireguard to filters in all solutions

* Updating networklight primitive class, create deployment and create methods to support zos4 deployments

* Adjusting load, NodeExists, addNode and getFreeSubnet methods in network light primitive

* Updating getFeaturesFromFilters method

* Fixing reservation network error, updating k8s to support zos4 deployment, removing unnecessary comments and adding descriptive ones

* Added a script to deploy on a zos4 node

* Adding deployment flow doc

* Resolving comments: removing unnecessary comments, adding wiregaurd in AddMachine filters and moving getFeatures method to utils

* Updating network light primitive class

* Revert "Resolving comments: removing unnecessary comments, adding wiregaurd in AddMachine filters and moving getFeatures method to utils"

This reverts commit 17c3ec9264c62c5b7530ad00d3cdb5b78faf6820.

* Revert "Updating network light primitive class"

This reverts commit 14ab9b998b3c635f16827a6f623ec4ed1ca27689.

* Added some changes in networklight primitive and added some more adjustments in _deleteMachineNetwork function

* Fixing _deleteMachineNetwork function

* Adjusting manual selection feature error, fixing the public_ip random error

* Adjusting manual selection feature error, fixing the public_ip random error

* Added the required features in all scripts' filters

* Adjusting Supported interface in manage domains in case of zmachine-light

* Adjust zos4 script and merging functionalites of delete zmachine and zmachine light in one condition to get rid of redundant code

* Resolving comments: Addinf Features enum, using WorkloadTypes in ZmachineData, some updates in networklight primitive

* Refactoring vm primitive file, adjusting features type in filtersOptions and fixing scripts

* Fixing typo in deployment flow readme file

* Fixing scripts unhandled promise error

* Adding features to tests, corrects mispelled words and hiding wireguard in deployement data in case of zmachine light

* Adding features to tests, corrects mispelled words and hiding wireguard in deployement data in case of zmachine light

* Excluding node 259 in single_vm_zos4 script

* adjusting features in zos4 script and updating deployment flow readme file

* Checking against features rather than zos version while deploying, using workloadTypes enum and adding a semi-fix to loadgateway nodes

* Fix: using json.stringify for filters so it doesn't enter an infinite loop when loading gateway nodes

* Removing comments

* Removing features from machinemodel
---
 packages/grid_client/docs/deployment_flow.md  | 117 +++++
 .../scripts/applications/casperlabs.ts        |   3 +-
 .../scripts/applications/discourse.ts         |   3 +-
 .../scripts/applications/funkwhale.ts         |   3 +-
 .../scripts/applications/mattermost.ts        |   5 +-
 .../scripts/applications/nextcloud.ts         |   3 +-
 .../scripts/applications/nodepilot.ts         |   3 +-
 .../scripts/applications/peertube.ts          |   3 +-
 .../scripts/applications/static_website.ts    |   3 +-
 .../scripts/applications/subsquid.ts          |   3 +-
 .../grid_client/scripts/applications/taiga.ts |   3 +-
 .../scripts/applications/wordpress.ts         |   3 +-
 .../scripts/orchestrators/caprover_leader.ts  |   3 +-
 .../scripts/orchestrators/caprover_worker.ts  |   3 +-
 .../orchestrators/kubernetes_leader.ts        |   3 +-
 .../orchestrators/kubernetes_with_qsfs.ts     |   3 +-
 .../orchestrators/kubernetes_worker.ts        |   3 +-
 .../grid_client/scripts/single_vm_zos4.ts     | 115 +++++
 packages/grid_client/src/helpers/types.ts     |  25 +-
 packages/grid_client/src/high_level/base.ts   | 106 +++--
 .../grid_client/src/high_level/kubernetes.ts  |   6 +-
 .../grid_client/src/high_level/machine.ts     | 130 ++++--
 packages/grid_client/src/high_level/models.ts |   3 +-
 .../src/high_level/twinDeploymentHandler.ts   |  12 +-
 packages/grid_client/src/modules/base.ts      |   1 +
 packages/grid_client/src/modules/capacity.ts  |   9 +
 packages/grid_client/src/modules/k8s.ts       |  60 ++-
 packages/grid_client/src/modules/machines.ts  |  47 +-
 packages/grid_client/src/modules/models.ts    |   6 +-
 .../src/primitives/networklight.ts            | 416 ++++++++++++++++++
 packages/grid_client/src/primitives/nodes.ts  |  42 +-
 packages/grid_client/src/primitives/vm.ts     |  75 +++-
 packages/grid_client/src/zos/index.ts         |   2 +
 packages/grid_client/src/zos/network_light.ts |  31 ++
 packages/grid_client/src/zos/workload.ts      |  15 +-
 .../grid_client/src/zos/zmachine_light.ts     |  83 ++++
 .../modules/applications/casperlabs.test.ts   |  11 +-
 .../modules/applications/discourse.test.ts    |  11 +-
 .../modules/applications/funkwhale.test.ts    |  11 +-
 .../modules/applications/mattermost.test.ts   |  11 +-
 .../modules/applications/nextcloud.test.ts    |  11 +-
 .../modules/applications/nodepilot.test.ts    |   3 +-
 .../modules/applications/peertube.test.ts     |  11 +-
 .../modules/applications/subsquid.test.ts     |  11 +-
 .../tests/modules/applications/taiga.test.ts  |  11 +-
 .../modules/applications/wordpress.test.ts    |  11 +-
 .../tests/modules/gateways.test.ts            |  11 +-
 .../tests/modules/kubernetes.test.ts          |  13 +
 .../tests/modules/network_light.test.ts       |  61 +++
 .../grid_client/tests/modules/qsfs.test.ts    |  11 +
 packages/grid_client/tests/modules/vm.test.ts |  20 +-
 .../grid_client/tests/modules/zdb.test.ts     |   4 +-
 .../tests/modules/zmachine_light.test.ts      | 158 +++++++
 .../src/components/caprover_worker.vue        |   3 +
 .../src/components/deployment_data_dialog.vue |   6 +-
 .../playground/src/components/k8s_worker.vue  |   3 +
 .../src/components/manage_gateway_dialog.vue  |  17 +-
 .../components/node_selector/TfDomainName.vue |  23 +-
 .../node_selector/TfManualNodeSelector.vue    |  21 +-
 packages/playground/src/types/nodeSelector.ts |   3 +
 packages/playground/src/utils/deploy_vm.ts    |   2 +
 packages/playground/src/utils/nodeSelector.ts |  21 +-
 .../playground/src/views/minting_view.vue     |  14 +-
 packages/playground/src/weblets/freeflow.vue  |   3 +
 packages/playground/src/weblets/full_vm.vue   |   3 +
 packages/playground/src/weblets/jenkins.vue   |   3 +
 packages/playground/src/weblets/micro_vm.vue  |   3 +
 .../playground/src/weblets/tf_algorand.vue    |   3 +
 .../playground/src/weblets/tf_casperlabs.vue  |   3 +
 .../playground/src/weblets/tf_discourse.vue   |   3 +
 .../playground/src/weblets/tf_funkwhale.vue   |   3 +
 packages/playground/src/weblets/tf_gitea.vue  |   3 +
 packages/playground/src/weblets/tf_jitsi.vue  |   3 +
 .../playground/src/weblets/tf_mattermost.vue  |   3 +
 .../playground/src/weblets/tf_nextcloud.vue   |   3 +
 .../playground/src/weblets/tf_node_pilot.vue  |   3 +
 packages/playground/src/weblets/tf_nostr.vue  |   3 +
 .../playground/src/weblets/tf_owncloud.vue    |   3 +
 .../playground/src/weblets/tf_peertube.vue    |   3 +
 .../playground/src/weblets/tf_presearch.vue   |   3 +
 .../src/weblets/tf_staticwebsite.vue          |   3 +
 .../playground/src/weblets/tf_subsquid.vue    |   3 +
 packages/playground/src/weblets/tf_taiga.vue  |   3 +
 packages/playground/src/weblets/tf_umbrel.vue |   3 +
 .../playground/src/weblets/tf_wordpress.vue   |   3 +
 packages/playground/src/weblets/tfrobot.vue   |   3 +
 86 files changed, 1722 insertions(+), 191 deletions(-)
 create mode 100644 packages/grid_client/docs/deployment_flow.md
 create mode 100644 packages/grid_client/scripts/single_vm_zos4.ts
 create mode 100644 packages/grid_client/src/primitives/networklight.ts
 create mode 100644 packages/grid_client/src/zos/network_light.ts
 create mode 100644 packages/grid_client/src/zos/zmachine_light.ts
 create mode 100644 packages/grid_client/tests/modules/network_light.test.ts
 create mode 100644 packages/grid_client/tests/modules/zmachine_light.test.ts

diff --git a/packages/grid_client/docs/deployment_flow.md b/packages/grid_client/docs/deployment_flow.md
new file mode 100644
index 0000000000..b726148783
--- /dev/null
+++ b/packages/grid_client/docs/deployment_flow.md
@@ -0,0 +1,117 @@
+# Deployment Flow
+
+This document outlines the process for determining whether to deploy on a zos3 or a zos4 node.
+
+## Machine Model Initialization
+
+The deployment process begins with initializing the machine model as follows:
+
+```ts
+const vms: MachinesModel = {
+  name: "newMY",
+  network: {
+    name: "hellotest",
+    ip_range: "10.249.0.0/16",
+    myceliumSeeds: [
+      {
+        nodeId: 168,
+        seed: "050d109829d8492d48bfb33b711056080571c69e46bfde6b4294c4c5bf468a76", //(HexSeed of length 32)
+      },
+    ],
+  },
+  machines: [
+    {
+      name: "testvmMY",
+      node_id: 168,
+      disks: [
+        {
+          name: "wedDisk",
+          size: 8,
+          mountpoint: "/testdisk",
+        },
+      ],
+      public_ip: false,
+      public_ip6: false,
+      planetary: true,
+      mycelium: true,
+      myceliumSeed: "1e1404279b3d", //(HexSeed of length 6)
+      cpu: 1,
+      memory: 1024 * 2,
+      rootfs_size: 0,
+      flist: "https://hub.grid.tf/tf-official-apps/base:latest.flist",
+      entrypoint: "/sbin/zinit init",
+      env: {
+        SSH_KEY: config.ssh_key,
+      },
+    },
+  ],
+  metadata: "",
+  description: "test deploying single VM with mycelium via ts grid3 client",
+};
+```
+
+## Deployment Execution
+
+- The next step is invoking the `deploy` function:
+  - Takes the `MachinesModel` object as a parameter
+  - Checks if a machine with the same name already exists and if so throws an error
+  - If not, then it calls the `_createDeployment` function along some othe functions
+  - Finally, the function returns the created contracts. If the deployment is on a zos3 node, then the wireguard configuration is returned as well.
+
+```ts
+await client.machines.deploy(vms);
+```
+
+- The `_createDeployment` function:
+  - Takes the `MachinesModel` object as a parameter
+  - Retrieves the features of the node using: `await this.rmb.request([nodeTwinId], "zos.system.node_features_get", "", 20, 3);`
+  - Examines the retrieved features to determine the network's primitive type (`Network` or `ZNetworkLight`) and initializes it accordingly.
+  - Sets the contractMetadata based on the network type.
+  - Invokes the `create` function
+
+```ts
+await this._createDeployment(options);
+```
+
+- The `create` function
+  - Validates or assigns IP addresses based on the network type.
+  - Determines network type (`network` or `network-light`) based on node features.
+  - Adds access points and updates network configurations as necessary.
+  - Initialize the VM primitive (`VMPrimitive` or `VMLightPrimitive`) based on the network type
+  - Configures the VM with networking, storage, and environment variables.
+  - Generates a Mycelium seed if not provided.
+  - Generate the deployments
+  - Finally, the function returns the created contracts. If the deployment is on a zos3 node, then the wireguard configuration is returned as well.
+
+```ts
+await this.vm.create(
+  machine.name,
+  machine.node_id,
+  machine.flist,
+  machine.cpu,
+  machine.memory,
+  machine.rootfs_size,
+  machine.disks!,
+  machine.public_ip,
+  machine.public_ip6!,
+  machine.planetary,
+  machine.mycelium,
+  machine.myceliumSeed!,
+  network,
+  options.network.myceliumSeeds!,
+  machine.entrypoint,
+  machine.env,
+  contractMetadata,
+  options.metadata,
+  options.description,
+  machine.qsfs_disks,
+  this.config.projectName,
+  options.network.addAccess,
+  options.network.accessNodeId,
+  machine.ip,
+  machine.corex,
+  machine.solutionProviderId!,
+  machine.zlogsOutput,
+  machine.gpus,
+);
+```
diff --git a/packages/grid_client/scripts/applications/casperlabs.ts b/packages/grid_client/scripts/applications/casperlabs.ts
index eccd0f3f58..424db2d056 100644
--- a/packages/grid_client/scripts/applications/casperlabs.ts
+++ b/packages/grid_client/scripts/applications/casperlabs.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -55,6 +55,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/discourse.ts b/packages/grid_client/scripts/applications/discourse.ts
index dad2a7cfda..749610676c 100644
--- a/packages/grid_client/scripts/applications/discourse.ts
+++ b/packages/grid_client/scripts/applications/discourse.ts
@@ -1,7 +1,7 @@
 import { Buffer } from "buffer";
 import TweetNACL from "tweetnacl";
 
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -63,6 +63,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.ip, Features.ipv4, Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/funkwhale.ts b/packages/grid_client/scripts/applications/funkwhale.ts
index 6595362b53..77d91d5430 100644
--- a/packages/grid_client/scripts/applications/funkwhale.ts
+++ b/packages/grid_client/scripts/applications/funkwhale.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -55,6 +55,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/mattermost.ts b/packages/grid_client/scripts/applications/mattermost.ts
index 39fda2510f..0dab539c01 100644
--- a/packages/grid_client/scripts/applications/mattermost.ts
+++ b/packages/grid_client/scripts/applications/mattermost.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -47,6 +47,8 @@ async function main() {
   const grid3 = await getClient(`mattermost/${name}`);
   const subdomain = "mm" + grid3.twinId + name;
   const instanceCapacity = { cru: 1, mru: 2, sru: 15 }; // Update the instance capacity values according to your requirements.
+  // Change to true if smtp is configured
+  const smtp = false;
 
   //VMNode Selection
   const vmQueryOptions: FilterOptions = {
@@ -55,6 +57,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: smtp ? [Features.ip, Features.ipv4, Features.wireguard] : [],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/nextcloud.ts b/packages/grid_client/scripts/applications/nextcloud.ts
index 9fb330a67e..20a554186f 100644
--- a/packages/grid_client/scripts/applications/nextcloud.ts
+++ b/packages/grid_client/scripts/applications/nextcloud.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -55,6 +55,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/nodepilot.ts b/packages/grid_client/scripts/applications/nodepilot.ts
index d6bf363919..fbc28ecf1e 100644
--- a/packages/grid_client/scripts/applications/nodepilot.ts
+++ b/packages/grid_client/scripts/applications/nodepilot.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, MachinesModel } from "../../src";
+import { Features, FilterOptions, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -35,6 +35,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.ip, Features.ipv4, Features.wireguard],
   };
   const nodes = await grid3.capacity.filterNodes(vmQueryOptions);
   const vmNode = await pingNodes(grid3, nodes);
diff --git a/packages/grid_client/scripts/applications/peertube.ts b/packages/grid_client/scripts/applications/peertube.ts
index f1c13608ba..09895bb552 100644
--- a/packages/grid_client/scripts/applications/peertube.ts
+++ b/packages/grid_client/scripts/applications/peertube.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -55,6 +55,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/static_website.ts b/packages/grid_client/scripts/applications/static_website.ts
index ac67cad3da..037001b7f9 100644
--- a/packages/grid_client/scripts/applications/static_website.ts
+++ b/packages/grid_client/scripts/applications/static_website.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, GridClient, MachinesModel, NodeInfo } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, GridClient, MachinesModel, NodeInfo } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -55,6 +55,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/subsquid.ts b/packages/grid_client/scripts/applications/subsquid.ts
index 4e864ba232..8fe1a1cb90 100644
--- a/packages/grid_client/scripts/applications/subsquid.ts
+++ b/packages/grid_client/scripts/applications/subsquid.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -55,6 +55,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/taiga.ts b/packages/grid_client/scripts/applications/taiga.ts
index df751e7972..3e6de700b6 100644
--- a/packages/grid_client/scripts/applications/taiga.ts
+++ b/packages/grid_client/scripts/applications/taiga.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -55,6 +55,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/applications/wordpress.ts b/packages/grid_client/scripts/applications/wordpress.ts
index 064aa5d57d..4f084c83f3 100644
--- a/packages/grid_client/scripts/applications/wordpress.ts
+++ b/packages/grid_client/scripts/applications/wordpress.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
+import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -56,6 +56,7 @@ async function main() {
     sru: instanceCapacity.sru,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
   //GatewayNode Selection
   const gatewayQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/orchestrators/caprover_leader.ts b/packages/grid_client/scripts/orchestrators/caprover_leader.ts
index c26e258143..f4ec32d57a 100644
--- a/packages/grid_client/scripts/orchestrators/caprover_leader.ts
+++ b/packages/grid_client/scripts/orchestrators/caprover_leader.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, MachinesModel } from "../../src";
+import { Features, FilterOptions, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log } from "../utils";
 
@@ -34,6 +34,7 @@ async function main() {
     sru: 10,
     farmId: 1,
     availableFor: grid3.twinId,
+    features: [Features.wireguard, Features.ip, Features.ipv4],
   };
 
   const vms: MachinesModel = {
diff --git a/packages/grid_client/scripts/orchestrators/caprover_worker.ts b/packages/grid_client/scripts/orchestrators/caprover_worker.ts
index ce8d466272..5db31f3677 100644
--- a/packages/grid_client/scripts/orchestrators/caprover_worker.ts
+++ b/packages/grid_client/scripts/orchestrators/caprover_worker.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, MachinesModel } from "../../src";
+import { Features, FilterOptions, MachinesModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log } from "../utils";
 
@@ -32,6 +32,7 @@ async function main() {
     mru: 4, // GB
     sru: 10,
     farmId: 1,
+    features: [Features.wireguard, Features.ip, Features.ipv4],
   };
 
   const vms: MachinesModel = {
diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts b/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts
index e44600b0e0..aca51e25ec 100644
--- a/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts
+++ b/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, K8SModel } from "../../src";
+import { Features, FilterOptions, K8SModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log } from "../utils";
 
@@ -33,6 +33,7 @@ async function main() {
     sru: 6,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
 
   const workerQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts b/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts
index 051f1e71db..6bfd8786ad 100644
--- a/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts
+++ b/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts
@@ -1,4 +1,4 @@
-import { FilterOptions, GridClient, K8SModel, QSFSZDBSModel } from "../../src";
+import { Features, FilterOptions, GridClient, K8SModel, QSFSZDBSModel } from "../../src";
 import { config, getClient } from "../client_loader";
 import { log, pingNodes } from "../utils";
 
@@ -50,6 +50,7 @@ async function main() {
     sru: 6,
     availableFor: grid3.twinId,
     farmId: 1,
+    features: [Features.wireguard],
   };
 
   const qsfsQueryOptions: FilterOptions = {
diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_worker.ts b/packages/grid_client/scripts/orchestrators/kubernetes_worker.ts
index 85ca42b3d7..027e45a2f3 100644
--- a/packages/grid_client/scripts/orchestrators/kubernetes_worker.ts
+++ b/packages/grid_client/scripts/orchestrators/kubernetes_worker.ts
@@ -1,4 +1,4 @@
-import { AddWorkerModel, FilterOptions } from "../../src";
+import { AddWorkerModel, Features, FilterOptions } from "../../src";
 import { getClient } from "../client_loader";
 import { log } from "../utils";
 
@@ -34,6 +34,7 @@ async function main() {
     mru: 1, // GB
     sru: 10,
     farmId: 1,
+    features: [Features.wireguard],
   };
 
   const worker: AddWorkerModel = {
diff --git a/packages/grid_client/scripts/single_vm_zos4.ts b/packages/grid_client/scripts/single_vm_zos4.ts
new file mode 100644
index 0000000000..f0e20c5c87
--- /dev/null
+++ b/packages/grid_client/scripts/single_vm_zos4.ts
@@ -0,0 +1,115 @@
+import { Features, FilterOptions, generateRandomHexSeed, GridClient, MachinesDeleteModel, MachinesModel } from "../src";
+import { config, getClient } from "./client_loader";
+import { log, pingNodes } from "./utils";
+
+async function deploy(client, vms) {
+  const resultVM = await client.machines.deploy(vms);
+  log("================= Deploying VM =================");
+  log(resultVM);
+  log("================= Deploying VM =================");
+}
+
+async function getDeployment(client, vms) {
+  const resultVM = await client.machines.getObj(vms.name);
+  log("================= Getting deployment information =================");
+  log(resultVM);
+  log("================= Getting deployment information =================");
+}
+
+async function cancel(client, vms) {
+  const resultVM = await client.machines.delete(vms);
+  log("================= Canceling the deployment =================");
+  log(resultVM);
+  log("================= Canceling the deployment =================");
+}
+
+async function main() {
+  const name = "vm";
+  const grid3 = await getClient(`vm/${name}`);
+  const instanceCapacity = { cru: 2, mru: 4, sru: 100 }; // Update the instance capacity values according to your requirements.
+
+  //VMNode Selection
+  const vmQueryOptions: FilterOptions = {
+    cru: instanceCapacity.cru,
+    mru: instanceCapacity.mru,
+    sru: instanceCapacity.sru,
+    availableFor: grid3.twinId,
+    features: [Features.zmachinelight, Features.networklight, Features.mycelium],
+    nodeExclude: [259],
+  };
+  const nodes = await grid3.capacity.filterNodes(vmQueryOptions);
+  const vmNode = await pingNodes(grid3, nodes);
+
+  const vms: MachinesModel = {
+    name,
+    network: {
+      name: "vmNode",
+      ip_range: "10.249.0.0/16",
+      myceliumSeeds: [
+        {
+          nodeId: vmNode,
+          /**
+           * ### Mycelium Network Seed:
+           * - The `seed` is an optional field used to provide a specific seed for the Mycelium network.
+           * - If not provided, the `GridClient` will generate a seed automatically when the `mycelium` flag is enabled.
+           * - **Use Case:** If you need the new machine to have the same IP address as a previously deleted machine, set the `seed` field to the old seed value.
+           */
+          seed: generateRandomHexSeed(32),
+        },
+      ],
+    },
+    machines: [
+      {
+        name: "testvmMY",
+        node_id: vmNode,
+        disks: [
+          {
+            name: "wedDisk",
+            size: instanceCapacity.sru,
+            mountpoint: "/testdisk",
+          },
+        ],
+        planetary: false,
+        public_ip: false,
+        public_ip6: false,
+        /**
+         * ### Mycelium Flag Behavior:
+         * - When the `mycelium` flag is enabled, there’s no need to manually provide the `myceliumSeed` flag.
+         * - The `GridClient` will automatically generate the necessary seed for you.
+         * - **However**, if you have **an existing seed** from a previously deleted machine and wish to deploy a new machine that retains the same IP address,
+         * - **you can simply pass in the old seed during deployment instead of calling the `generateRandomHexSeed()` function**.
+         */
+        mycelium: true,
+        /**
+         * ### Mycelium Seed:
+         * - The `myceliumSeed` is an optional field used to provide a specific seed for the Mycelium network.
+         * - If not provided, the `GridClient` will generate a seed automatically when the `mycelium` flag is enabled.
+         * - **Use Case:** If you need the new machine to have the same IP address as a previously deleted machine, set the `seed` field to the old seed value.         */
+        myceliumSeed: generateRandomHexSeed(6), // (HexSeed of length 6)
+        cpu: instanceCapacity.cru,
+        memory: 1024 * instanceCapacity.mru,
+        rootfs_size: 0,
+        flist: "https://hub.grid.tf/tf-official-apps/base:latest.flist",
+        entrypoint: "/sbin/zinit init",
+        env: {
+          SSH_KEY: config.ssh_key,
+        },
+      },
+    ],
+    metadata: "",
+    description: "test deploying single ZOS4 VM with mycelium via ts grid3 client",
+  };
+
+  //Deploy VMs
+  await deploy(grid3, vms);
+
+  //Get the deployment
+  await getDeployment(grid3, vms);
+
+  //Uncomment the line below to cancel the deployment
+  // await cancel(grid3, { name });
+
+  await grid3.disconnect();
+}
+
+main();
diff --git a/packages/grid_client/src/helpers/types.ts b/packages/grid_client/src/helpers/types.ts
index 912e955f3d..03e06b3d9b 100644
--- a/packages/grid_client/src/helpers/types.ts
+++ b/packages/grid_client/src/helpers/types.ts
@@ -1,4 +1,4 @@
-import { PublicIPResult, ResultStates } from "../zos";
+import { PublicIPResult, ResultStates, WorkloadTypes } from "../zos";
 
 interface NetworkInterface {
   /** The network identifier */
@@ -44,10 +44,29 @@ interface ExtendedMountData extends Partial<BaseMountData> {
 
 // Union type for the mount data
 type MountData = BaseMountData | ExtendedMountData;
-
+enum Features {
+  ipv4 = "ipv4",
+  ip = "ip",
+  mycelium = "mycelium",
+  wireguard = "wireguard",
+  yggdrasil = "yggdrasil",
+  gatewayfqdnproxy = "gateway-fqdn-proxy",
+  gatewaynameproxy = "gateway-name-proxy",
+  zmachine = "zmachine",
+  zmount = "zmount",
+  volume = "volume",
+  network = "network",
+  zdb = "zdb",
+  qsfs = "qsfs",
+  zlogs = "zlogs",
+  networklight = "network-light",
+  zmachinelight = "zmachine-light",
+}
 interface ZmachineData {
   /** The version of the workload */
   version: number;
+  /** The type of the workload */
+  type: WorkloadTypes;
   /** The contract ID associated with the workload */
   contractId: number;
   /** The node ID where the workload is deployed */
@@ -112,4 +131,4 @@ interface GatewayDeploymentData {
   description: string;
 }
 
-export { ZmachineData, VM, ExtendedMountData, GatewayDeploymentData };
+export { ZmachineData, VM, ExtendedMountData, GatewayDeploymentData, Features };
diff --git a/packages/grid_client/src/high_level/base.ts b/packages/grid_client/src/high_level/base.ts
index 0f1310509c..5cf0c24a25 100644
--- a/packages/grid_client/src/high_level/base.ts
+++ b/packages/grid_client/src/high_level/base.ts
@@ -7,6 +7,7 @@ import { events } from "../helpers/events";
 import { Operations, TwinDeployment } from "../high_level/models";
 import { DeploymentFactory } from "../primitives/deployment";
 import { Network } from "../primitives/network";
+import { ZNetworkLight } from "../primitives/networklight";
 import { Nodes } from "../primitives/nodes";
 import { Deployment } from "../zos/deployment";
 import { Workload, WorkloadTypes } from "../zos/workload";
@@ -27,6 +28,7 @@ class HighLevelBase {
       WorkloadTypes.ip,
       WorkloadTypes.ipv4, // TODO: remove deprecated
       WorkloadTypes.zmachine,
+      WorkloadTypes.zmachinelight,
       WorkloadTypes.zmount,
       WorkloadTypes.volume,
       WorkloadTypes.zdb,
@@ -38,35 +40,50 @@ class HighLevelBase {
   ): [Workload[], Workload[]] {
     let deletedMachineWorkloads: Workload[] = [];
     if (names.length === 0) {
-      deletedMachineWorkloads = deployment.workloads.filter(item => item.type === WorkloadTypes.zmachine);
+      deletedMachineWorkloads = deployment.workloads.filter(
+        item => item.type === WorkloadTypes.zmachine || item.type === WorkloadTypes.zmachinelight,
+      );
     }
 
-    if (names.length !== 0 && types.includes(WorkloadTypes.zmachine)) {
-      const Workloads = deployment.workloads.filter(item => item.type === WorkloadTypes.zmachine);
-      for (const workload of Workloads) {
-        if (!names.includes(workload.name)) {
-          continue;
-        }
-        for (const mount of workload.data["mounts"]) {
-          names.push(mount.name);
-        }
+    if (names.length !== 0 && (types.includes(WorkloadTypes.zmachine) || types.includes(WorkloadTypes.zmachinelight))) {
+      const workloadTypes = [WorkloadTypes.zmachine, WorkloadTypes.zmachinelight];
+
+      for (const type of workloadTypes) {
+        if (!types.includes(type)) continue;
+
+        const Workloads = deployment.workloads.filter(item => item.type === type);
+
+        for (const workload of Workloads) {
+          if (!names.includes(workload.name)) {
+            continue;
+          }
+
+          for (const mount of workload.data["mounts"]) {
+            names.push(mount.name);
+          }
+
+          const toRemoveZlogs = deployment.workloads.filter(item => {
+            const zlog = item.type === WorkloadTypes.zlogs;
+            const workloadtypename =
+              (item.data as any)[
+                type === WorkloadTypes.zmachine ? WorkloadTypes.zmachine : WorkloadTypes.zmachinelight
+              ] === workload.name;
+            return zlog && workloadtypename;
+          });
 
-        const toRemoveZlogs = deployment.workloads.filter(item => {
-          const x = item.type === WorkloadTypes.zlogs;
-          const y = (item.data as any)["zmachine"] === workload.name;
-          return x && y;
-        });
+          names.push(...toRemoveZlogs.map(zlog => zlog.name));
 
-        names.push(...toRemoveZlogs.map(x => x.name));
+          if (type === WorkloadTypes.zmachine) {
+            names.push(workload.data["network"].public_ip);
+          }
 
-        names.push(workload.data["network"].public_ip);
-        deletedMachineWorkloads.push(workload);
+          deletedMachineWorkloads.push(workload);
+        }
       }
     }
-
     const remainingWorkloads: Workload[] = [];
     for (const workload of deployment.workloads) {
-      if (workload.type === WorkloadTypes.network) {
+      if (workload.type === WorkloadTypes.network || workload.type === WorkloadTypes.networklight) {
         remainingWorkloads.push(workload);
         continue;
       }
@@ -86,17 +103,23 @@ class HighLevelBase {
     remainingWorkloads: Workload[],
     deletedMachineWorkloads: Workload[],
     node_id: number,
-  ): Promise<[TwinDeployment[], Workload[], number[], string[], Network | null]> {
+  ): Promise<[TwinDeployment[], Workload[], number[], string[], Network | ZNetworkLight | null]> {
     const twinDeployments: TwinDeployment[] = [];
     const deletedNodes: number[] = [];
     const deletedIps: string[] = [];
     const deploymentFactory = new DeploymentFactory(this.config);
-    let network: Network | null = null;
+    let network: Network | ZNetworkLight | null = null;
+    let network_contract_id;
+
     for (const workload of deletedMachineWorkloads) {
       if (!network) {
         const networkName = workload.data["network"].interfaces[0].network;
         const networkIpRange = Addr(workload.data["network"].interfaces[0].ip).mask(16).toString();
-        network = new Network(networkName, networkIpRange, this.config);
+        if (workload.type === WorkloadTypes.zmachinelight) {
+          network = new ZNetworkLight(networkName, networkIpRange, this.config);
+        } else {
+          network = new Network(networkName, networkIpRange, this.config);
+        }
         await network.load();
       }
       const machineIp = workload.data["network"].interfaces[0].ip;
@@ -111,17 +134,19 @@ class HighLevelBase {
         deletedIps.push(deletedIp);
         continue;
       }
-      const hasAccessPoint = network.hasAccessPoint(node_id);
-      if (hasAccessPoint && network.nodes.length !== 1) {
-        console.log(
-          `network ${network.name} still has access point:${hasAccessPoint} and number of nodes ${network.nodes.length}`,
-        );
-        deletedIps.push(deletedIp);
-        continue;
+      if (network instanceof Network) {
+        const hasAccessPoint = network.hasAccessPoint(node_id);
+        if (hasAccessPoint && network.nodes.length !== 1) {
+          console.log(
+            `network ${network.name} still has access point:${hasAccessPoint} and number of nodes ${network.nodes.length}`,
+          );
+          deletedIps.push(deletedIp);
+          continue;
+        }
       }
+      network_contract_id = await network.deleteNode(node_id);
 
-      const contract_id = await network.deleteNode(node_id);
-      if (contract_id === deployment.contract_id) {
+      if (network_contract_id === deployment.contract_id) {
         if (remainingWorkloads.length === 1) {
           twinDeployments.push(new TwinDeployment(deployment, Operations.delete, 0, 0, "", network));
           remainingWorkloads = [];
@@ -134,7 +159,7 @@ class HighLevelBase {
         // check that the deployment doesn't have another workloads
         for (let d of network.deployments) {
           d = await deploymentFactory.fromObj(d);
-          if (d.contract_id !== contract_id) {
+          if (d.contract_id !== network_contract_id) {
             continue;
           }
           if (d.workloads.length === 1) {
@@ -146,7 +171,11 @@ class HighLevelBase {
         }
       }
       // in case of the network got more accesspoints on different nodes this won't be valid
-      if (network.nodes.length === 1 && network.getNodeReservedIps(network.nodes[0].node_id).length === 0) {
+      if (
+        network instanceof Network &&
+        network.nodes.length === 1 &&
+        network.getNodeReservedIps(network.nodes[0].node_id).length === 0
+      ) {
         const contract_id = await network.deleteNode(network.nodes[0].node_id);
         for (let d of network.deployments) {
           d = await deploymentFactory.fromObj(d);
@@ -172,6 +201,7 @@ class HighLevelBase {
       WorkloadTypes.ip,
       WorkloadTypes.ipv4, // TODO: remove deprecated
       WorkloadTypes.zmachine,
+      WorkloadTypes.zmachinelight,
       WorkloadTypes.zmount,
       WorkloadTypes.volume,
       WorkloadTypes.zdb,
@@ -181,7 +211,7 @@ class HighLevelBase {
       WorkloadTypes.zlogs,
     ],
   ): Promise<TwinDeployment[]> {
-    if (types.includes(WorkloadTypes.network)) {
+    if (types.includes(WorkloadTypes.network) || types.includes(WorkloadTypes.networklight)) {
       throw new GridClientErrors.Workloads.WorkloadDeleteError("Network workload can't be deleted.");
     }
     let twinDeployments: TwinDeployment[] = [];
@@ -201,7 +231,11 @@ class HighLevelBase {
       await this._deleteMachineNetwork(deployment, remainingWorkloads, deletedMachineWorkloads, node_id);
     twinDeployments = twinDeployments.concat(newTwinDeployments);
     remainingWorkloads = newRemainingWorkloads;
-    if (remainingWorkloads.length !== 0 && remainingWorkloads.length < numberOfWorkloads) {
+    if (
+      network instanceof Network &&
+      remainingWorkloads.length !== 0 &&
+      remainingWorkloads.length < numberOfWorkloads
+    ) {
       for (const deleteNode of deletedNodes) {
         await network!.deleteNode(deleteNode);
       }
diff --git a/packages/grid_client/src/high_level/kubernetes.ts b/packages/grid_client/src/high_level/kubernetes.ts
index a9c5e523b9..15a48a0f62 100644
--- a/packages/grid_client/src/high_level/kubernetes.ts
+++ b/packages/grid_client/src/high_level/kubernetes.ts
@@ -2,6 +2,7 @@ import { events } from "../helpers/events";
 import { VMHL } from "../high_level//machine";
 import { MyceliumNetworkModel, QSFSDiskModel } from "../modules/models";
 import { Network } from "../primitives/network";
+import { ZNetworkLight } from "../primitives/networklight";
 import { Deployment } from "../zos/deployment";
 import { WorkloadTypes } from "../zos/workload";
 import { HighLevelBase } from "./base";
@@ -22,7 +23,7 @@ class KubernetesHL extends HighLevelBase {
     planetary: boolean,
     mycelium: boolean,
     myceliumSeed: string,
-    network: Network,
+    network: Network | ZNetworkLight,
     myceliumNetworkSeeds: MyceliumNetworkModel[] = [],
     sshKey: string,
     contractMetadata: string,
@@ -100,7 +101,7 @@ class KubernetesHL extends HighLevelBase {
     planetary: boolean,
     mycelium: boolean,
     myceliumSeed: string,
-    network: Network,
+    network: Network | ZNetworkLight,
     myceliumNetworkSeeds: MyceliumNetworkModel[] = [],
     sshKey: string,
     contractMetadata,
@@ -168,6 +169,7 @@ class KubernetesHL extends HighLevelBase {
   async delete(deployment: Deployment, names: string[]) {
     return await this._delete(deployment, names, [
       WorkloadTypes.zmachine,
+      WorkloadTypes.zmachinelight,
       WorkloadTypes.zmount,
       WorkloadTypes.volume,
       WorkloadTypes.ip,
diff --git a/packages/grid_client/src/high_level/machine.ts b/packages/grid_client/src/high_level/machine.ts
index 0de7b154c1..4dc3b6a378 100644
--- a/packages/grid_client/src/high_level/machine.ts
+++ b/packages/grid_client/src/high_level/machine.ts
@@ -1,6 +1,7 @@
 import { GridClientErrors, ValidationError } from "@threefold/types";
 import { Addr } from "netaddr";
 
+import { Features } from "../helpers";
 import { events } from "../helpers/events";
 import { calculateRootFileSystem } from "../helpers/root_fs";
 import { randomChoice, zeroPadding } from "../helpers/utils";
@@ -13,9 +14,11 @@ import {
   Network,
   Nodes,
   PublicIPPrimitive,
+  VMLightPrimitive,
   VMPrimitive,
   ZlogsPrimitive,
 } from "../primitives/index";
+import { ZNetworkLight } from "../primitives/networklight";
 import { QSFSPrimitive } from "../primitives/qsfs";
 import { Mount, ZdbGroup } from "../zos";
 import { Deployment } from "../zos/deployment";
@@ -37,7 +40,7 @@ class VMHL extends HighLevelBase {
     planetary: boolean,
     mycelium: boolean,
     myceliumSeed: string,
-    network: Network,
+    network: Network | ZNetworkLight,
     myceliumNetworkSeeds: MyceliumNetworkModel[] = [],
     entrypoint: string,
     env: Record<string, unknown>,
@@ -60,6 +63,8 @@ class VMHL extends HighLevelBase {
         RAMInMegaBytes: memory,
       });
     }
+    const nodeInfo = await this.nodes.getNode(nodeId);
+    const nodeFeatures = (await this.nodes.getNode(nodeId)).features;
     const deployments: TwinDeployment[] = [];
     const workloads: Workload[] = [];
     let totalDisksSize = rootfs_size;
@@ -86,7 +91,6 @@ class VMHL extends HighLevelBase {
       );
     } else {
       // If Available for twinId (dedicated), check it's not in grace period
-      const nodeInfo = await this.nodes.getNode(nodeId);
       if (nodeInfo.rentContractId !== 0) {
         const contract = await this.config.tfclient.contracts.get({ id: nodeInfo.rentContractId });
         if (contract && contract.state.gracePeriod) {
@@ -149,9 +153,13 @@ class VMHL extends HighLevelBase {
     }
 
     // ipv4
+    // Reject the deployment if the node is a zos4 node, as it doesn't support ipv4.
     let ipName = "";
     let publicIps = 0;
     if (publicIp || publicIp6) {
+      if (nodeFeatures.includes(Features.ip)) {
+        throw new GridClientErrors.Farms.InvalidResourcesError(`Node ${nodeId} doesn't support public ips.`);
+      }
       const ip = new PublicIPPrimitive();
       ipName = `${name}_pubip`;
       workloads.push(ip.create(ipName, "", description, 0, publicIp, publicIp6));
@@ -168,7 +176,6 @@ class VMHL extends HighLevelBase {
         publicIps++;
       }
     }
-
     if (gpus && gpus.length > 0) {
       const nodeTwinId = await this.nodes.getNodeTwinId(nodeId);
       const gpuList = await this.rmb.request([nodeTwinId], "zos.gpu.list", "");
@@ -200,58 +207,76 @@ class VMHL extends HighLevelBase {
     let accessNodeSubnet;
     if (ip) {
       userIPsubnet = network.ValidateFreeSubnet(Addr(ip).mask(24).toString());
-      accessNodeSubnet = network.getFreeSubnet();
+
+      // If the node supports wireguard feature get accessNodeSubnet
+      if (nodeFeatures.includes(Features.wireguard)) {
+        accessNodeSubnet = network.getFreeSubnet();
+      }
     }
-    // network
-    const networkContractMetadata = JSON.stringify({
-      version: 3,
-      type: "network",
-      name: network.name,
-      projectName: this.config.projectName,
-    });
+    // Set networkContractMetadata based on node's zos version
+    let networkContractMetadata;
+    if (nodeFeatures.includes(Features.network)) {
+      networkContractMetadata = JSON.stringify({
+        version: 3,
+        type: "network",
+        name: network.name,
+        projectName: this.config.projectName,
+      });
+    } else {
+      networkContractMetadata = JSON.stringify({
+        version: 4,
+        type: "network-light",
+        name: network.name,
+        projectName: this.config.projectName,
+      });
+    }
+
     const deploymentFactory = new DeploymentFactory(this.config);
+
     let access_net_workload;
     let wgConfig = "";
     let hasAccessNode = false;
     let accessNodes: Record<string, unknown> = {};
-    if (addAccess) {
-      accessNodes = await this.nodes.getAccessNodes(this.config.twinId);
-      for (const accessNode of Object.keys(accessNodes)) {
-        if (network.nodeExists(Number(accessNode))) {
-          hasAccessNode = true;
-          break;
+    if (nodeFeatures.includes(Features.wireguard) && network instanceof Network) {
+      if (addAccess) {
+        accessNodes = await this.nodes.getAccessNodes(this.config.twinId);
+        for (const accessNode of Object.keys(accessNodes)) {
+          if (network.nodeExists(Number(accessNode))) {
+            hasAccessNode = true;
+            break;
+          }
         }
       }
-    }
-    if (
-      (!Object.keys(accessNodes).includes(nodeId.toString()) || nodeId !== accessNodeId) &&
-      !hasAccessNode &&
-      addAccess
-    ) {
-      // add node to any access node and deploy it
-      const filteredAccessNodes: number[] = [];
-      for (const accessNodeId of Object.keys(accessNodes)) {
-        if (accessNodes[accessNodeId]["ipv4"]) {
-          filteredAccessNodes.push(+accessNodeId);
+      if (
+        (!Object.keys(accessNodes).includes(nodeId.toString()) || nodeId !== accessNodeId) &&
+        !hasAccessNode &&
+        addAccess &&
+        nodeFeatures.includes(Features.wireguard)
+      ) {
+        const filteredAccessNodes: number[] = [];
+        for (const accessNodeId of Object.keys(accessNodes)) {
+          if (accessNodes[accessNodeId]["ipv4"]) {
+            filteredAccessNodes.push(+accessNodeId);
+          }
         }
-      }
-      let access_node_id = randomChoice(filteredAccessNodes);
-      if (accessNodeId) {
-        if (!filteredAccessNodes.includes(accessNodeId))
-          throw new GridClientErrors.Nodes.AccessNodeError(
-            `Node ${accessNodeId} is not an access node or maybe it's down.`,
-          );
+        let access_node_id = randomChoice(filteredAccessNodes);
+        if (accessNodeId) {
+          if (!filteredAccessNodes.includes(accessNodeId))
+            throw new GridClientErrors.Nodes.AccessNodeError(
+              `Node ${accessNodeId} is not an access node or maybe it's down.`,
+            );
 
-        access_node_id = accessNodeId;
+          access_node_id = accessNodeId;
+        }
+        access_net_workload = await network.addNode(
+          access_node_id,
+          mycelium,
+          description,
+          accessNodeSubnet,
+          myceliumNetworkSeeds,
+        );
+        wgConfig = await network.addAccess(access_node_id, true);
       }
-      access_net_workload = await network.addNode(
-        access_node_id,
-        mycelium,
-        description,
-        accessNodeSubnet,
-        myceliumNetworkSeeds,
-      );
-      wgConfig = await network.addAccess(access_node_id, true);
     }
     // If node exits on network check if mycelium needs to be added or not
     if (network.nodeExists(nodeId)) {
@@ -262,7 +287,7 @@ class VMHL extends HighLevelBase {
     }
 
     const znet_workload = await network.addNode(nodeId, mycelium, description, userIPsubnet, myceliumNetworkSeeds);
-    if ((await network.exists()) && (znet_workload || access_net_workload)) {
+    if (network instanceof Network && (await network.exists()) && (znet_workload || access_net_workload)) {
       // update network
       for (const deployment of network.deployments) {
         const d = await deploymentFactory.fromObj(deployment);
@@ -273,6 +298,7 @@ class VMHL extends HighLevelBase {
           ) {
             continue;
           }
+
           workload.data = network.getUpdatedNetwork(workload["data"]);
           workload.version += 1;
           break;
@@ -295,7 +321,8 @@ class VMHL extends HighLevelBase {
       }
     } else if (znet_workload) {
       // node not exist on the network
-      if (!access_net_workload && !hasAccessNode && addAccess) {
+
+      if (!access_net_workload && !hasAccessNode && addAccess && network instanceof Network) {
         // this node is access node, so add access point on it
         wgConfig = await network.addAccess(nodeId, true);
         znet_workload["data"] = network.getUpdatedNetwork(znet_workload.data);
@@ -313,7 +340,7 @@ class VMHL extends HighLevelBase {
         ),
       );
     }
-    if (access_net_workload) {
+    if (access_net_workload && nodeFeatures.includes(Features.wireguard)) {
       // network is not exist, and the node provide is not an access node
       const accessNodeId = access_net_workload.data["node_id"];
       access_net_workload["data"] = network.getUpdatedNetwork(access_net_workload.data);
@@ -332,7 +359,13 @@ class VMHL extends HighLevelBase {
     }
 
     // vm
-    const vm = new VMPrimitive();
+    // Initalize vm based on node's zos version
+    let vm;
+    if (nodeFeatures.includes(Features.zmachine)) {
+      vm = new VMPrimitive();
+    } else {
+      vm = new VMLightPrimitive();
+    }
     let machine_ip;
     if (ip !== "") {
       machine_ip = network.validateUserIP(nodeId, ip);
@@ -412,6 +445,7 @@ class VMHL extends HighLevelBase {
       WorkloadTypes.zmachine,
       WorkloadTypes.qsfs,
       WorkloadTypes.zlogs,
+      WorkloadTypes.zmachinelight,
     ]);
   }
 }
diff --git a/packages/grid_client/src/high_level/models.ts b/packages/grid_client/src/high_level/models.ts
index 1b59b25510..b6405f078d 100644
--- a/packages/grid_client/src/high_level/models.ts
+++ b/packages/grid_client/src/high_level/models.ts
@@ -1,6 +1,7 @@
 import { Contract } from "@threefold/tfchain_client";
 
 import { Network } from "../primitives/network";
+import { ZNetworkLight } from "../primitives/networklight";
 import { Deployment } from "../zos/deployment";
 
 enum Operations {
@@ -16,7 +17,7 @@ class TwinDeployment {
     public publicIps: number,
     public nodeId: number,
     public metadata: string,
-    public network: Network | null = null,
+    public network: Network | null | ZNetworkLight = null,
     public solutionProviderId: number | null = null,
     public returnNetworkContracts = false,
   ) {}
diff --git a/packages/grid_client/src/high_level/twinDeploymentHandler.ts b/packages/grid_client/src/high_level/twinDeploymentHandler.ts
index add5a8578d..e4e9b7ccef 100644
--- a/packages/grid_client/src/high_level/twinDeploymentHandler.ts
+++ b/packages/grid_client/src/high_level/twinDeploymentHandler.ts
@@ -8,7 +8,7 @@ import { GridClientConfig } from "../config";
 import { formatErrorMessage } from "../helpers";
 import { events } from "../helpers/events";
 import { validateObject } from "../helpers/validator";
-import { DeploymentFactory, Nodes } from "../primitives/index";
+import { DeploymentFactory, Network, Nodes } from "../primitives/index";
 import { Workload, WorkloadTypes } from "../zos/workload";
 import { DeploymentResultContracts, Operations, TwinDeployment } from "./models";
 class TwinDeploymentHandler {
@@ -147,11 +147,13 @@ class TwinDeploymentHandler {
         for (const workload of twinDeployment.deployment.workloads) {
           if (workload.type !== WorkloadTypes.network) continue;
           const contract = contracts.created.filter(c => c.contractId === twinDeployment.deployment.contract_id);
-          twinDeployment.network.save(contract[0]);
+          if (twinDeployment.network instanceof Network) {
+            twinDeployment.network.save(contract[0]);
+          }
         }
       }
       // left just to delete the old keys
-      else if (twinDeployment.operation === Operations.delete) {
+      else if (twinDeployment.operation === Operations.delete && twinDeployment.network instanceof Network) {
         await twinDeployment.network.save(undefined, twinDeployment.deployment.contract_id);
       }
     }
@@ -166,7 +168,7 @@ class TwinDeploymentHandler {
         continue;
       }
       const network_workloads = twinDeployment.deployment.workloads.filter(
-        workload => workload.type === WorkloadTypes.network,
+        workload => workload.type === WorkloadTypes.network || workload.type === WorkloadTypes.networklight,
       );
       if (network_workloads.length > 0 || twinDeployment.publicIps > 0) {
         deployments.push(twinDeployment);
@@ -539,7 +541,7 @@ class TwinDeploymentHandler {
         if (!twinDeployment.network) {
           break;
         }
-        if (workload.type === WorkloadTypes.network) {
+        if (workload.type === WorkloadTypes.network || workload.type === WorkloadTypes.networklight) {
           events.emit("logs", `Updating network workload with name: ${workload.name}`);
           twinDeployment.network.updateWorkload(twinDeployment.nodeId, workload);
         }
diff --git a/packages/grid_client/src/modules/base.ts b/packages/grid_client/src/modules/base.ts
index da2301a9cb..91cdf1c2b4 100644
--- a/packages/grid_client/src/modules/base.ts
+++ b/packages/grid_client/src/modules/base.ts
@@ -503,6 +503,7 @@ class BaseModule {
     const resultData = workload.result.data as ZmachineResult;
     return {
       version: workload.version,
+      type: workload.type,
       contractId: workload["contractId"],
       nodeId: workload["nodeId"],
       name: workload.name,
diff --git a/packages/grid_client/src/modules/capacity.ts b/packages/grid_client/src/modules/capacity.ts
index 98e0d7d57b..b3803edc29 100644
--- a/packages/grid_client/src/modules/capacity.ts
+++ b/packages/grid_client/src/modules/capacity.ts
@@ -159,6 +159,15 @@ class Capacity {
     return nodes;
   }
 
+  @expose
+  @validateInput
+  getFeaturesFromFilters(options?: FilterOptions): string[] {
+    let features: string[] = [];
+
+    features = this.nodes.getFeaturesFromFilters(options);
+    return features;
+  }
+
   /**
    * Retrieves a list of farms based on the provided options.
    *
diff --git a/packages/grid_client/src/modules/k8s.ts b/packages/grid_client/src/modules/k8s.ts
index 76575825e3..3eb1704a15 100644
--- a/packages/grid_client/src/modules/k8s.ts
+++ b/packages/grid_client/src/modules/k8s.ts
@@ -9,7 +9,9 @@ import { expose } from "../helpers/expose";
 import { validateInput } from "../helpers/validator";
 import { KubernetesHL } from "../high_level/kubernetes";
 import { DeploymentResultContracts, TwinDeployment } from "../high_level/models";
+import { Nodes } from "../primitives";
 import { Network } from "../primitives/network";
+import { ZNetworkLight } from "../primitives/networklight";
 import { Deployment } from "../zos";
 import { Workload, WorkloadTypes } from "../zos/workload";
 import { BaseModule } from "./base";
@@ -28,6 +30,7 @@ class K8sModule extends BaseModule {
     WorkloadTypes.zlogs,
   ]; // TODO: remove deprecated
   kubernetes: KubernetesHL;
+  capacity: Nodes;
 
   /**
    * Class representing a Kubernetes Module.
@@ -36,10 +39,12 @@ class K8sModule extends BaseModule {
    * This class provides methods for managing Kubernetes deployments, including creating, updating, listing, and deleting deployments.
    * @class K8sModule
    * @param {GridClientConfig} config - The configuration object for initializing the client.
+   * @param {Nodes} capacity - Used to get node features
    */
   constructor(public config: GridClientConfig) {
     super(config);
     this.kubernetes = new KubernetesHL(config);
+    this.capacity = new Nodes(this.config.graphqlURL, this.config.proxyURL, this.config.rmbClient);
   }
 
   /**
@@ -126,17 +131,11 @@ class K8sModule extends BaseModule {
    * @returns {Promise<[TwinDeployment[], Network, string]>} A tuple containing the created deployments, network configuration, and Wireguard configuration.
    */
   async _createDeployment(options: K8SModel, masterIps: string[] = []): Promise<[TwinDeployment[], Network, string]> {
-    const network = new Network(options.network.name, options.network.ip_range, this.config);
-    await network.load();
+    let network;
+    let contractMetadata;
 
     let deployments: TwinDeployment[] = [];
     let wireguardConfig = "";
-    const contractMetadata = JSON.stringify({
-      version: 3,
-      type: "kubernetes",
-      name: options.name,
-      projectName: this.config.projectName || `kubernetes/${options.name}`,
-    });
     const masters_names: string[] = [];
     const workers_names: string[] = [];
     for (const master of options.masters) {
@@ -144,6 +143,29 @@ class K8sModule extends BaseModule {
         throw new ValidationError(`Another master with the same name ${master.name} already exists.`);
       masters_names.push(master.name);
 
+      if (network) break;
+      // Sets the network and contractMetadata based on the node's zos version
+      const nodeTwinId = await this.capacity.getNodeTwinId(master.node_id);
+      const features = await this.rmb.request([nodeTwinId], "zos.system.node_features_get", "", 20, 3);
+      if (features.some(item => item.includes("zmachine-light") || item.includes("network-light"))) {
+        network = new ZNetworkLight(options.network.name, options.network.ip_range, this.config);
+        await network.load();
+        contractMetadata = JSON.stringify({
+          version: 4,
+          type: "kubernetes",
+          name: options.name,
+          projectName: this.config.projectName || `kubernetes/${options.name}`,
+        });
+      } else {
+        network = new Network(options.network.name, options.network.ip_range, this.config);
+        await network.load();
+        contractMetadata = JSON.stringify({
+          version: 3,
+          type: "kubernetes",
+          name: options.name,
+          projectName: this.config.projectName || `kubernetes/${options.name}`,
+        });
+      }
       const [twinDeployments, wgConfig] = await this.kubernetes.add_master(
         master.name,
         master.node_id,
@@ -197,6 +219,28 @@ class K8sModule extends BaseModule {
         throw new ValidationError(`Another worker with the same name ${worker.name} already exists.`);
       workers_names.push(worker.name);
 
+      if (network) break;
+      const nodeTwinId = await this.capacity.getNodeTwinId(worker.node_id);
+      const features = await this.rmb.request([nodeTwinId], "zos.system.node_features_get", "", 20, 3);
+      if (features.some(item => item.includes("zmachine-light") || item.includes("network-light"))) {
+        network = new ZNetworkLight(options.network.name, options.network.ip_range, this.config);
+        await network.load();
+        contractMetadata = JSON.stringify({
+          version: 4,
+          type: "kubernetes",
+          name: options.name,
+          projectName: this.config.projectName || `kubernetes/${options.name}`,
+        });
+      } else {
+        network = new Network(options.network.name, options.network.ip_range, this.config);
+        await network.load();
+        contractMetadata = JSON.stringify({
+          version: 3,
+          type: "kubernetes",
+          name: options.name,
+          projectName: this.config.projectName || `kubernetes/${options.name}`,
+        });
+      }
       const [twinDeployments] = await this.kubernetes.add_worker(
         worker.name,
         worker.node_id,
diff --git a/packages/grid_client/src/modules/machines.ts b/packages/grid_client/src/modules/machines.ts
index 30f837ce1e..99c04dd18d 100644
--- a/packages/grid_client/src/modules/machines.ts
+++ b/packages/grid_client/src/modules/machines.ts
@@ -9,6 +9,8 @@ import { validateInput } from "../helpers/validator";
 import { VMHL } from "../high_level/machine";
 import { DeploymentResultContracts, TwinDeployment } from "../high_level/models";
 import { Network } from "../primitives/network";
+import { ZNetworkLight } from "../primitives/networklight";
+import { Nodes } from "../primitives/nodes";
 import { Deployment } from "../zos";
 import { WorkloadTypes } from "../zos/workload";
 import { BaseModule } from "./base";
@@ -25,8 +27,10 @@ class MachinesModule extends BaseModule {
     WorkloadTypes.ip,
     WorkloadTypes.ipv4,
     WorkloadTypes.zlogs,
+    WorkloadTypes.zmachinelight,
   ]; // TODO: remove deprecated
   vm: VMHL;
+  capacity: Nodes;
   /**
    * The MachinesModule class is responsible for managing virtual machine deployments.
    * It extends the BaseModule class and provides methods to deploy, list, get, update, add, and delete machines.
@@ -38,6 +42,7 @@ class MachinesModule extends BaseModule {
   constructor(public config: GridClientConfig) {
     super(config);
     this.vm = new VMHL(config);
+    this.capacity = new Nodes(this.config.graphqlURL, this.config.proxyURL, this.config.rmbClient);
   }
 
   /**
@@ -47,17 +52,35 @@ class MachinesModule extends BaseModule {
    * @returns {Promise<[TwinDeployment[], Network, string]>} - A promise that resolves to an array of twin deployments, the network, and the WireGuard configuration string.
    */
   async _createDeployment(options: MachinesModel): Promise<[TwinDeployment[], Network, string]> {
-    const network = new Network(options.network.name, options.network.ip_range, this.config);
-    await network.load();
-
+    let network;
+    let contractMetadata;
+    for (const machine of options.machines) {
+      if (network) break;
+      // Sets the network and contractMetadata based on the node's zos version
+      const nodeTwinId = await this.capacity.getNodeTwinId(machine.node_id);
+      const features = await this.rmb.request([nodeTwinId], "zos.system.node_features_get", "", 20, 3);
+      if (features.some(item => item.includes("zmachine-light") || item.includes("network-light"))) {
+        network = new ZNetworkLight(options.network.name, options.network.ip_range, this.config);
+        await network.load();
+        contractMetadata = JSON.stringify({
+          version: 4,
+          type: "vm",
+          name: options.name,
+          projectName: this.config.projectName || `vm/${options.name}`,
+        });
+      } else {
+        network = new Network(options.network.name, options.network.ip_range, this.config);
+        await network.load();
+        contractMetadata = JSON.stringify({
+          version: 3,
+          type: "vm",
+          name: options.name,
+          projectName: this.config.projectName || `vm/${options.name}`,
+        });
+      }
+    }
     let twinDeployments: TwinDeployment[] = [];
     let wireguardConfig = "";
-    const contractMetadata = JSON.stringify({
-      version: 3,
-      type: "vm",
-      name: options.name,
-      projectName: this.config.projectName || `vm/${options.name}`,
-    });
 
     const machines_names: string[] = [];
 
@@ -65,7 +88,6 @@ class MachinesModule extends BaseModule {
       if (machines_names.includes(machine.name))
         throw new ValidationError(`Another machine with the same name ${machine.name} already exists.`);
       machines_names.push(machine.name);
-
       const [TDeployments, wgConfig] = await this.vm.create(
         machine.name,
         machine.node_id,
@@ -180,7 +202,10 @@ class MachinesModule extends BaseModule {
    */
   async getObj(deploymentName: string): Promise<ZmachineData[]> {
     const deployments = await this._get(deploymentName);
-    const workloads = await this._getWorkloadsByTypes(deploymentName, deployments, [WorkloadTypes.zmachine]);
+    const workloads = await this._getWorkloadsByTypes(deploymentName, deployments, [
+      WorkloadTypes.zmachine,
+      WorkloadTypes.zmachinelight,
+    ]);
     const promises = workloads.map(
       async workload => await this._getZmachineData(deploymentName, deployments, workload),
     );
diff --git a/packages/grid_client/src/modules/models.ts b/packages/grid_client/src/modules/models.ts
index 4d4f3fd9a7..4abdfa378f 100644
--- a/packages/grid_client/src/modules/models.ts
+++ b/packages/grid_client/src/modules/models.ts
@@ -21,7 +21,7 @@ import {
   ValidateNested,
 } from "class-validator";
 
-import { IsAlphanumericExpectUnderscore } from "../helpers";
+import { Features, IsAlphanumericExpectUnderscore } from "../helpers";
 import { Deployment } from "../zos/deployment";
 import { ZdbModes } from "../zos/zdb";
 import { blockchainType } from "./blockchainInterface";
@@ -635,6 +635,10 @@ class FilterOptions {
   @Expose() @IsOptional() @Transform(({ value }) => NodeStatus[value]) @IsEnum(NodeStatus) status?: NodeStatus;
   @Expose() @IsOptional() @IsString() region?: string;
   @Expose() @IsOptional() @IsBoolean() healthy?: boolean;
+  @Expose() @IsOptional() @IsBoolean() planetary?: boolean;
+  @Expose() @IsOptional() @IsBoolean() mycelium?: boolean;
+  @Expose() @IsOptional() @IsBoolean() wireguard?: boolean;
+  @Expose() @IsOptional() features?: Features[];
 }
 
 enum CertificationType {
diff --git a/packages/grid_client/src/primitives/networklight.ts b/packages/grid_client/src/primitives/networklight.ts
new file mode 100644
index 0000000000..19fa7bb526
--- /dev/null
+++ b/packages/grid_client/src/primitives/networklight.ts
@@ -0,0 +1,416 @@
+import { Contract } from "@threefold/tfchain_client";
+import { ValidationError } from "@threefold/types";
+import { Buffer } from "buffer";
+import { plainToInstance } from "class-transformer";
+import { Addr } from "netaddr";
+import { default as PrivateIp } from "private-ip";
+
+import { RMB } from "../clients/rmb/client";
+import { TFClient } from "../clients/tf-grid/client";
+import { GqlNodeContract } from "../clients/tf-grid/contracts";
+import { GridClientConfig } from "../config";
+import { events } from "../helpers/events";
+import { formatErrorMessage, generateRandomHexSeed } from "../helpers/utils";
+import { validateHexSeed } from "../helpers/validator";
+import { MyceliumNetworkModel } from "../modules";
+import { BackendStorage } from "../storage/backend";
+import { NetworkLight } from "../zos";
+import { Deployment } from "../zos/deployment";
+import { Workload, WorkloadTypes } from "../zos/workload";
+import { DeploymentFactory } from "./deployment";
+import { Nodes } from "./nodes";
+
+class Node {
+  node_id: number;
+  contract_id: number;
+  reserved_ips: string[] = [];
+}
+interface NetworkMetadata {
+  version: number;
+}
+class ZNetworkLight {
+  node: Node;
+  capacity: Nodes;
+  NodeIds: number[];
+  deployments: Deployment[] = [];
+  network: NetworkLight;
+  contracts: Required<GqlNodeContract>[];
+  reservedSubnets: string[] = [];
+  backendStorage: BackendStorage;
+  static newContracts: GqlNodeContract[] = [];
+  static deletedContracts: number[] = [];
+  rmb: RMB;
+  tfClient: TFClient;
+
+  constructor(public name: string, public ipRange: string, public config: GridClientConfig) {
+    if (Addr(ipRange).prefix !== 16) {
+      this.ipRange = Addr(ipRange).mask(16);
+      this.ipRange = this.ipRange.toString();
+    }
+    if (!this.isPrivateIP(ipRange)) {
+      throw new ValidationError("Network ip_range should be a private range.");
+    }
+    this.backendStorage = new BackendStorage(
+      config.backendStorageType,
+      config.substrateURL,
+      config.mnemonic,
+      config.storeSecret,
+      config.keypairType,
+      config.backendStorage,
+      config.seed,
+    );
+    this.rmb = new RMB(config.rmbClient);
+    this.capacity = new Nodes(this.config.graphqlURL, this.config.proxyURL, this.config.rmbClient);
+    this.tfClient = config.tfclient;
+  }
+
+  private getUpdatedMetadata(nodeId: number, metadata: string): string {
+    if (this.node.node_id === nodeId) {
+      const parsedMetadata: NetworkMetadata = JSON.parse(metadata || "{}");
+      parsedMetadata.version = 4;
+      return JSON.stringify(parsedMetadata);
+    }
+
+    return metadata;
+  }
+
+  updateWorkload(nodeId: number, workload: Workload): Workload {
+    workload.data = this.getUpdatedNetwork(workload.data);
+    workload.metadata = this.getUpdatedMetadata(nodeId, workload.metadata);
+    return workload;
+  }
+  getUpdatedNetwork(znet_light): NetworkLight {
+    if (this.network?.subnet === znet_light.subnet) {
+      return this.network;
+    }
+
+    return znet_light;
+  }
+
+  async addNode(
+    nodeId: number,
+    mycelium: boolean,
+    description = "",
+    subnet = "",
+    myceliumSeeds: MyceliumNetworkModel[] = [],
+  ): Promise<Workload | undefined> {
+    if (this.nodeExists(nodeId)) {
+      return;
+    }
+    events.emit("logs", `Adding node ${nodeId} to network ${this.name}`);
+    let znet_light = new NetworkLight();
+    if (!subnet) {
+      znet_light.subnet = this.getFreeSubnet();
+    } else {
+      znet_light.subnet = subnet;
+    }
+    znet_light["ip_range"] = this.ipRange;
+    znet_light["node_id"] = nodeId;
+
+    if (mycelium) {
+      const myceliumNetworkSeed = myceliumSeeds.find(item => item.nodeId === nodeId);
+      let seed = generateRandomHexSeed(32);
+      if (myceliumNetworkSeed?.seed) {
+        seed = myceliumNetworkSeed.seed;
+        validateHexSeed(seed, 32);
+      }
+
+      znet_light.mycelium = {
+        hex_key: seed,
+        peers: [],
+      };
+    }
+
+    this.network = znet_light;
+    this.updateNetworkDeployments();
+    znet_light = this.getUpdatedNetwork(znet_light);
+
+    const znet_light_workload = new Workload();
+    znet_light_workload.version = 0;
+    znet_light_workload.name = this.name;
+    znet_light_workload.type = WorkloadTypes.networklight;
+    znet_light_workload.data = znet_light;
+    znet_light_workload.metadata = "";
+    znet_light_workload.description = description;
+
+    this.node = new Node();
+    this.node.node_id = nodeId;
+
+    return znet_light_workload;
+  }
+
+  _fromObj(net: NetworkLight): NetworkLight {
+    const znet_light = plainToInstance(NetworkLight, net);
+    return znet_light;
+  }
+  deleteReservedIp(node_id: number, ip: string): string {
+    if (this.nodeExists(node_id) && this.node) {
+      this.node.reserved_ips = this.node?.reserved_ips?.filter(item => item !== ip);
+    }
+    return ip;
+  }
+  getNodeReservedIps(node_id: number): string[] {
+    if (this.nodeExists(node_id)) {
+      return this.node ? this.node?.reserved_ips : [];
+    }
+    return [];
+  }
+
+  getFreeIP(node_id: number, subnet = ""): string | undefined {
+    let ip;
+    if (this.network["node_id"] !== node_id && subnet) {
+      ip = Addr(subnet).mask(32).increment().increment();
+    } else if (this.network["node_id"] === node_id) {
+      ip = Addr(this.getNodeSubnet(node_id)).mask(32).increment().increment();
+    } else {
+      throw new ValidationError("node_id or subnet must be specified.");
+    }
+    if (ip) {
+      ip = ip.toString().split("/")[0];
+      if (this.node.node_id === node_id) {
+        this.node.reserved_ips.push(ip);
+        return ip;
+      }
+      throw new ValidationError(`node_id is not in the network. Please add it first.`);
+    }
+  }
+  ValidateFreeSubnet(subnet): string {
+    const reservedSubnets = this.getReservedSubnets();
+    if (!reservedSubnets.includes(subnet)) {
+      this.reservedSubnets.push(subnet);
+      return subnet;
+    } else {
+      throw new ValidationError(`subnet ${subnet} is not free.`);
+    }
+  }
+
+  updateNetworkDeployments(): void {
+    for (const deployment of this.deployments) {
+      const workloads = deployment["workloads"];
+      for (const workload of workloads) {
+        if (workload["type"] !== WorkloadTypes.networklight) {
+          continue;
+        }
+        if (this.network.subnet === workload["data"]["subnet"]) {
+          workload["data"] = this.network;
+          break;
+        }
+      }
+      deployment["workloads"] = workloads;
+    }
+  }
+  async checkMycelium(nodeId: number, mycelium: boolean, myceliumSeeds: MyceliumNetworkModel[] = []) {
+    if (!mycelium) return;
+    const myceliumNetworkSeed = myceliumSeeds.find(item => item.nodeId == nodeId);
+    if (this.network && this.network.mycelium && this.network.mycelium?.hex_key) {
+      if (myceliumSeeds && myceliumSeeds.length > 0 && myceliumNetworkSeed?.seed !== this.network.mycelium.hex_key) {
+        throw new ValidationError(`Another mycelium seed is used for this network ${this.name} on this ${nodeId}`);
+      }
+    } else {
+      // If network has no mycelium and user wanna update it and add mycelium.
+      let seed = generateRandomHexSeed(32);
+      console.log("this.network in here", this.network);
+      if (this.network) {
+        if (myceliumNetworkSeed?.seed) {
+          validateHexSeed(myceliumNetworkSeed.seed, 32);
+          seed = myceliumNetworkSeed.seed;
+        }
+
+        this.network.mycelium = {
+          hex_key: seed,
+          peers: [],
+        };
+        this.getUpdatedNetwork(this.network);
+        this.updateNetworkDeployments();
+
+        const deploymentFactory = new DeploymentFactory(this.config);
+        const filteredDeployments = this.deployments.filter(deployment => deployment["node_id"] === nodeId);
+        for (const deployment of filteredDeployments) {
+          const d = await deploymentFactory.fromObj(deployment);
+          for (const workload of d["workloads"]) {
+            workload.data["mycelium"]["hex_key"] = seed;
+            workload.data = this.getUpdatedNetwork(workload["data"]);
+            workload.version += 1;
+          }
+          return d;
+        }
+      }
+    }
+  }
+  nodeExists(node_id: number): boolean {
+    if (this.NodeIds && this.NodeIds.includes(node_id)) {
+      return true;
+    }
+    return false;
+  }
+
+  validateUserIP(node_id: number, ip_address = "") {
+    const nodeSubnet = this.getNodeSubnet(node_id);
+    const ip = Addr(ip_address);
+
+    if (!Addr(nodeSubnet).contains(ip)) {
+      throw new ValidationError(`Selected ip is not available in node subnet, node subnet: ${nodeSubnet}`);
+    }
+    if (this.node.node_id === node_id) {
+      this.node.reserved_ips.push(ip_address);
+      return ip_address;
+    }
+  }
+
+  getNodeSubnet(node_id: number): string | undefined {
+    if (this.network["node_id"] === node_id) {
+      return this.network.subnet;
+    }
+  }
+
+  getFreeSubnet(): string {
+    console.log("this.ipRange", this.ipRange.toString());
+    const subnet = Addr(this.ipRange).mask(24).nextSibling().nextSibling();
+    return subnet.toString();
+  }
+
+  getReservedSubnets(): string[] {
+    const subnet = this.getNodeSubnet(this.node.node_id);
+    if (subnet && !this.reservedSubnets.includes(subnet)) {
+      this.reservedSubnets.push(subnet);
+    }
+
+    return this.reservedSubnets;
+  }
+
+  private async getMyNetworkContracts(fetch = false) {
+    if (fetch || !this.contracts) {
+      let contracts = await this.tfClient.contracts.listMyNodeContracts({
+        graphqlURL: this.config.graphqlURL,
+        type: "network-light",
+      });
+      const alreadyFetchedContracts: GqlNodeContract[] = [];
+      for (const contract of ZNetworkLight.newContracts) {
+        if (contract.parsedDeploymentData!.type !== "network-light") continue;
+        const c = contracts.filter(c => +c.contractID === +contract.contractID);
+        if (c.length > 0) {
+          alreadyFetchedContracts.push(contract);
+          continue;
+        }
+        contracts.push(contract);
+      }
+
+      for (const contract of alreadyFetchedContracts) {
+        const index = ZNetworkLight.newContracts.indexOf(contract);
+        if (index > -1) ZNetworkLight.newContracts.splice(index, 1);
+      }
+
+      contracts = contracts.filter(c => !ZNetworkLight.deletedContracts.includes(+c.contractID));
+
+      const parsedContracts: Required<GqlNodeContract>[] = [];
+
+      for (const contract of contracts) {
+        const parsedDeploymentData = JSON.parse(contract.deploymentData);
+        parsedContracts.push({ ...contract, parsedDeploymentData });
+      }
+
+      this.contracts = parsedContracts;
+    }
+
+    return this.contracts;
+  }
+  async load(): Promise<void> {
+    if (!(await this.exists())) {
+      return;
+    }
+    this.NodeIds = [];
+    await this.loadNetworkFromContracts();
+  }
+
+  private async getReservedIps(nodeId: number): Promise<string[]> {
+    const node_twin_id = await this.capacity.getNodeTwinId(nodeId);
+    const payload = JSON.stringify({ network_name: this.name });
+    let reservedIps: string[];
+    try {
+      reservedIps = await this.rmb.request([node_twin_id], "zos.network.list_private_ips", payload);
+    } catch (e) {
+      (e as Error).message = formatErrorMessage(`Failed to list reserved ips from node ${nodeId}`, e);
+      throw e;
+    }
+    return reservedIps;
+  }
+
+  private async loadNetworkFromContracts() {
+    const contracts = await this.getDeploymentContracts(this.name);
+    for (const contract of contracts) {
+      const node_twin_id = await this.capacity.getNodeTwinId(contract.nodeID);
+      const payload = JSON.stringify({ contract_id: +contract.contractID });
+      let res: Deployment;
+      try {
+        res = await this.rmb.request([node_twin_id], "zos.deployment.get", payload);
+      } catch (e) {
+        (e as Error).message = formatErrorMessage(`Failed to load network deployment ${contract.contractID}`, e);
+        throw e;
+      }
+      res["node_id"] = contract.nodeID;
+      for (const workload of res.workloads) {
+        const data = workload.data as NetworkLight;
+        if (workload.type !== WorkloadTypes.networklight || workload.name !== this.name) {
+          continue;
+        }
+        if (workload.result.state === "deleted") {
+          continue;
+        }
+        const znet_light = this._fromObj(data);
+        znet_light["node_id"] = contract.nodeID;
+        const reservedIps = await this.getReservedIps(contract.nodeID);
+
+        this.node = {
+          contract_id: +contract.contractID,
+          node_id: contract.nodeID,
+          reserved_ips: reservedIps,
+        };
+        this.network = znet_light;
+        this.network["node_id"] = contract.nodeID;
+        this.deployments.push(res);
+      }
+    }
+  }
+  async deleteNode(node_id: number): Promise<number> {
+    if (!(await this.exists())) {
+      return 0;
+    }
+    events.emit("logs", `Deleting node ${node_id} from network ${this.name}`);
+    let contract_id = 0;
+    const node = new Node();
+    if (this.node.node_id !== node_id) {
+      this.node = node;
+    } else {
+      contract_id = this.node.contract_id;
+    }
+    this.reservedSubnets = this.reservedSubnets.filter(subnet => subnet === this.network.subnet);
+
+    return contract_id;
+  }
+  async getDeploymentContracts(name: string) {
+    const contracts = await this.getMyNetworkContracts(true);
+    for (const contract of contracts) {
+      this.NodeIds.push(contract.nodeID);
+    }
+    return contracts.filter(c => c.parsedDeploymentData.name === name);
+  }
+
+  private getContractsName(contracts: Required<GqlNodeContract>[]): string[] {
+    return Array.from(new Set(contracts.map(c => c.parsedDeploymentData.name)));
+  }
+
+  private async listAllNetworks() {
+    const contracts = await this.getMyNetworkContracts(true);
+    return this.getContractsName(contracts);
+  }
+
+  private async exists() {
+    return (await this.listAllNetworks()).includes(this.name);
+  }
+
+  isPrivateIP(ip: string): boolean {
+    return PrivateIp(ip.split("/")[0]);
+  }
+}
+
+export { ZNetworkLight, Node };
diff --git a/packages/grid_client/src/primitives/nodes.ts b/packages/grid_client/src/primitives/nodes.ts
index 3c22b5eeb4..d174aa9a30 100644
--- a/packages/grid_client/src/primitives/nodes.ts
+++ b/packages/grid_client/src/primitives/nodes.ts
@@ -8,10 +8,11 @@ import urlJoin from "url-join";
 
 import { RMB } from "../clients";
 import { Graphql } from "../clients/graphql/client";
-import { formatErrorMessage } from "../helpers";
+import { Features, formatErrorMessage } from "../helpers";
 import { send, sendWithFullResponse } from "../helpers/requests";
 import { convertObjectToQueryString } from "../helpers/utils";
-import { FarmFilterOptions, FilterOptions, NodeStatus } from "../modules/models";
+import { FarmFilterOptions, FilterOptions, MachineModel, NodeStatus } from "../modules/models";
+import { WorkloadTypes } from "../zos";
 
 interface FarmInfo {
   name: string;
@@ -62,6 +63,7 @@ interface NodeInfo {
   rentable: boolean;
   rented: boolean;
   price_usd: number;
+  features: Features[];
 }
 interface PublicConfig {
   domain: string;
@@ -333,9 +335,44 @@ class Nodes {
       });
   }
 
+  /**
+   * Sets the features of the node according to filter options.
+   *
+   * @param options - An object containing filter options to set the node's features.
+   * @returns A string array representing the node's features.
+   */
+  getFeaturesFromFilters(options: FilterOptions = {}): Features[] {
+    const featuresSet: Set<Features> = new Set(options.features || []);
+
+    if (options.publicIPs) {
+      featuresSet.add(Features.ipv4);
+      featuresSet.add(Features.ip);
+    }
+    if (options.hasIPv6) {
+      featuresSet.add(Features.ip);
+    }
+    if (options.wireguard) {
+      featuresSet.add(Features.wireguard);
+    }
+    if (options.mycelium) {
+      featuresSet.add(Features.mycelium);
+    }
+    if (options.planetary) {
+      featuresSet.add(Features.yggdrasil);
+    }
+
+    if (options.gateway) {
+      featuresSet.add(Features.gatewayfqdnproxy);
+      featuresSet.add(Features.gatewaynameproxy);
+    }
+
+    return Array.from(featuresSet);
+  }
+
   async filterNodes(options: FilterOptions = {}, url = ""): Promise<NodeInfo[]> {
     let nodes: NodeInfo[] = [];
     url = url || this.proxyURL;
+    options.features = this.getFeaturesFromFilters(options);
     const query = this.getNodeUrlQuery(options);
     nodes = await send("get", urlJoin(url, `/nodes?${query}`), "", {});
     if (nodes.length) {
@@ -423,6 +460,7 @@ class Nodes {
       healthy: options.healthy,
       sort_by: SortBy.FreeCRU,
       sort_order: SortOrder.Desc,
+      features: options.features,
     };
 
     if (options.gateway) {
diff --git a/packages/grid_client/src/primitives/vm.ts b/packages/grid_client/src/primitives/vm.ts
index 880a7d030a..f6b5e97296 100644
--- a/packages/grid_client/src/primitives/vm.ts
+++ b/packages/grid_client/src/primitives/vm.ts
@@ -1,6 +1,7 @@
 import { ComputeCapacity } from "../zos/computecapacity";
 import { Workload, WorkloadTypes } from "../zos/workload";
 import { Mount, Zmachine, ZmachineNetwork, ZNetworkInterface } from "../zos/zmachine";
+import { MachineInterface, ZmachineLight, ZmachineLightNetwork } from "../zos/zmachine_light";
 
 class VMPrimitive {
   _createComputeCapacity(cpu: number, memory: number): ComputeCapacity {
@@ -79,4 +80,76 @@ class VMPrimitive {
   }
 }
 
-export { VMPrimitive };
+class VMLightPrimitive {
+  _createComputeCapacity(cpu: number, memory: number): ComputeCapacity {
+    const compute_capacity = new ComputeCapacity();
+    compute_capacity.cpu = cpu;
+    compute_capacity.memory = memory * 1024 ** 2;
+    return compute_capacity;
+  }
+  _createNetworkInterface(networkName: string, ip: string): MachineInterface {
+    const zlightnetwork_interface = new MachineInterface();
+    zlightnetwork_interface.network = networkName;
+    zlightnetwork_interface.ip = ip;
+    return zlightnetwork_interface;
+  }
+  _createMachineLightNetwork(
+    networkName: string,
+    ip: string,
+    mycelium: boolean,
+    myceliumSeed: string,
+  ): ZmachineLightNetwork {
+    const zmachine_lightnetwork = new ZmachineLightNetwork();
+    zmachine_lightnetwork.interfaces = [this._createNetworkInterface(networkName, ip)];
+
+    if (mycelium) {
+      zmachine_lightnetwork.mycelium = {
+        hex_seed: myceliumSeed,
+        network: networkName,
+      };
+    }
+    return zmachine_lightnetwork;
+  }
+  create(
+    name: string,
+    flist: string,
+    cpu: number,
+    memory: number,
+    rootfs_size: number,
+    disks: Mount[],
+    networkName: string,
+    ip: string,
+    planetary: boolean,
+    mycelium: boolean,
+    myceliumSeed: string,
+    public_ip: string,
+    entrypoint: string,
+    env: Record<string, string>,
+    metadata = "",
+    description = "",
+    version = 0,
+    corex = false,
+    gpus: string[] = [],
+  ): Workload {
+    const zmachine_light = new ZmachineLight();
+    zmachine_light.flist = flist;
+    zmachine_light.network = this._createMachineLightNetwork(networkName, ip, mycelium, myceliumSeed);
+    zmachine_light.size = rootfs_size * 1024 ** 3;
+    zmachine_light.mounts = disks;
+    zmachine_light.entrypoint = entrypoint;
+    zmachine_light.compute_capacity = this._createComputeCapacity(cpu, memory);
+    zmachine_light.env = env;
+    zmachine_light.corex = corex;
+    zmachine_light.gpu = gpus;
+
+    const zmachine_light_workload = new Workload();
+    zmachine_light_workload.version = version || 0;
+    zmachine_light_workload.name = name;
+    zmachine_light_workload.type = WorkloadTypes.zmachinelight;
+    zmachine_light_workload.data = zmachine_light;
+    zmachine_light_workload.metadata = metadata;
+    zmachine_light_workload.description = description;
+    return zmachine_light_workload;
+  }
+}
+export { VMPrimitive, VMLightPrimitive };
diff --git a/packages/grid_client/src/zos/index.ts b/packages/grid_client/src/zos/index.ts
index b0126274a0..de94ac40f9 100644
--- a/packages/grid_client/src/zos/index.ts
+++ b/packages/grid_client/src/zos/index.ts
@@ -11,3 +11,5 @@ export * from "./znet";
 export * from "./gateway";
 export * from "./qsfs";
 export * from "./zlogs";
+export * from "./zmachine_light";
+export * from "./network_light";
diff --git a/packages/grid_client/src/zos/network_light.ts b/packages/grid_client/src/zos/network_light.ts
new file mode 100644
index 0000000000..7385b263c7
--- /dev/null
+++ b/packages/grid_client/src/zos/network_light.ts
@@ -0,0 +1,31 @@
+import { Expose, Type } from "class-transformer";
+import { IsNotEmpty, IsOptional, IsString, ValidateNested } from "class-validator";
+
+import { ValidateMembers } from "../helpers";
+import { WorkloadData } from "./workload_base";
+
+class Mycelium {
+  @Expose() @IsString() @IsNotEmpty() hex_key: string;
+  @Expose() @IsOptional() @IsString({ each: true }) peers?: string[];
+}
+
+@ValidateMembers()
+class NetworkLight extends WorkloadData {
+  @Expose() @IsString() @IsNotEmpty() subnet: string;
+  @Expose() @IsOptional() @Type(() => Mycelium) @ValidateNested() mycelium?: Mycelium;
+
+  challenge(): string {
+    let out = "";
+    out += this.subnet;
+
+    out += this.mycelium?.hex_key || "";
+    if (this.mycelium?.peers) {
+      for (let i = 0; i < this.mycelium?.peers?.length; i++) {
+        out += this.mycelium?.peers[i] || "";
+      }
+    }
+    return out;
+  }
+}
+
+export { NetworkLight };
diff --git a/packages/grid_client/src/zos/workload.ts b/packages/grid_client/src/zos/workload.ts
index 99f32a7f10..fb6d21855a 100644
--- a/packages/grid_client/src/zos/workload.ts
+++ b/packages/grid_client/src/zos/workload.ts
@@ -4,6 +4,7 @@ import { IsDefined, IsEnum, IsInt, IsNotEmpty, IsString, Min, ValidateNested } f
 import { ValidateMembers } from "../helpers";
 import { GatewayFQDNProxy, GatewayNameProxy, GatewayResult } from "./gateway";
 import { PublicIPv4, PublicIPv4Result } from "./ipv4"; // TODO: remove deprecated
+import { NetworkLight } from "./network_light";
 import { PublicIP, PublicIPResult } from "./public_ip";
 import { QuantumSafeFS, QuantumSafeFSResult } from "./qsfs";
 import { Volume, VolumeResult } from "./volume";
@@ -11,6 +12,7 @@ import { WorkloadData, WorkloadDataResult } from "./workload_base";
 import { Zdb, ZdbResult } from "./zdb";
 import { Zlogs, ZlogsResult } from "./zlogs";
 import { Zmachine, ZmachineResult } from "./zmachine";
+import { ZmachineLight, ZmachineLightResult } from "./zmachine_light";
 import { Zmount, ZmountResult } from "./zmount";
 import { Znet } from "./znet";
 
@@ -32,6 +34,8 @@ enum WorkloadTypes {
   gatewaynameproxy = "gateway-name-proxy",
   qsfs = "qsfs",
   zlogs = "zlogs",
+  networklight = "network-light",
+  zmachinelight = "zmachine-light",
 }
 
 class DeploymentResult {
@@ -54,6 +58,8 @@ class DeploymentResult {
         { value: WorkloadDataResult, name: WorkloadTypes.gatewaynameproxy },
         { value: QuantumSafeFSResult, name: WorkloadTypes.qsfs },
         { value: ZlogsResult, name: WorkloadTypes.zlogs },
+        { value: WorkloadDataResult, name: WorkloadTypes.networklight },
+        { value: ZmachineLightResult, name: WorkloadTypes.zmachinelight },
       ],
     },
   })
@@ -67,7 +73,8 @@ class DeploymentResult {
     | QuantumSafeFSResult
     | WorkloadDataResult
     | GatewayResult
-    | ZlogsResult;
+    | ZlogsResult
+    | ZmachineLightResult;
 }
 
 @ValidateMembers()
@@ -95,6 +102,8 @@ class Workload {
         { value: GatewayNameProxy, name: WorkloadTypes.gatewaynameproxy },
         { value: QuantumSafeFS, name: WorkloadTypes.qsfs },
         { value: Zlogs, name: WorkloadTypes.zlogs },
+        { value: NetworkLight, name: WorkloadTypes.networklight },
+        { value: ZmachineLight, name: WorkloadTypes.zmachinelight },
       ],
     },
   })
@@ -110,7 +119,9 @@ class Workload {
     | GatewayFQDNProxy
     | GatewayNameProxy
     | QuantumSafeFS
-    | Zlogs;
+    | Zlogs
+    | NetworkLight
+    | ZmachineLight;
 
   @Expose() @IsString() @IsDefined() metadata: string;
   @Expose() @IsString() @IsDefined() description: string;
diff --git a/packages/grid_client/src/zos/zmachine_light.ts b/packages/grid_client/src/zos/zmachine_light.ts
new file mode 100644
index 0000000000..0d6245930f
--- /dev/null
+++ b/packages/grid_client/src/zos/zmachine_light.ts
@@ -0,0 +1,83 @@
+import { Expose, Transform, Type } from "class-transformer";
+import {
+  IsBoolean,
+  IsDefined,
+  IsInt,
+  IsIP,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUrl,
+  Max,
+  Min,
+  ValidateNested,
+} from "class-validator";
+
+import { ValidateMembers } from "../helpers";
+import { ComputeCapacity } from "./computecapacity";
+import { WorkloadData, WorkloadDataResult } from "./workload_base";
+import { Mount, MyceliumIP } from "./zmachine";
+
+class MachineInterface {
+  @Expose() @IsString() @IsNotEmpty() network: string;
+  @Expose() @IsIP() @IsNotEmpty() ip: string;
+}
+
+class ZmachineLightNetwork {
+  @Expose() @Type(() => MachineInterface) @ValidateNested({ each: true }) interfaces: MachineInterface[];
+  @Expose() @Type(() => MyceliumIP) @ValidateNested() mycelium: MyceliumIP;
+
+  challenge(): string {
+    let out = "";
+    for (let i = 0; i < this.interfaces.length; i++) {
+      out += this.interfaces[i].network;
+      out += this.interfaces[i].ip;
+    }
+    out += this.mycelium?.network || "";
+    out += this.mycelium?.hex_seed || "";
+    return out;
+  }
+}
+@ValidateMembers()
+class ZmachineLight extends WorkloadData {
+  @Expose() @IsString() @IsNotEmpty() @IsUrl() flist: string;
+  @Expose() @Type(() => ZmachineLightNetwork) @ValidateNested() network: ZmachineLightNetwork;
+  @Expose() @IsInt() @Min(0) @Max(10 * 1024 ** 4) size: number; // in bytes
+  @Expose() @Type(() => ComputeCapacity) @ValidateNested() compute_capacity: ComputeCapacity;
+  @Expose() @Type(() => Mount) @ValidateNested({ each: true }) mounts: Mount[];
+  @Expose() @IsString() @IsDefined() entrypoint: string;
+  @Expose() env: Record<string, string>;
+  @Expose() @Transform(({ value }) => (value ? true : false)) @IsBoolean() corex: boolean;
+  @Expose() @IsString({ each: true }) @IsOptional() gpu?: string[];
+
+  challenge(): string {
+    let out = "";
+    out += this.flist;
+    out += this.network.challenge();
+    out += this.size || "0";
+    out += this.compute_capacity.challenge();
+    for (let i = 0; i < this.mounts.length; i++) {
+      out += this.mounts[i].challenge();
+    }
+    out += this.entrypoint;
+    for (const key of Object.keys(this.env).sort()) {
+      out += key;
+      out += "=";
+      out += this.env[key];
+      if (this.gpu) {
+        for (const g of this.gpu) {
+          out += g;
+        }
+      }
+    }
+    return out;
+  }
+}
+
+class ZmachineLightResult extends WorkloadDataResult {
+  @Expose() id: string;
+  @Expose() ip: string;
+  @Expose() mycelium_ip: string;
+}
+
+export { ZmachineLight, ZmachineLightNetwork, MachineInterface, ZmachineLightResult };
diff --git a/packages/grid_client/tests/modules/applications/casperlabs.test.ts b/packages/grid_client/tests/modules/applications/casperlabs.test.ts
index 1c3affbb6b..3f71be1cab 100644
--- a/packages/grid_client/tests/modules/applications/casperlabs.test.ts
+++ b/packages/grid_client/tests/modules/applications/casperlabs.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -78,6 +86,7 @@ test("TC2683 - Applications: Deploy Casperlabs", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/applications/discourse.test.ts b/packages/grid_client/tests/modules/applications/discourse.test.ts
index 1c5dfc7422..827c5a842a 100644
--- a/packages/grid_client/tests/modules/applications/discourse.test.ts
+++ b/packages/grid_client/tests/modules/applications/discourse.test.ts
@@ -3,7 +3,15 @@ import { Buffer } from "buffer";
 import { setTimeout } from "timers/promises";
 import TweetNACL from "tweetnacl";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -85,6 +93,7 @@ test.skip("TC2690 - Applications: Deploy Discourse", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.ip, Features.ipv4, Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/applications/funkwhale.test.ts b/packages/grid_client/tests/modules/applications/funkwhale.test.ts
index 1f26445630..ffe319240b 100644
--- a/packages/grid_client/tests/modules/applications/funkwhale.test.ts
+++ b/packages/grid_client/tests/modules/applications/funkwhale.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -78,6 +86,7 @@ test("TC2685 - Applications: Deploy Funkwhale", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/applications/mattermost.test.ts b/packages/grid_client/tests/modules/applications/mattermost.test.ts
index b8d6969cbc..45514f6a40 100644
--- a/packages/grid_client/tests/modules/applications/mattermost.test.ts
+++ b/packages/grid_client/tests/modules/applications/mattermost.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -78,6 +86,7 @@ test("TC2689 - Applications: Deploy Mattermost", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.ip, Features.ipv4, Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/applications/nextcloud.test.ts b/packages/grid_client/tests/modules/applications/nextcloud.test.ts
index b816b32ea1..79d114e88c 100644
--- a/packages/grid_client/tests/modules/applications/nextcloud.test.ts
+++ b/packages/grid_client/tests/modules/applications/nextcloud.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -78,6 +86,7 @@ test("TC2692 - Applications: Deploy Nextcloud", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/applications/nodepilot.test.ts b/packages/grid_client/tests/modules/applications/nodepilot.test.ts
index 9f9a6420e8..384bf3c724 100644
--- a/packages/grid_client/tests/modules/applications/nodepilot.test.ts
+++ b/packages/grid_client/tests/modules/applications/nodepilot.test.ts
@@ -1,7 +1,7 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import { Features, FilterOptions, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -67,6 +67,7 @@ test.skip("TC2701 - Applications: Deploy Nodepilot", async () => {
     farmId: 1,
     publicIPs: publicIp,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.ip, Features.ipv4, Features.wireguard],
     status: "up",
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
diff --git a/packages/grid_client/tests/modules/applications/peertube.test.ts b/packages/grid_client/tests/modules/applications/peertube.test.ts
index 72fcc3d28c..400dd6a511 100644
--- a/packages/grid_client/tests/modules/applications/peertube.test.ts
+++ b/packages/grid_client/tests/modules/applications/peertube.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -78,6 +86,7 @@ test("TC2684 - Applications: Deploy Peertube", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/applications/subsquid.test.ts b/packages/grid_client/tests/modules/applications/subsquid.test.ts
index dbc877b41e..2b8c96a959 100644
--- a/packages/grid_client/tests/modules/applications/subsquid.test.ts
+++ b/packages/grid_client/tests/modules/applications/subsquid.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -78,6 +86,7 @@ test("TC2693 - Applications: Deploy Subsquid", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/applications/taiga.test.ts b/packages/grid_client/tests/modules/applications/taiga.test.ts
index 71b4bd03d2..70bd1cf91c 100644
--- a/packages/grid_client/tests/modules/applications/taiga.test.ts
+++ b/packages/grid_client/tests/modules/applications/taiga.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -78,6 +86,7 @@ test("TC2691 - Applications: Deploy Taiga", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/applications/wordpress.test.ts b/packages/grid_client/tests/modules/applications/wordpress.test.ts
index 7004fab578..2e32684f48 100644
--- a/packages/grid_client/tests/modules/applications/wordpress.test.ts
+++ b/packages/grid_client/tests/modules/applications/wordpress.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../../src";
 import { config, getClient } from "../../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, splitIP } from "../../utils";
 
@@ -78,6 +86,7 @@ test("TC2700 - Applications: Deploy Wordpress", async () => {
     sru: rootfsSize + diskSize,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.wireguard],
   } as FilterOptions);
   const nodeId = await getOnlineNode(nodes);
   if (nodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/gateways.test.ts b/packages/grid_client/tests/modules/gateways.test.ts
index 6a509c6e7e..8a8a92dbdc 100644
--- a/packages/grid_client/tests/modules/gateways.test.ts
+++ b/packages/grid_client/tests/modules/gateways.test.ts
@@ -1,7 +1,15 @@
 import axios from "axios";
 import { setTimeout } from "timers/promises";
 
-import { FilterOptions, GatewayNameModel, generateString, GridClient, MachinesModel, randomChoice } from "../../src";
+import {
+  Features,
+  FilterOptions,
+  GatewayNameModel,
+  generateString,
+  GridClient,
+  MachinesModel,
+  randomChoice,
+} from "../../src";
 import { config, getClient } from "../client_loader";
 import { generateInt, getOnlineNode, log, splitIP } from "../utils";
 
@@ -115,6 +123,7 @@ test("TC1237 - Gateways: Expose a VM Over Gateway", async () => {
     gateway: true,
     farmId: 1,
     availableFor: await gridClient.twins.get_my_twin_id(),
+    features: [Features.gatewayfqdnproxy, Features.gatewaynameproxy],
   } as FilterOptions);
   const gatewayNodeId = await getOnlineNode(gatewayNodes);
   if (gatewayNodeId == -1) throw new Error("no nodes available to complete this test");
diff --git a/packages/grid_client/tests/modules/kubernetes.test.ts b/packages/grid_client/tests/modules/kubernetes.test.ts
index ec78f19f97..0aeb294152 100644
--- a/packages/grid_client/tests/modules/kubernetes.test.ts
+++ b/packages/grid_client/tests/modules/kubernetes.test.ts
@@ -1,6 +1,7 @@
 import {
   AddWorkerModel,
   DeleteWorkerModel,
+  Features,
   FilterOptions,
   generateString,
   GridClient,
@@ -75,6 +76,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
       sru: masterRootfsSize + masterDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -94,6 +96,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
       sru: masterRootfsSize + masterDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
 
@@ -106,6 +109,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
       sru: workerRootfsSize + workerDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -125,6 +129,7 @@ test("TC1231 - Kubernetes: Deploy a Kubernetes Cluster", async () => {
       sru: workerRootfsSize + workerDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
   const masterNodeId = await getOnlineNode(masterNode);
@@ -343,6 +348,7 @@ test("TC1232 - Kubernetes: Add Worker", async () => {
       sru: masterRootfsSize + masterDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -362,6 +368,7 @@ test("TC1232 - Kubernetes: Add Worker", async () => {
       sru: masterRootfsSize + masterDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
 
@@ -374,6 +381,7 @@ test("TC1232 - Kubernetes: Add Worker", async () => {
       sru: (workerRootfsSize + workerDiskSize) * 2,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -393,6 +401,7 @@ test("TC1232 - Kubernetes: Add Worker", async () => {
       sru: (workerRootfsSize + workerDiskSize) * 2,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
   const masterNodeId = await getOnlineNode(masterNode);
@@ -599,6 +608,7 @@ test("TC1233 - Kubernetes: Delete Worker", async () => {
       sru: masterRootfsSize + masterDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -618,6 +628,7 @@ test("TC1233 - Kubernetes: Delete Worker", async () => {
       sru: masterRootfsSize + masterDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
 
@@ -630,6 +641,7 @@ test("TC1233 - Kubernetes: Delete Worker", async () => {
       sru: workerRootfsSize + workerDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -649,6 +661,7 @@ test("TC1233 - Kubernetes: Delete Worker", async () => {
       sru: workerRootfsSize + workerDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
   const masterNodeId = await getOnlineNode(masterNode);
diff --git a/packages/grid_client/tests/modules/network_light.test.ts b/packages/grid_client/tests/modules/network_light.test.ts
new file mode 100644
index 0000000000..c143a7c77f
--- /dev/null
+++ b/packages/grid_client/tests/modules/network_light.test.ts
@@ -0,0 +1,61 @@
+import { plainToClass } from "class-transformer";
+
+import { NetworkLight } from "../../src";
+let networkLight: NetworkLight;
+
+beforeEach(() => {
+  networkLight = new NetworkLight();
+  networkLight.subnet = "192.168.0.0/16";
+  networkLight.mycelium = {
+    hex_key: "abc123",
+    peers: ["peer1", "peer2"],
+  };
+});
+
+describe("NetworkLight Class Tests", () => {
+  it("should create a valid NetworkLight instance", () => {
+    expect(networkLight).toBeInstanceOf(NetworkLight);
+  });
+
+  it("should correctly serialize and deserialize a NetworkLight instance", () => {
+    const serialized = JSON.stringify(networkLight);
+    const deserialized = plainToClass(NetworkLight, JSON.parse(serialized));
+
+    expect(deserialized).toBeInstanceOf(NetworkLight);
+    expect(deserialized.challenge()).toBe(networkLight.challenge());
+  });
+
+  it("should correctly compute the challenge string", () => {
+    const expectedChallenge =
+      networkLight.subnet + networkLight.mycelium.hex_key + networkLight.mycelium.peers?.join("");
+
+    expect(networkLight.challenge()).toBe(expectedChallenge);
+  });
+
+  it("should correctly handle missing peers", () => {
+    networkLight.mycelium.peers = undefined;
+
+    const expectedChallenge = networkLight.subnet + networkLight.mycelium.hex_key;
+    expect(networkLight.challenge()).toBe(expectedChallenge);
+  });
+
+  it("should throw an error if subnet is empty", () => {
+    const setEmptySubnet = () => (networkLight.subnet = "");
+
+    expect(setEmptySubnet).toThrow();
+  });
+
+  it("should handle an empty mycelium object correctly", () => {
+    networkLight.mycelium = undefined as any;
+
+    const expectedChallenge = networkLight.subnet;
+    expect(networkLight.challenge()).toBe(expectedChallenge);
+  });
+
+  it("should correctly handle peers being empty", () => {
+    networkLight.mycelium.peers = [];
+
+    const expectedChallenge = networkLight.subnet + networkLight.mycelium.hex_key;
+    expect(networkLight.challenge()).toBe(expectedChallenge);
+  });
+});
diff --git a/packages/grid_client/tests/modules/qsfs.test.ts b/packages/grid_client/tests/modules/qsfs.test.ts
index fbc7366713..fbd19f31f7 100644
--- a/packages/grid_client/tests/modules/qsfs.test.ts
+++ b/packages/grid_client/tests/modules/qsfs.test.ts
@@ -1,4 +1,5 @@
 import {
+  Features,
   FilterOptions,
   generateString,
   GridClient,
@@ -81,6 +82,7 @@ test("TC1234 - QSFS: Deploy QSFS underneath a VM", async () => {
       sru: qsfsCache,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
     if (allNodes.length >= 2) {
       const qsfsNode1 = await getOnlineNode(allNodes);
@@ -111,6 +113,7 @@ test("TC1234 - QSFS: Deploy QSFS underneath a VM", async () => {
       sru: qsfsCache,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
     if (allNodes.length >= 2) {
       const qsfsNode1 = await getOnlineNode(allNodes);
@@ -138,6 +141,7 @@ test("TC1234 - QSFS: Deploy QSFS underneath a VM", async () => {
       sru: rootfsSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -156,6 +160,7 @@ test("TC1234 - QSFS: Deploy QSFS underneath a VM", async () => {
       sru: rootfsSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
   }
   const nodeId = await getOnlineNode(nodes);
@@ -366,6 +371,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
       sru: qsfsCache,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
     if (allNodes.length >= 2) {
       const qsfsNode1 = await getOnlineNode(allNodes);
@@ -396,6 +402,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
       sru: qsfsCache,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
     if (allNodes.length >= 2) {
       const qsfsNode1 = await getOnlineNode(allNodes);
@@ -423,6 +430,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
       sru: masterRootfsSize + masterDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -442,6 +450,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
       sru: masterRootfsSize + masterDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
   }
 
@@ -454,6 +463,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
       sru: workerRootfsSize + workerDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -473,6 +483,7 @@ test("TC1235 - QSFS: Deploy QSFS Underneath a Kubernetes Cluster", async () => {
       sru: workerRootfsSize + workerDiskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.qsfs],
     } as FilterOptions);
   }
   const masterNodeId = await getOnlineNode(masterNode);
diff --git a/packages/grid_client/tests/modules/vm.test.ts b/packages/grid_client/tests/modules/vm.test.ts
index 90acd3d140..43b4a1a380 100644
--- a/packages/grid_client/tests/modules/vm.test.ts
+++ b/packages/grid_client/tests/modules/vm.test.ts
@@ -1,4 +1,12 @@
-import { FilterOptions, generateString, GridClient, MachineModel, MachinesModel, randomChoice } from "../../src";
+import {
+  Features,
+  FilterOptions,
+  generateString,
+  GridClient,
+  MachineModel,
+  MachinesModel,
+  randomChoice,
+} from "../../src";
 import { config, getClient } from "../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log, RemoteRun, splitIP } from "../utils";
 
@@ -60,6 +68,7 @@ test("TC1228 - VM: Deploy a VM", async () => {
       sru: rootfsSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -78,6 +87,7 @@ test("TC1228 - VM: Deploy a VM", async () => {
       sru: rootfsSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
   const nodeId = await getOnlineNode(nodes);
@@ -223,6 +233,7 @@ test("TC2847 - VM: Deploy a VM With Mycelium", async () => {
       sru: rootfsSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -241,6 +252,7 @@ test("TC2847 - VM: Deploy a VM With Mycelium", async () => {
       sru: rootfsSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
   const nodeId = await getOnlineNode(nodes);
@@ -390,6 +402,7 @@ test("TC1229 - VM: Deploy a VM With a Disk", async () => {
       sru: rootfsSize + diskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -409,6 +422,7 @@ test("TC1229 - VM: Deploy a VM With a Disk", async () => {
       sru: rootfsSize + diskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
   const nodeId = await getOnlineNode(nodes);
@@ -537,6 +551,7 @@ test("TC1230 - VM: Deploy Multiple VMs on Different Nodes", async () => {
       sru: vmRootfs[0],
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -555,6 +570,7 @@ test("TC1230 - VM: Deploy Multiple VMs on Different Nodes", async () => {
       sru: vmRootfs[0],
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
 
@@ -567,6 +583,7 @@ test("TC1230 - VM: Deploy Multiple VMs on Different Nodes", async () => {
       sru: vmRootfs[1],
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -585,6 +602,7 @@ test("TC1230 - VM: Deploy Multiple VMs on Different Nodes", async () => {
       sru: vmRootfs[1],
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.wireguard],
     } as FilterOptions);
   }
 
diff --git a/packages/grid_client/tests/modules/zdb.test.ts b/packages/grid_client/tests/modules/zdb.test.ts
index b37069bc0d..9c99d521db 100644
--- a/packages/grid_client/tests/modules/zdb.test.ts
+++ b/packages/grid_client/tests/modules/zdb.test.ts
@@ -1,6 +1,6 @@
 import { createClient } from "redis";
 
-import { FilterOptions, generateString, GridClient, ZDBModel, ZdbModes, ZDBSModel } from "../../src";
+import { Features, FilterOptions, generateString, GridClient, ZDBModel, ZdbModes, ZDBSModel } from "../../src";
 import { getClient } from "../client_loader";
 import { GBToBytes, generateInt, getOnlineNode, log } from "../utils";
 
@@ -58,6 +58,7 @@ test("TC1236 - ZDB: Deploy ZDBs", async () => {
       hru: diskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.zdb],
     } as FilterOptions);
   } catch (error) {
     //Log the resources that were not found.
@@ -72,6 +73,7 @@ test("TC1236 - ZDB: Deploy ZDBs", async () => {
       hru: diskSize,
       farmId: 1,
       availableFor: await gridClient.twins.get_my_twin_id(),
+      features: [Features.zdb],
     } as FilterOptions);
   }
   const nodeId = await getOnlineNode(nodes);
diff --git a/packages/grid_client/tests/modules/zmachine_light.test.ts b/packages/grid_client/tests/modules/zmachine_light.test.ts
new file mode 100644
index 0000000000..f3f864c562
--- /dev/null
+++ b/packages/grid_client/tests/modules/zmachine_light.test.ts
@@ -0,0 +1,158 @@
+import { plainToClass } from "class-transformer";
+
+import { ComputeCapacity, MachineInterface, Mount, ZmachineLight, ZmachineLightNetwork } from "../../src";
+
+let zmachineLight = new ZmachineLight();
+const computeCapacity = new ComputeCapacity();
+const network = new ZmachineLightNetwork();
+const disks = new Mount();
+
+beforeEach(() => {
+  computeCapacity.cpu = 1;
+  computeCapacity.memory = 256 * 1024 ** 2;
+
+  network.interfaces = [
+    {
+      network: "znetwork",
+      ip: "10.20.2.2",
+    },
+  ];
+  network.mycelium = {
+    network: "mycelium_net",
+    hex_seed: "abc123",
+  };
+
+  const rootfs_size = 2;
+
+  disks.name = "zdisk";
+  disks.mountpoint = "/mnt/data";
+
+  zmachineLight.flist = "https://hub.grid.tf/tf-official-vms/ubuntu-22.04.flist";
+  zmachineLight.network = network;
+  zmachineLight.size = rootfs_size * 1024 ** 3;
+  zmachineLight.mounts = [disks];
+  zmachineLight.entrypoint = "/sbin/zinit init";
+  zmachineLight.compute_capacity = computeCapacity;
+  zmachineLight.env = { key: "value" };
+  zmachineLight.corex = false;
+  zmachineLight.gpu = ["AMD", "NVIDIA"];
+});
+
+describe("ZmachineLight Class Tests", () => {
+  it("should create a valid ZmachineLight instance", () => {
+    expect(zmachineLight).toBeInstanceOf(ZmachineLight);
+  });
+
+  it("should correctly serialize and deserialize a ZmachineLight instance", () => {
+    const serialized = JSON.stringify(zmachineLight);
+    const deserialized = plainToClass(ZmachineLight, JSON.parse(serialized));
+
+    expect(deserialized).toBeInstanceOf(ZmachineLight);
+    expect(deserialized.challenge()).toBe(zmachineLight.challenge());
+  });
+
+  it("should correctly handle env vars", () => {
+    const challenge = zmachineLight.challenge();
+
+    expect(challenge).toContain("key=value");
+  });
+
+  it("should correctly compute the challenge string", () => {
+    const expectedChallenge =
+      zmachineLight.flist +
+      network.challenge() +
+      zmachineLight.size +
+      computeCapacity.challenge() +
+      zmachineLight.mounts[0].challenge() +
+      zmachineLight.entrypoint +
+      JSON.stringify(zmachineLight.env)
+        .replace(/[{"}"]/g, "")
+        .replace(":", "=") +
+      zmachineLight.gpu?.toString().replace(",", "");
+
+    expect(zmachineLight.challenge()).toBe(expectedChallenge);
+    expect(zmachineLight.challenge()).toContain("key=value");
+  });
+
+  it("should correctly handle the gpu array", () => {
+    expect(zmachineLight.gpu).toContain("NVIDIA");
+
+    zmachineLight.gpu = [];
+
+    expect(zmachineLight.challenge()).not.toContain("NVIDIA");
+
+    zmachineLight.gpu = ["NVIDIA", "AMD"];
+
+    expect(zmachineLight.challenge()).toContain("NVIDIA");
+    expect(zmachineLight.challenge()).toContain("AMD");
+  });
+
+  it("should fail validation for entering invalid flist", () => {
+    const emptyFlist = () => (zmachineLight.flist = "");
+    const invalidURL = () => (zmachineLight.flist = "www.invalid-url");
+
+    expect(emptyFlist).toThrow();
+    expect(invalidURL).toThrow();
+  });
+
+  it("should fail validation for entering invalid entrypoint", () => {
+    const invalidEntrypoint = () => (zmachineLight.entrypoint = undefined as any);
+
+    expect(invalidEntrypoint).toThrow();
+  });
+
+  it("should fail validation for entering invalid size", () => {
+    const maxSize = () => (zmachineLight.size = 10 * 1024 ** 5);
+    const decimalSize = () => (zmachineLight.size = 1.2);
+    const negativeSize = () => (zmachineLight.size = -1);
+
+    expect(maxSize).toThrow();
+    expect(decimalSize).toThrow();
+    expect(negativeSize).toThrow();
+  });
+
+  it("should throw error if network interfaces values are invalid", () => {
+    const invalidNetwork = new ZmachineLightNetwork();
+    invalidNetwork.interfaces = [new MachineInterface()];
+    zmachineLight.network.interfaces[0].network = ""; // invalid network
+    zmachineLight.network.interfaces[0].ip = ""; // invalid IP
+
+    const result = () => {
+      zmachineLight.network = invalidNetwork;
+    };
+
+    expect(result).toThrow();
+  });
+
+  it("should throw an error if mount name is empty", () => {
+    const invalidMount = new Mount();
+    invalidMount.name = "";
+    invalidMount.mountpoint = "/mnt/data";
+
+    const result = () => {
+      zmachineLight.mounts = [invalidMount];
+    };
+
+    expect(result).toThrow();
+  });
+
+  it("should fail if zmachineLight is parsed to an invalid object", () => {
+    const invalidZmachineLight = `{
+      "flist": "",
+      "network": "invalid_network_object",
+      "size": "not_a_number",
+      "compute_capacity": {},
+      "mounts": "not_an_array",
+      "entrypoint": 123,
+      "env": "not_an_object",
+      "corex": "not_a_boolean",
+      "gpu": [123, "valid_string", false]
+    }`;
+
+    const result = () => {
+      zmachineLight = plainToClass(ZmachineLight, JSON.parse(invalidZmachineLight));
+    };
+
+    expect(result).toThrow();
+  });
+});
diff --git a/packages/playground/src/components/caprover_worker.vue b/packages/playground/src/components/caprover_worker.vue
index 73f9f8d72b..54e5159652 100644
--- a/packages/playground/src/components/caprover_worker.vue
+++ b/packages/playground/src/components/caprover_worker.vue
@@ -51,6 +51,9 @@
         solutionDisk: $props.modelValue.solution?.disk,
         memory: $props.modelValue.solution?.memory,
         rootFilesystemSize,
+        planetary: $props.modelValue.planetary,
+        mycelium: $props.modelValue.mycelium,
+        wireguard: $props.modelValue.wireguard,
       }"
       v-model="$props.modelValue.selectionDetails"
     />
diff --git a/packages/playground/src/components/deployment_data_dialog.vue b/packages/playground/src/components/deployment_data_dialog.vue
index 5971f419c7..30ddb6a9a4 100644
--- a/packages/playground/src/components/deployment_data_dialog.vue
+++ b/packages/playground/src/components/deployment_data_dialog.vue
@@ -68,7 +68,11 @@
                 :label="getDiskLabel(contract, disk)"
                 :data="Math.ceil(disk.size / (1024 * 1024 * 1024))"
               />
-              <CopyReadonlyInput label="WireGuard IP" :data="contract.interfaces[0].ip" />
+              <CopyReadonlyInput
+                v-if="contract.type !== 'zmachine-light'"
+                label="WireGuard IP"
+                :data="contract.interfaces[0].ip"
+              />
               <CopyReadonlyInput
                 label="WireGuard Config"
                 textarea
diff --git a/packages/playground/src/components/k8s_worker.vue b/packages/playground/src/components/k8s_worker.vue
index 81854cebc2..44e396fc7e 100644
--- a/packages/playground/src/components/k8s_worker.vue
+++ b/packages/playground/src/components/k8s_worker.vue
@@ -104,6 +104,9 @@
         ssdDisks: [$props.modelValue.diskSize],
         memory: $props.modelValue.memory,
         rootFilesystemSize: $props.modelValue.rootFsSize,
+        planetary: $props.modelValue.planetary,
+        mycelium: $props.modelValue.mycelium,
+        wireguard: $props.modelValue.wireguard,
       }"
       v-model="$props.modelValue.selectionDetails"
     />
diff --git a/packages/playground/src/components/manage_gateway_dialog.vue b/packages/playground/src/components/manage_gateway_dialog.vue
index a08939b94a..3337b87a01 100644
--- a/packages/playground/src/components/manage_gateway_dialog.vue
+++ b/packages/playground/src/components/manage_gateway_dialog.vue
@@ -9,7 +9,6 @@
     >
       <weblet-layout ref="layout" @back="onBack">
         <template #title>Manage Domains ({{ vm ? vm.name : k8s?.masters[0].name }})</template>
-
         <v-tabs align-tabs="center" color="secondary" class="mb-6" v-model="gatewayTab" :disabled="deleting">
           <v-tab>Domains List</v-tab>
           <v-tab>Add new domain</v-tab>
@@ -69,9 +68,7 @@
               {{ item.name }}
             </template>
 
-            <template #[`item.tls_passthrough`]="{ item }">
-              {{ item.tls_passthrough ? "Yes" : "No" }}
-            </template>
+            <template #[`item.tls_passthrough`]="{ item }"> {{ item.tls_passthrough ? "Yes" : "No" }} </template>
 
             <template #[`item.backends`]="{ item }">
               {{ (Array.isArray(item.backends) ? item.backends[0] : item.backends) ?? "-" }}
@@ -190,7 +187,7 @@
 </template>
 
 <script lang="ts">
-import type { GridClient, ZmachineData } from "@threefold/grid_client";
+import { type GridClient, WorkloadTypes, type ZmachineData } from "@threefold/grid_client";
 import { onMounted, type PropType, ref, watch } from "vue";
 
 import { useGrid } from "../stores";
@@ -418,14 +415,16 @@ export default {
         (networks.value = []);
       const { publicIP, planetary, myceliumIP, interfaces } = selectedNode.value;
 
-      addNetwork(NetworkInterfaces.WireGuard, interfaces?.[0]?.ip);
-      addNetwork(NetworkInterfaces.PublicIPV4, publicIP?.ip.split("/")[0]);
-
-      if (props.vm) {
+      if (props.vm && props.vm.type === WorkloadTypes.zmachine) {
+        addNetwork(NetworkInterfaces.WireGuard, interfaces?.[0]?.ip);
+        addNetwork(NetworkInterfaces.PublicIPV4, publicIP?.ip.split("/")[0]);
         addNetwork(NetworkInterfaces.Planetary, planetary);
         addNetwork(NetworkInterfaces.Mycelium, myceliumIP);
         addNetwork(NetworkInterfaces.PublicIPV6, publicIP?.ip6.split("/")[0]);
       }
+      if (props.vm && props.vm.type === WorkloadTypes.zmachinelight) {
+        addNetwork(NetworkInterfaces.Mycelium, myceliumIP);
+      }
       selectedIPAddress.value = networks.value[0];
     }
 
diff --git a/packages/playground/src/components/node_selector/TfDomainName.vue b/packages/playground/src/components/node_selector/TfDomainName.vue
index ec3ad27412..c462fb0c81 100644
--- a/packages/playground/src/components/node_selector/TfDomainName.vue
+++ b/packages/playground/src/components/node_selector/TfDomainName.vue
@@ -164,12 +164,18 @@ export default {
       loadedDomains.value = [];
       return loadDomains();
     };
-
-    useWatchDeep(filters, reloadDomains, {
-      immediate: true,
-      deep: true,
-      ignoreFields: ["page"],
-    });
+    let previousFilters = JSON.stringify(filters.value);
+    useWatchDeep(
+      filters,
+      newFilters => {
+        const currentFilters = JSON.stringify(newFilters);
+        if (currentFilters !== previousFilters) {
+          reloadDomains();
+          previousFilters = currentFilters;
+        }
+      },
+      { immediate: true, deep: true, ignoreFields: ["page"] },
+    );
     const customDomain = ref("");
 
     const domainNameValid = ref<boolean | null>(null);
@@ -214,7 +220,10 @@ export default {
       $el: input,
     };
 
-    onMounted(() => form?.register(uid.toString(), fakeService));
+    onMounted(() => {
+      loadDomains();
+      form?.register(uid.toString(), fakeService);
+    });
     onUnmounted(() => form?.unregister(uid.toString()));
 
     onMounted(bindStatus);
diff --git a/packages/playground/src/components/node_selector/TfManualNodeSelector.vue b/packages/playground/src/components/node_selector/TfManualNodeSelector.vue
index 8448cbfc61..6d5e0bb276 100644
--- a/packages/playground/src/components/node_selector/TfManualNodeSelector.vue
+++ b/packages/playground/src/components/node_selector/TfManualNodeSelector.vue
@@ -52,11 +52,11 @@
 </template>
 
 <script lang="ts">
-import type { NodeInfo } from "@threefold/grid_client";
+import type { Features, FilterOptions, NodeInfo } from "@threefold/grid_client";
 import { type Farm, type NodeStats, NodeStatus } from "@threefold/gridproxy_client";
 import type AwaitLock from "await-lock";
 import isInt from "validator/lib/isInt";
-import { onUnmounted, type PropType, ref, watch } from "vue";
+import { computed, onUnmounted, type PropType, ref, watch } from "vue";
 
 import { gridProxyClient } from "../../clients";
 import { useAsync, useWatchDeep } from "../../hooks";
@@ -64,7 +64,13 @@ import { ValidatorStatus } from "../../hooks/form_validator";
 import { useGrid } from "../../stores";
 import type { SelectedMachine, SelectionDetailsFilters } from "../../types/nodeSelector";
 import { normalizeError } from "../../utils/helpers";
-import { checkNodeCapacityPool, release, resolveAsync, validateRentContract } from "../../utils/nodeSelector";
+import {
+  checkNodeCapacityPool,
+  normalizeNodeFilters,
+  release,
+  resolveAsync,
+  validateRentContract,
+} from "../../utils/nodeSelector";
 import TfNodeDetailsCard from "./TfNodeDetailsCard.vue";
 
 const _defaultError =
@@ -99,11 +105,15 @@ export default {
 
     // reset node to mark form as invalid
     const placeholderNode = ref<NodeInfo>();
+    const filters = computed(() => normalizeNodeFilters(props.filters));
 
     watch(nodeId, () => {
       bindModelValue();
       placeholderNode.value = undefined;
     });
+    function getFeatures(gridStore: ReturnType<typeof useGrid>, filters: FilterOptions) {
+      return gridStore.client.capacity.getFeaturesFromFilters(filters);
+    }
 
     const validationTask = useAsync<true | string, string, [id: number | undefined]>(
       async nodeId => {
@@ -125,7 +135,8 @@ export default {
         }
 
         placeholderNode.value = node;
-
+        const features = getFeatures(gridStore, filters.value);
+        const missingFeatures = features.filter(value => !node.features.includes(value as Features));
         if (node === undefined || node === null) {
           throw `Node ${nodeId} is not on the grid`;
         }
@@ -165,6 +176,8 @@ export default {
 
           case props.filters.ipv4 && farms[0].publicIps.every(p => p.contract_id !== 0):
             throw `Node ${nodeId} is not assigned to a PublicIP`;
+          case missingFeatures.length > 0:
+            throw `Node ${nodeId} doesn't support [ ${missingFeatures} ] features`;
         }
 
         const args = [nodeId, "proxy", gridStore.client.config.proxyURL] as const;
diff --git a/packages/playground/src/types/nodeSelector.ts b/packages/playground/src/types/nodeSelector.ts
index a349e869df..a283db7d53 100644
--- a/packages/playground/src/types/nodeSelector.ts
+++ b/packages/playground/src/types/nodeSelector.ts
@@ -23,6 +23,9 @@ export interface SelectionDetailsFilters {
   certified?: boolean;
   dedicated?: boolean;
   exclusiveFor?: string;
+  planetary?: boolean;
+  mycelium?: boolean;
+  wireguard?: boolean;
 }
 
 export interface NumericValidator {
diff --git a/packages/playground/src/utils/deploy_vm.ts b/packages/playground/src/utils/deploy_vm.ts
index 03ec474b25..96e8ea680e 100644
--- a/packages/playground/src/utils/deploy_vm.ts
+++ b/packages/playground/src/utils/deploy_vm.ts
@@ -156,6 +156,8 @@ export async function addMachine(grid: GridClient, options: AddMachineOptions) {
     availableFor: grid.twinId,
     hasGPU: options.hasGPU,
     rentedBy: options.hasGPU ? grid.twinId : undefined,
+    planetary: options.planetary,
+    mycelium: options.mycelium,
   };
 
   const machine = new AddMachineModel();
diff --git a/packages/playground/src/utils/nodeSelector.ts b/packages/playground/src/utils/nodeSelector.ts
index cb37068d2d..fdca06a6c6 100644
--- a/packages/playground/src/utils/nodeSelector.ts
+++ b/packages/playground/src/utils/nodeSelector.ts
@@ -184,12 +184,12 @@ export function normalizeNodeOptions(
 
 export function normalizeNodeFilters(
   filters: SelectionDetailsFilters,
-  options: NormalizeNodeFiltersOptions,
+  options?: NormalizeNodeFiltersOptions,
 ): FilterOptions {
   return {
-    page: Math.max(1, options.page),
-    size: options.size,
-    farmId: options.farm?.farmId,
+    page: Math.max(1, options?.page || 1),
+    size: options?.size,
+    farmId: options?.farm?.farmId,
     cru: filters.cpu,
     mru: filters.memory ? Math.round(filters.memory / 1024) : undefined,
     hru: (filters.hddDisks || []).reduce((t, d) => t + d, 0) || undefined,
@@ -201,13 +201,16 @@ export function normalizeNodeFilters(
     publicIPs: filters.ipv4 || undefined,
     hasIPv6: filters.ipv6 || undefined,
     hasGPU: filters.hasGPU || undefined,
-    rentedBy: filters.dedicated ? options.twinId : undefined,
+    rentedBy: filters.dedicated ? options?.twinId : undefined,
     certified: filters.certified || undefined,
-    availableFor: options.twinId,
-    region: options.location.region ? options.location.region : options.location.subregion,
-    country: options.location.country,
-    gateway: options.gateway,
+    availableFor: options?.twinId,
+    region: options?.location.region ? options?.location.region : options?.location.subregion,
+    country: options?.location.country,
+    gateway: options?.gateway,
     healthy: true,
+    planetary: filters.planetary,
+    mycelium: filters.mycelium,
+    wireguard: filters.wireguard,
   };
 }
 
diff --git a/packages/playground/src/views/minting_view.vue b/packages/playground/src/views/minting_view.vue
index 9d3d67abcd..a290fa2554 100644
--- a/packages/playground/src/views/minting_view.vue
+++ b/packages/playground/src/views/minting_view.vue
@@ -6,20 +6,10 @@
     </v-card>
     <v-alert class="mb-4 text-subtitle-2 font-weight-regular" type="info" variant="tonal">
       For more information about minting check
-      <a
-        class="app-link font-weight-medium"
-        target="_blank"
-        :href="manual.minting_process"
-        >TFT minting process.
-      </a>
+      <a class="app-link font-weight-medium" target="_blank" :href="manual.minting_process">TFT minting process. </a>
       <br />
       The user can verify the 3Nodes' payments on Stellar Blockchain through the Threefold's
-      <a
-        class="app-link font-weight-medium"
-        target="_blank"
-        :href="manual.minting_reports"
-        >minting tool.
-      </a>
+      <a class="app-link font-weight-medium" target="_blank" :href="manual.minting_reports">minting tool. </a>
       <br />
       TFT minting address on Stellar Chain:
       <a
diff --git a/packages/playground/src/weblets/freeflow.vue b/packages/playground/src/weblets/freeflow.vue
index 439aef8214..0ec257698d 100644
--- a/packages/playground/src/weblets/freeflow.vue
+++ b/packages/playground/src/weblets/freeflow.vue
@@ -76,6 +76,9 @@
           memory: solution?.memory,
           rootFilesystemSize,
           ssdDisks: disks.map(d => d.size),
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/full_vm.vue b/packages/playground/src/weblets/full_vm.vue
index d43bd35264..dbf1601cf8 100644
--- a/packages/playground/src/weblets/full_vm.vue
+++ b/packages/playground/src/weblets/full_vm.vue
@@ -81,6 +81,9 @@
             solutionDisk: solution?.disk,
             memory: solution?.memory,
             rootFilesystemSize,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           v-model="selectionDetails"
         />
diff --git a/packages/playground/src/weblets/jenkins.vue b/packages/playground/src/weblets/jenkins.vue
index e9b3ba21d5..c6d72a8bfc 100644
--- a/packages/playground/src/weblets/jenkins.vue
+++ b/packages/playground/src/weblets/jenkins.vue
@@ -96,6 +96,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/micro_vm.vue b/packages/playground/src/weblets/micro_vm.vue
index c6ab865369..da3a581ec5 100644
--- a/packages/playground/src/weblets/micro_vm.vue
+++ b/packages/playground/src/weblets/micro_vm.vue
@@ -72,6 +72,9 @@
             ssdDisks: disks.map(disk => disk.size),
             memory: solution?.memory,
             rootFilesystemSize: solution?.disk,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           v-model="selectionDetails"
         />
diff --git a/packages/playground/src/weblets/tf_algorand.vue b/packages/playground/src/weblets/tf_algorand.vue
index 3603cca18a..73c15761d4 100644
--- a/packages/playground/src/weblets/tf_algorand.vue
+++ b/packages/playground/src/weblets/tf_algorand.vue
@@ -96,6 +96,9 @@
           solutionDisk: type === 'indexer' ? 50 : undefined,
           memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         v-model="selectionDetails"
       />
diff --git a/packages/playground/src/weblets/tf_casperlabs.vue b/packages/playground/src/weblets/tf_casperlabs.vue
index 9eab8f5558..eb84457051 100644
--- a/packages/playground/src/weblets/tf_casperlabs.vue
+++ b/packages/playground/src/weblets/tf_casperlabs.vue
@@ -64,6 +64,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_discourse.vue b/packages/playground/src/weblets/tf_discourse.vue
index 62dd0d42e9..352a318a86 100644
--- a/packages/playground/src/weblets/tf_discourse.vue
+++ b/packages/playground/src/weblets/tf_discourse.vue
@@ -86,6 +86,9 @@
             solutionDisk: solution?.disk,
             memory: solution?.memory,
             rootFilesystemSize,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           require-domain
           v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_funkwhale.vue b/packages/playground/src/weblets/tf_funkwhale.vue
index 7fdeea0122..372b5fab3e 100644
--- a/packages/playground/src/weblets/tf_funkwhale.vue
+++ b/packages/playground/src/weblets/tf_funkwhale.vue
@@ -116,6 +116,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_gitea.vue b/packages/playground/src/weblets/tf_gitea.vue
index 6726b3f10c..2b03f7c2a0 100644
--- a/packages/playground/src/weblets/tf_gitea.vue
+++ b/packages/playground/src/weblets/tf_gitea.vue
@@ -75,6 +75,9 @@
             solutionDisk: solution?.disk,
             memory: solution?.memory,
             rootFilesystemSize,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           v-model="selectionDetails"
           require-domain
diff --git a/packages/playground/src/weblets/tf_jitsi.vue b/packages/playground/src/weblets/tf_jitsi.vue
index 75045c4440..9780e8082b 100644
--- a/packages/playground/src/weblets/tf_jitsi.vue
+++ b/packages/playground/src/weblets/tf_jitsi.vue
@@ -65,6 +65,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_mattermost.vue b/packages/playground/src/weblets/tf_mattermost.vue
index d0aa7b487b..5582d17691 100644
--- a/packages/playground/src/weblets/tf_mattermost.vue
+++ b/packages/playground/src/weblets/tf_mattermost.vue
@@ -70,6 +70,9 @@
             solutionDisk: solution?.disk,
             memory: solution?.memory,
             rootFilesystemSize,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           require-domain
           v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_nextcloud.vue b/packages/playground/src/weblets/tf_nextcloud.vue
index 8c45d1a657..890877e566 100644
--- a/packages/playground/src/weblets/tf_nextcloud.vue
+++ b/packages/playground/src/weblets/tf_nextcloud.vue
@@ -63,6 +63,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_node_pilot.vue b/packages/playground/src/weblets/tf_node_pilot.vue
index cbab1cadcf..16a23c6f81 100644
--- a/packages/playground/src/weblets/tf_node_pilot.vue
+++ b/packages/playground/src/weblets/tf_node_pilot.vue
@@ -63,6 +63,9 @@
           memory: solution?.memory,
           solutionDisk: solution?.disk,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         v-model="selectionDetails"
         require-domain
diff --git a/packages/playground/src/weblets/tf_nostr.vue b/packages/playground/src/weblets/tf_nostr.vue
index 46fb82946c..62f2a98c2c 100644
--- a/packages/playground/src/weblets/tf_nostr.vue
+++ b/packages/playground/src/weblets/tf_nostr.vue
@@ -66,6 +66,9 @@
             solutionDisk: solution?.disk,
             memory: solution?.memory,
             rootFilesystemSize,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           v-model="selectionDetails"
           require-domain
diff --git a/packages/playground/src/weblets/tf_owncloud.vue b/packages/playground/src/weblets/tf_owncloud.vue
index 104d034acd..b6614d4c33 100644
--- a/packages/playground/src/weblets/tf_owncloud.vue
+++ b/packages/playground/src/weblets/tf_owncloud.vue
@@ -106,6 +106,9 @@
             solutionDisk: solution?.disk,
             memory: solution?.memory,
             rootFilesystemSize,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           require-domain
           v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_peertube.vue b/packages/playground/src/weblets/tf_peertube.vue
index b4798c40ab..b8d6d17e13 100644
--- a/packages/playground/src/weblets/tf_peertube.vue
+++ b/packages/playground/src/weblets/tf_peertube.vue
@@ -90,6 +90,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_presearch.vue b/packages/playground/src/weblets/tf_presearch.vue
index 61226feac8..1f57f11d88 100644
--- a/packages/playground/src/weblets/tf_presearch.vue
+++ b/packages/playground/src/weblets/tf_presearch.vue
@@ -83,6 +83,9 @@
             memory,
             rootFilesystemSize,
             exclusiveFor: 'research',
+            planetary,
+            mycelium,
+            wireguard,
           }"
           v-model="selectionDetails"
         />
diff --git a/packages/playground/src/weblets/tf_staticwebsite.vue b/packages/playground/src/weblets/tf_staticwebsite.vue
index c71bb70548..7317b04f83 100644
--- a/packages/playground/src/weblets/tf_staticwebsite.vue
+++ b/packages/playground/src/weblets/tf_staticwebsite.vue
@@ -89,6 +89,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_subsquid.vue b/packages/playground/src/weblets/tf_subsquid.vue
index e370a08880..58c592349e 100644
--- a/packages/playground/src/weblets/tf_subsquid.vue
+++ b/packages/playground/src/weblets/tf_subsquid.vue
@@ -78,6 +78,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_taiga.vue b/packages/playground/src/weblets/tf_taiga.vue
index b2d352a4f1..34880530f1 100644
--- a/packages/playground/src/weblets/tf_taiga.vue
+++ b/packages/playground/src/weblets/tf_taiga.vue
@@ -119,6 +119,9 @@
             solutionDisk: solution?.disk,
             memory: solution?.memory,
             rootFilesystemSize,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           require-domain
           v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tf_umbrel.vue b/packages/playground/src/weblets/tf_umbrel.vue
index b1c24e5926..8eabc7d4e5 100644
--- a/packages/playground/src/weblets/tf_umbrel.vue
+++ b/packages/playground/src/weblets/tf_umbrel.vue
@@ -104,6 +104,9 @@
           ssdDisks: [10],
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         v-model="selectionDetails"
       />
diff --git a/packages/playground/src/weblets/tf_wordpress.vue b/packages/playground/src/weblets/tf_wordpress.vue
index 2bc13ad3c5..fe7d137880 100644
--- a/packages/playground/src/weblets/tf_wordpress.vue
+++ b/packages/playground/src/weblets/tf_wordpress.vue
@@ -117,6 +117,9 @@
           solutionDisk: solution?.disk,
           memory: solution?.memory,
           rootFilesystemSize,
+          planetary,
+          mycelium,
+          wireguard,
         }"
         require-domain
         v-model="selectionDetails"
diff --git a/packages/playground/src/weblets/tfrobot.vue b/packages/playground/src/weblets/tfrobot.vue
index 2daedf6101..c2e0acbe7b 100644
--- a/packages/playground/src/weblets/tfrobot.vue
+++ b/packages/playground/src/weblets/tfrobot.vue
@@ -72,6 +72,9 @@
             solutionDisk: solution?.disk,
             memory: solution?.memory,
             rootFilesystemSize,
+            planetary,
+            mycelium,
+            wireguard,
           }"
           v-model="selectionDetails"
         />