diff --git a/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json b/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json
index 248d1ca2e6628183e8133f0959d64c6fb366f898..2da8675e1237cffc2e6e4024181eb7f35932e34e 100644
--- a/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json
+++ b/data/grid5000/sites/lyon/clusters/sirius/nodes/sirius-1.json
@@ -98,6 +98,9 @@
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.36.00.04",
       "vendor": "Nvidia"
+    },
+    "nvidia[0-7]": {
+      "nvswitch": true
     }
   },
   "kavlan": {
diff --git a/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json b/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
index 9cc3cdfdefe6812b38b28be60c99f7fd93d15d6a..682e4cc524124e9d3298530a2f353b0e22898bac 100644
--- a/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
+++ b/data/grid5000/sites/nancy/clusters/grat/nodes/grat-1.json
@@ -25,6 +25,7 @@
       "device": "/dev/nvidia0",
       "memory": 42505076736,
       "model": "A100-SXM4-40GB",
+      "nvswitch": true,
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.45.00.03",
       "vendor": "Nvidia"
@@ -35,6 +36,7 @@
       "device": "/dev/nvidia1",
       "memory": 42505076736,
       "model": "A100-SXM4-40GB",
+      "nvswitch": true,
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.45.00.03",
       "vendor": "Nvidia"
@@ -45,6 +47,7 @@
       "device": "/dev/nvidia2",
       "memory": 42505076736,
       "model": "A100-SXM4-40GB",
+      "nvswitch": true,
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.45.00.03",
       "vendor": "Nvidia"
@@ -55,6 +58,7 @@
       "device": "/dev/nvidia3",
       "memory": 42505076736,
       "model": "A100-SXM4-40GB",
+      "nvswitch": true,
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.45.00.03",
       "vendor": "Nvidia"
@@ -65,6 +69,7 @@
       "device": "/dev/nvidia4",
       "memory": 42505076736,
       "model": "A100-SXM4-40GB",
+      "nvswitch": true,
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.45.00.03",
       "vendor": "Nvidia"
@@ -75,6 +80,7 @@
       "device": "/dev/nvidia5",
       "memory": 42505076736,
       "model": "A100-SXM4-40GB",
+      "nvswitch": true,
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.45.00.03",
       "vendor": "Nvidia"
@@ -85,6 +91,7 @@
       "device": "/dev/nvidia6",
       "memory": 42505076736,
       "model": "A100-SXM4-40GB",
+      "nvswitch": true,
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.45.00.03",
       "vendor": "Nvidia"
@@ -95,6 +102,7 @@
       "device": "/dev/nvidia7",
       "memory": 42505076736,
       "model": "A100-SXM4-40GB",
+      "nvswitch": true,
       "power_default_limit": "400.00 W",
       "vbios_version": "92.00.45.00.03",
       "vendor": "Nvidia"
diff --git a/input/grid5000/sites/lyon/clusters/sirius/sirius.yaml b/input/grid5000/sites/lyon/clusters/sirius/sirius.yaml
index 854cb87b0c13a477c531c8320ea44f3d4980e56e..c33ed79d401cccb02688d1519248043b7ce2ebaf 100644
--- a/input/grid5000/sites/lyon/clusters/sirius/sirius.yaml
+++ b/input/grid5000/sites/lyon/clusters/sirius/sirius.yaml
@@ -17,6 +17,9 @@ nodes:
       clock_speed: 2100000000
     software:
       standard-environment: debian11-x64-std
+    gpu_devices:
+      nvidia[0-7]:
+        nvswitch: true
     network_adapters:
       bmc:
         interface: Ethernet
@@ -53,4 +56,4 @@ nodes:
         id: disk5
       pci-0000:ca:00.0-nvme-1:
         interface: NVME
-        id: disk4
+        id: disk4
\ No newline at end of file
diff --git a/input/grid5000/sites/nancy/clusters/grat/grat.yaml b/input/grid5000/sites/nancy/clusters/grat/grat.yaml
index ce9fb95f087807f0b046badb06cbc715eed56f06..fd2fbce41ec349f8c525cb244fd4b8629051f594 100644
--- a/input/grid5000/sites/nancy/clusters/grat/grat.yaml
+++ b/input/grid5000/sites/nancy/clusters/grat/grat.yaml
@@ -17,6 +17,9 @@ nodes:
       clock_speed: 2100000000
     software:
       standard-environment: debian11-x64-std
+    gpu_devices:
+      nvidia[0-7]:
+        nvswitch: true
     management_tools:
       bmc_vendor_tool: ipmitool
     network_adapters:
diff --git a/lib/refrepo/valid/input/schemas/schema-global.yaml b/lib/refrepo/valid/input/schemas/schema-global.yaml
index b3816ed5289008972afe2bc19a217b89c5b35d61..075883fba49c2704e44e75adcb20a7104895f16c 100644
--- a/lib/refrepo/valid/input/schemas/schema-global.yaml
+++ b/lib/refrepo/valid/input/schemas/schema-global.yaml
@@ -7,4 +7,4 @@ ipv4: required_hash
 ipv6: required_hash
 software: required_hash
 disk_vendor_model_mapping: required_hash
-management_tools: required_hash
+management_tools: required_hash
\ No newline at end of file