diff --git a/rust/agama-lib/share/examples/autoyast.json b/rust/agama-lib/share/examples/autoyast.json
new file mode 100644
index 0000000000..4eb5099b8f
--- /dev/null
+++ b/rust/agama-lib/share/examples/autoyast.json
@@ -0,0 +1,8 @@
+{
+  "legacyAutoyastStorage": [
+    {
+      "device": "/dev/vdc",
+      "use": "all"
+    }
+  ]
+}
diff --git a/rust/agama-lib/share/examples/storage-guided.json b/rust/agama-lib/share/examples/storage-guided.json
new file mode 100644
index 0000000000..573aed64d2
--- /dev/null
+++ b/rust/agama-lib/share/examples/storage-guided.json
@@ -0,0 +1,63 @@
+{
+  "storage": {
+    "guided": {
+      "target": {
+        "disk": "/dev/vdc"
+      },
+      "boot": {
+        "configure": true,
+        "device": "/dev/vda"
+      },
+      "encryption": {
+        "password": "notsecret",
+        "method": "luks2",
+        "pbkdFunction": "argon2i"
+      },
+      "space": {
+        "policy": "custom",
+        "actions": [
+          { "resize": "/dev/vda" },
+          { "forceDelete": "/dev/vdb1" }
+        ]
+      },
+      "volumes": [
+        {
+          "mount": {
+            "path": "/",
+            "options": ["ro"]
+          },
+          "filesystem": {
+            "btrfs": {
+              "snapshots": true
+            }
+          },
+          "size": [1024, "5 Gib"],
+          "target": "default"
+        },
+        {
+          "mount": {
+            "path": "/home"
+          },
+          "filesystem": "xfs",
+          "size": {
+            "min": "5 GiB",
+            "max": "20 GiB"
+          },
+          "target": {
+            "newVg": "/dev/vda"
+          }
+        },
+        {
+          "mount": {
+            "path": "swap"
+          },
+          "filesystem": "swap",
+          "size": "8 GiB",
+          "target": {
+            "newPartition": "/dev/vda"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/rust/agama-lib/share/examples/storage.json b/rust/agama-lib/share/examples/storage.json
index 573aed64d2..e71e5ba445 100644
--- a/rust/agama-lib/share/examples/storage.json
+++ b/rust/agama-lib/share/examples/storage.json
@@ -1,63 +1,71 @@
 {
   "storage": {
-    "guided": {
-      "target": {
-        "disk": "/dev/vdc"
-      },
-      "boot": {
-        "configure": true,
-        "device": "/dev/vda"
-      },
-      "encryption": {
-        "password": "notsecret",
-        "method": "luks2",
-        "pbkdFunction": "argon2i"
-      },
-      "space": {
-        "policy": "custom",
-        "actions": [
-          { "resize": "/dev/vda" },
-          { "forceDelete": "/dev/vdb1" }
-        ]
-      },
-      "volumes": [
-        {
-          "mount": {
-            "path": "/",
-            "options": ["ro"]
-          },
-          "filesystem": {
-            "btrfs": {
-              "snapshots": true
-            }
-          },
-          "size": [1024, "5 Gib"],
-          "target": "default"
+    "boot": {
+      "configure": true,
+      "device": "/dev/vda"
+    },
+    "drives": [
+      {
+        "search": {
+          "name": "/dev/vda"
         },
-        {
-          "mount": {
-            "path": "/home"
+        "ptableType": "gpt",
+        "partitions": [
+          {
+            "search": { "name": "/dev/vda2" },
+            "format": {
+              "filesystem": {
+                "btrfs": {
+                  "snapshots": true
+                }
+              }
+            },
+            "mount": {
+              "path": "/",
+              "options": ["ro"]
+            }
           },
-          "filesystem": "xfs",
-          "size": {
-            "min": "5 GiB",
-            "max": "20 GiB"
+          {
+            "encrypt": {
+              "password": "notsecret",
+              "method": "luks2"
+            },
+            "format": {
+              "filesystem": "xfs"
+            },
+            "mount": {
+              "path": "/home"
+            }
           },
-          "target": {
-            "newVg": "/dev/vda"
+          {
+            "encrypt": {
+              "password": "notsecret",
+              "method": "luks2"
+            },
+            "format": {
+              "filesystem": "swap"
+            },
+            "mount": {
+              "path": "swap"
+            }
           }
+        ]
+      },
+      {
+        "search": {
+          "name": "/dev/vdb"
         },
-        {
-          "mount": {
-            "path": "swap"
-          },
-          "filesystem": "swap",
-          "size": "8 GiB",
-          "target": {
-            "newPartition": "/dev/vda"
-          }
+        "encrypt": {
+          "password": "notsecret",
+          "method": "luks2"
+        },
+        "format": {
+          "filesystem": "ext4"
+        },
+        "mount": {
+          "path": "/var/log"
         }
-      ]
-    }
+      }
+    ]
   }
-}
+}
\ No newline at end of file