diff --git a/examples/snaps/v2-systems-enhanced-secureboot-desktop.json b/examples/snaps/v2-systems-enhanced-secureboot-desktop.json
index 433d230f..34414898 100644
--- a/examples/snaps/v2-systems-enhanced-secureboot-desktop.json
+++ b/examples/snaps/v2-systems-enhanced-secureboot-desktop.json
@@ -3,55 +3,100 @@
   "status-code": 200,
   "status": "OK",
   "result": {
-    "label": "prefer-encrypted",
+    "label": "enhanced-secureboot-desktop",
     "model": {
       "architecture": "amd64",
-      "authority-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
+      "authority-id": "canonical",
       "base": "core22",
-      "brand-id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
+      "brand-id": "canonical",
       "classic": "true",
       "distribution": "ubuntu",
-      "grade": "dangerous",
-      "model": "mwhudson-22-classic-dangerous",
-      "serial-authority": [
-        "generic"
-      ],
+      "grade": "signed",
+      "model": "ubuntu-classic-2304-amd64",
       "series": "16",
-      "sign-key-sha3-384": "AWEzKBCuROAYkR0dQfdgI95Ih9sWqwxpU1yezWkKT3EUX6LgNNgXFWSNUxC1S2_v",
+      "sign-key-sha3-384": "9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn",
       "snaps": [
         {
-          "default-channel": "22/edge",
+          "default-channel": "classic-23.04/stable",
           "id": "UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH",
           "name": "pc",
           "type": "gadget"
         },
         {
-          "default-channel": "22/edge",
+          "default-channel": "24-hwe/stable",
           "id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
           "name": "pc-kernel",
           "type": "kernel"
         },
         {
-          "default-channel": "latest/edge",
+          "default-channel": "latest/stable",
           "id": "amcUKQILKXHHTlmSa7NMdnXSx02dNeeT",
           "name": "core22",
           "type": "base"
         },
         {
-          "default-channel": "latest/edge",
+          "default-channel": "latest/stable",
           "id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
           "name": "snapd",
           "type": "snapd"
+        },
+        {
+          "default-channel": "latest/stable",
+          "id": "DLqre5XGLbDqg9jPtiAhRRjDuPVa5X1q",
+          "name": "core20",
+          "type": "base"
+        },
+        {
+          "default-channel": "latest/stable",
+          "id": "EISPgh06mRh1vordZY9OZ34QHdd7OrdR",
+          "name": "bare",
+          "type": "base"
+        },
+        {
+          "default-channel": "latest/stable",
+          "id": "3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk",
+          "name": "firefox",
+          "type": "app"
+        },
+        {
+          "default-channel": "latest/stable",
+          "id": "rw36mkAjdIKl13dzfwyxP87cejpyIcct",
+          "name": "gnome-3-38-2004",
+          "type": "app"
+        },
+        {
+          "default-channel": "latest/stable",
+          "id": "lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3",
+          "name": "gnome-42-2204",
+          "type": "app"
+        },
+        {
+          "default-channel": "latest/stable",
+          "id": "jZLfBRzf1cYlYysIjD2bwSzNtngY0qit",
+          "name": "gtk-common-themes",
+          "type": "app"
+        },
+        {
+          "default-channel": "latest/stable",
+          "id": "gjf3IPXoRiipCu9K0kVu52f0H56fIksg",
+          "name": "snap-store",
+          "type": "app"
+        },
+        {
+          "default-channel": "latest/stable",
+          "id": "IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu",
+          "name": "snapd-desktop-integration",
+          "type": "app"
         }
       ],
-      "timestamp": "2022-10-07T02:25:51+00:00",
+      "timestamp": "2023-03-19T12:00:00.0Z",
       "type": "model"
     },
     "brand": {
-      "id": "9XoOBkC2zdzx5CVZdl0ZVYuLpCo15ww0",
-      "username": "mwhudson",
-      "display-name": "Michael Hudson-Doyle",
-      "validation": "unproven"
+      "id": "canonical",
+      "username": "canonical",
+      "display-name": "Canonical",
+      "validation": "verified"
     },
     "actions": [
       {
@@ -66,68 +111,13 @@
         "id": "",
         "structure": [
           {
-            "name": "mbr",
-            "filesystem-label": "",
-            "offset": null,
-            "offset-write": null,
-            "size": 440,
-            "type": "mbr",
-            "role": "mbr",
-            "id": "",
-            "filesystem": "",
-            "content": [
-              {
-                "source": "",
-                "target": "",
-                "image": "pc-boot.img",
-                "offset": null,
-                "offset-write": null,
-                "size": 0,
-                "unpack": false
-              }
-            ],
-            "update": {
-              "edition": 1,
-              "preserve": null
-            }
-          },
-          {
-            "name": "BIOS Boot",
-            "filesystem-label": "",
-            "offset": 1048576,
-            "offset-write": {
-              "relative-to": "mbr",
-              "offset": 92
-            },
-            "size": 1048576,
-            "type": "DA,21686148-6449-6E6F-744E-656564454649",
-            "role": "",
-            "id": "",
-            "filesystem": "",
-            "content": [
-              {
-                "source": "",
-                "target": "",
-                "image": "pc-core.img",
-                "offset": null,
-                "offset-write": null,
-                "size": 0,
-                "unpack": false
-              }
-            ],
-            "update": {
-              "edition": 2,
-              "preserve": null
-            }
-          },
-          {
-            "name": "ubuntu-seed",
+            "name": "EFI System partition",
             "filesystem-label": "ubuntu-seed",
-            "offset": null,
+            "offset": 1048576,
             "offset-write": null,
-            "size": 1258291200,
-            "type": "EF,C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
-            "role": "system-seed",
+            "size": 786432000,
+            "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
+            "role": "system-seed-null",
             "id": "",
             "filesystem": "vfat",
             "content": [
@@ -158,10 +148,10 @@
           {
             "name": "ubuntu-boot",
             "filesystem-label": "ubuntu-boot",
-            "offset": null,
+            "offset": 14930673664,
             "offset-write": null,
             "size": 786432000,
-            "type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+            "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
             "role": "system-boot",
             "id": "",
             "filesystem": "ext4",
@@ -193,10 +183,10 @@
           {
             "name": "ubuntu-save",
             "filesystem-label": "ubuntu-save",
-            "offset": null,
+            "offset": 15717105664,
             "offset-write": null,
             "size": 33554432,
-            "type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+            "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
             "role": "system-save",
             "id": "",
             "filesystem": "ext4",
@@ -209,10 +199,10 @@
           {
             "name": "ubuntu-data",
             "filesystem-label": "ubuntu-data",
-            "offset": null,
+            "offset": 15750660096,
             "offset-write": null,
-            "size": 1073741824,
-            "type": "83,0FC63DAF-8483-4772-8E79-3D69D8477DE4",
+            "size": 4294967296,
+            "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
             "role": "system-data",
             "id": "",
             "filesystem": "ext4",