diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
index 18f1a48946e02d71a7e6b2e1030175dec1644354..19b339a6b323491c5f39c94f3d1748fe221ab996 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
@@ -220,6 +220,26 @@
       "size": 1999844147200,
       "storage": "HDD",
       "vendor": "DELL"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb3",
+      "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
+      "device": "nvme0n1",
+      "driver": "nvme",
+      "interface": "NVME",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816,
+      "storage": "SSD"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bad",
+      "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1",
+      "device": "nvme1n1",
+      "driver": "nvme",
+      "interface": "NVME",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816,
+      "storage": "SSD"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
index 600e8b6996abc69cee703893b5938d4c75845b21..dea69ee94da8d288d27aaf37c04588a3a9b22d33 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
@@ -220,6 +220,26 @@
       "size": 1999844147200,
       "storage": "HDD",
       "vendor": "DELL"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389571001020",
+      "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
+      "device": "nvme0n1",
+      "driver": "nvme",
+      "interface": "NVME",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816,
+      "storage": "SSD"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000baf",
+      "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1",
+      "device": "nvme1n1",
+      "driver": "nvme",
+      "interface": "NVME",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816,
+      "storage": "SSD"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
index 77883e27a1a6bb4d90413a0cca6fea2ba12cc712..ece6812e57e11aea2bce52b7037b42d5646201ec 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
@@ -220,6 +220,26 @@
       "size": 1999844147200,
       "storage": "HDD",
       "vendor": "DELL"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.002538957100101f",
+      "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
+      "device": "nvme0n1",
+      "driver": "nvme",
+      "interface": "NVME",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816,
+      "storage": "SSD"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb6",
+      "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1",
+      "device": "nvme1n1",
+      "driver": "nvme",
+      "interface": "NVME",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816,
+      "storage": "SSD"
     }
   ],
   "supported_job_types": {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
index 53fe7cc7adc90cf2d5df3ebca151f7a20785bbb3..c1a59432cbbcab7183f250697580d9789852a0a3 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
@@ -220,6 +220,26 @@
       "size": 1999844147200,
       "storage": "HDD",
       "vendor": "DELL"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.0025389671000bb5",
+      "by_path": "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1",
+      "device": "nvme0n1",
+      "driver": "nvme",
+      "interface": "NVME",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816,
+      "storage": "SSD"
+    },
+    {
+      "by_id": "/dev/disk/by-id/nvme-eui.002538957100101b",
+      "by_path": "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1",
+      "device": "nvme1n1",
+      "driver": "nvme",
+      "interface": "NVME",
+      "model": "Dell Express Flash NVMe PM1725 1.6TB AIC",
+      "size": 1600321314816,
+      "storage": "SSD"
     }
   ],
   "supported_job_types": {
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index 7b54c1401f87519f9867fd82a945299166f89342..05395f5efd535b62844e529e820b149fa290cfe8 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -90,6 +90,18 @@ yeti-1:
     vendor: Intel
     version: Gold 6130
   storage_devices:
+    nvme0n1:
+      device: nvme0n1
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb3"
+      by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
+    nvme1n1:
+      device: nvme1n1
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000bad"
+      by_path: "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
     sda:
       by_id: "/dev/disk/by-id/wwn-0x6d09466030a09c00223ab220cfc3b8e0"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index 3955fb65316ae06221bc31001b9291167d4f93c7..e4ba4d147d6c37b5a833b4ab464754561950f4ec 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -90,6 +90,18 @@ yeti-2:
     vendor: Intel
     version: Gold 6130
   storage_devices:
+    nvme0n1:
+      device: nvme0n1
+      by_id: "/dev/disk/by-id/nvme-eui.0025389571001020"
+      by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
+    nvme1n1:
+      device: nvme1n1
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000baf"
+      by_path: "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
     sda:
       by_id: "/dev/disk/by-id/wwn-0x6d09466030bbc600223ab55ace7a0389"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index a87c884c5353f0b888ba41114559175303c70cfe..a34dff8acd0fb2335ebadfe655d032d8efa5ea28 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -90,6 +90,18 @@ yeti-3:
     vendor: Intel
     version: Gold 6130
   storage_devices:
+    nvme0n1:
+      device: nvme0n1
+      by_id: "/dev/disk/by-id/nvme-eui.002538957100101f"
+      by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
+    nvme1n1:
+      device: nvme1n1
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb6"
+      by_path: "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
     sda:
       by_id: "/dev/disk/by-id/wwn-0x6d09466030a3cb00223b92d7caa2ee25"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index edbbd72d98e19eb4ad645e63bc6eb5f06f114dca..f54ff274a505bc199d690c3e30e63d5b11b9e4b7 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -90,6 +90,18 @@ yeti-4:
     vendor: Intel
     version: Gold 6130
   storage_devices:
+    nvme0n1:
+      device: nvme0n1
+      by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb5"
+      by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
+    nvme1n1:
+      device: nvme1n1
+      by_id: "/dev/disk/by-id/nvme-eui.002538957100101b"
+      by_path: "/dev/disk/by-path/pci-0000:6e:00.0-nvme-1"
+      model: Dell Express Flash NVMe PM1725 1.6TB AIC
+      size: 1600321314816
     sda:
       by_id: "/dev/disk/by-id/wwn-0x6d09466030bbb700223ab55ccfde5c8a"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:2:0:0"
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
index a9511655c3bb1c109f2e7fa55da1f9dc261b257f..ebe02c4e9febb4f22a021a5774480b22561bc99f 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/yeti.yaml
@@ -49,6 +49,14 @@ nodes:
         mountable: true
         mounted: true
     storage_devices:
+      nvme0n1:
+        interface: NVME
+        driver: nvme
+        storage: SSD
+      nvme1n1:
+        interface: NVME
+        driver: nvme
+        storage: SSD
       sda:
         interface: SAS
         driver: megaraid_sas