diff --git a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-host.platform-1.json b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-host.platform-1.json
index 061899e316a..27eda6c704c 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-host.platform-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-host.platform-1.json
@@ -38,23 +38,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "0c4296f215a4": {
       "name": "settings.get#1",
       "ordinal": 8,
@@ -195,25 +178,6 @@
         "startedAt": 0
       }
     },
-    "1de50f3b4aac": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": {
-        "$rpc": "null"
-      },
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "1ff13ee8621c": {
       "name": "repoIconsByName",
       "ordinal": 4,
@@ -417,6 +381,11 @@
         }
       }
     },
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
     "53dea128b181": {
       "name": "host.platform#1",
       "ordinal": 9,
@@ -484,10 +453,10 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
+    "6063e534d9db": {
+      "name": "hostHealthById",
       "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+      "value": []
     },
     "6134b73f18d0": {
       "repoColorsByName": [
@@ -618,11 +587,23 @@
         }
       }
     },
+    "9d20695fdb34": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": {
+        "$rpc": "null"
+      }
+    },
     "b428bce85ee7": {
       "name": "settings.get#1",
       "ordinal": 11,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -697,12 +678,25 @@
         }
       }
     },
-    "e9480602a4c6": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": {
+    "e841f87c65aa": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": {
         "$rpc": "null"
-      }
+      },
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -712,10 +706,23 @@
         "$rpc": "undefined"
       }
     },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     }
   },
   "recording": {
@@ -749,8 +756,9 @@
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -763,14 +771,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -783,14 +792,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -803,14 +813,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -823,14 +834,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -843,14 +855,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -863,14 +876,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -883,14 +897,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -903,14 +918,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -923,14 +939,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -943,14 +960,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -963,14 +981,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-repo.list-1.json
index 4256c025d06..bd38ed25958 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-repo.list-1.json
@@ -38,23 +38,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "0c4296f215a4": {
       "name": "settings.get#1",
       "ordinal": 8,
@@ -327,10 +310,15 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
+    "6063e534d9db": {
+      "name": "hostHealthById",
       "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+      "value": []
     },
     "6134b73f18d0": {
       "repoColorsByName": [
@@ -504,6 +492,11 @@
       "ordinal": 11,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -655,10 +648,23 @@
         }
       }
     },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     }
   },
   "recording": {
@@ -686,14 +692,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-settings.get-1.json b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-settings.get-1.json
index 4052935a5e6..423f3062147 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-settings.get-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-settings.get-1.json
@@ -38,23 +38,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "0c4296f215a4": {
       "name": "settings.get#1",
       "ordinal": 8,
@@ -295,6 +278,11 @@
         }
       }
     },
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
     "53dea128b181": {
       "name": "host.platform#1",
       "ordinal": 9,
@@ -327,10 +315,10 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
+    "6063e534d9db": {
+      "name": "hostHealthById",
       "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+      "value": []
     },
     "6134b73f18d0": {
       "repoColorsByName": [
@@ -496,6 +484,13 @@
         "startedAt": 0
       }
     },
+    "9d20695fdb34": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": {
+        "$rpc": "null"
+      }
+    },
     "ae308dad876a": {
       "name": "settings.get#1",
       "ordinal": 8,
@@ -567,6 +562,11 @@
         }
       }
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -710,13 +710,6 @@
         }
       }
     },
-    "e9480602a4c6": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": {
-        "$rpc": "null"
-      }
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -725,10 +718,23 @@
         "$rpc": "undefined"
       }
     },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     }
   },
   "recording": {
@@ -762,8 +768,9 @@
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -776,14 +783,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -796,14 +804,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -816,14 +825,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -836,14 +846,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -856,14 +867,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -876,14 +888,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -896,14 +909,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -916,14 +930,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -936,14 +951,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -956,14 +972,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -976,14 +993,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-ssh.listtargetsummaries-1.json b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-ssh.listtargetsummaries-1.json
index 8ba0eb0ce8d..eaf4e75fb05 100644
--- a/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-ssh.listtargetsummaries-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-settings.repo-metadata-ssh.listtargetsummaries-1.json
@@ -72,23 +72,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "08d05f42e4a2": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -427,13 +410,31 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
-      "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+    "523753167e39": {
+      "hostHealthById": [],
+      "hostLabelById": [],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     },
-    "5ffccd000213": {
-      "name": "hostLabelById",
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
+    "6063e534d9db": {
+      "name": "hostHealthById",
       "ordinal": 13,
       "value": []
     },
@@ -577,6 +578,11 @@
       "ordinal": 11,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -616,8 +622,22 @@
         }
       }
     },
-    "eb68427ac627": {
-      "hostLabelById": [],
+    "daecdc0e521b": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": []
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
       "hostPlatform": "linux",
       "repoColorsByName": [
         ["Local", "#6366f1"],
@@ -633,19 +653,6 @@
         ["Remote", "repo-2"]
       ]
     },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
-    },
     "fa2cb04c517b": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -707,14 +714,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -740,14 +748,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -773,14 +782,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -806,14 +816,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -839,14 +850,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -872,14 +884,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -905,14 +918,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -938,14 +952,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -971,14 +986,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -1004,14 +1020,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       },
@@ -1037,14 +1054,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "eb68427ac627",
+          "state": "523753167e39",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "5ffccd000213",
-            "f9193cae5824"
+            "6063e534d9db",
+            "daecdc0e521b",
+            "53226cb82ec3"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/schedules-settings-repo-metadata-fulfilled.json b/mobile/rpc-foundation/goldens/schedules-settings-repo-metadata-fulfilled.json
index f8d65fba25b..a81b7772b49 100644
--- a/mobile/rpc-foundation/goldens/schedules-settings-repo-metadata-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/schedules-settings-repo-metadata-fulfilled.json
@@ -75,23 +75,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "0c4296f215a4": {
       "name": "settings.get#1",
       "ordinal": 8,
@@ -163,25 +146,6 @@
         "startedAt": 0
       }
     },
-    "1de50f3b4aac": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": {
-        "$rpc": "null"
-      },
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "1ff13ee8621c": {
       "name": "repoIconsByName",
       "ordinal": 4,
@@ -279,6 +243,11 @@
         }
       }
     },
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
     "53dea128b181": {
       "name": "host.platform#1",
       "ordinal": 9,
@@ -311,11 +280,6 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
-      "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
-    },
     "5b781918b903": {
       "name": "host.platform#1",
       "ordinal": 9,
@@ -348,6 +312,11 @@
         }
       }
     },
+    "6063e534d9db": {
+      "name": "hostHealthById",
+      "ordinal": 13,
+      "value": []
+    },
     "6134b73f18d0": {
       "repoColorsByName": [
         ["Local", "#6366f1"],
@@ -515,11 +484,23 @@
         }
       }
     },
+    "9d20695fdb34": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": {
+        "$rpc": "null"
+      }
+    },
     "b428bce85ee7": {
       "name": "settings.get#1",
       "ordinal": 11,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -631,12 +612,25 @@
         }
       }
     },
-    "e9480602a4c6": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": {
+    "e841f87c65aa": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": {
         "$rpc": "null"
-      }
+      },
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     },
     "eb79a9b3682a": {
       "status": "fulfilled",
@@ -646,10 +640,23 @@
         "$rpc": "undefined"
       }
     },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     }
   },
   "recording": {
@@ -677,14 +684,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -710,14 +718,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -743,14 +752,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -776,14 +786,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -828,8 +839,9 @@
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -842,14 +854,15 @@
             "mount": "eb79a9b3682a",
             "load": "c7f150c7a054"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -863,14 +876,15 @@
             "load": "eb79a9b3682a",
             "disconnect": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       },
@@ -884,14 +898,15 @@
             "load": "eb79a9b3682a",
             "cutover": "eb79a9b3682a"
           },
-          "state": "1de50f3b4aac",
+          "state": "e841f87c65aa",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "e9480602a4c6"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "9d20695fdb34"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/settings-repo-cache-expiry.json b/mobile/rpc-foundation/goldens/settings-repo-cache-expiry.json
index e9edf4df1a8..57c042b30b8 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-cache-expiry.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-cache-expiry.json
@@ -4,32 +4,6 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "values": {
-    "00271b9f4a55": {
-      "name": "repo.list#2",
-      "ordinal": 15,
-      "args": [
-        {
-          "name": "method",
-          "value": "repo.list"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 60000
-      }
-    },
     "03c9a2ba60b9": {
       "name": "host.platform#1",
       "ordinal": 9,
@@ -64,23 +38,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "0c4296f215a4": {
       "name": "settings.get#1",
       "ordinal": 8,
@@ -157,6 +114,11 @@
       "ordinal": 4,
       "value": []
     },
+    "2053629911e7": {
+      "name": "repo.list#2",
+      "ordinal": 17,
+      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
+    },
     "2f1b95eac8f1": {
       "name": "repoColorsByName",
       "ordinal": 3,
@@ -217,10 +179,15 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
+    "6063e534d9db": {
+      "name": "hostHealthById",
       "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+      "value": []
     },
     "6134b73f18d0": {
       "repoColorsByName": [
@@ -297,6 +264,37 @@
       "status": "pending",
       "startedAt": 60000
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
+    "c402c05b8b96": {
+      "name": "repo.list#2",
+      "ordinal": 16,
+      "args": [
+        {
+          "name": "method",
+          "value": "repo.list"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 60000
+      }
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -336,11 +334,6 @@
         }
       }
     },
-    "de81371c7ac8": {
-      "name": "repo.list#2",
-      "ordinal": 16,
-      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
-    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -357,10 +350,23 @@
         "$rpc": "undefined"
       }
     },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     }
   },
   "recording": {
@@ -388,14 +394,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -409,14 +416,15 @@
             "load": "eb79a9b3682a",
             "cached-query": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -431,14 +439,15 @@
             "cached-query": "eb79a9b3682a",
             "warm-query": "f43afee17848"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -450,14 +459,14 @@
             "c752e67787f9",
             "0c4296f215a4",
             "03c9a2ba60b9",
-            "00271b9f4a55"
+            "c402c05b8b96"
           ],
           "payloads": [
             "19b2979d7fc2",
             "668a7e313975",
             "b428bce85ee7",
             "36a96ddbd396",
-            "de81371c7ac8"
+            "2053629911e7"
           ],
           "settlements": {
             "mount": "eb79a9b3682a",
@@ -466,14 +475,15 @@
             "warm-query": "f43afee17848",
             "expired-query": "ba8a19e3e2b1"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-fulfilled.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-fulfilled.json
index aabdbe23adb..e3be4ab006b 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-fulfilled.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-fulfilled.json
@@ -38,23 +38,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "0c4296f215a4": {
       "name": "settings.get#1",
       "ordinal": 8,
@@ -191,10 +174,15 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
+    "6063e534d9db": {
+      "name": "hostHealthById",
       "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+      "value": []
     },
     "6134b73f18d0": {
       "repoColorsByName": [
@@ -267,6 +255,11 @@
       "ordinal": 11,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -314,10 +307,23 @@
         "$rpc": "undefined"
       }
     },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     }
   },
   "recording": {
@@ -345,14 +351,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-icons.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-icons.json
index 48777a60761..dcd54acfef5 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-icons.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-icons.json
@@ -4,11 +4,6 @@
   "family": "settings.repo-metadata",
   "namedDeltas": [],
   "values": {
-    "12ba3f41d4db": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "darwin"
-    },
     "19b2979d7fc2": {
       "name": "repo.list#1",
       "ordinal": 2,
@@ -49,15 +44,20 @@
         "startedAt": 0
       }
     },
+    "25b44bca9e45": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "darwin"
+    },
     "36a96ddbd396": {
       "name": "host.platform#1",
       "ordinal": 12,
       "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"host.platform\"}"
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
+    "6063e534d9db": {
+      "name": "hostHealthById",
       "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+      "value": []
     },
     "6338d57f282f": {
       "repoColorsByName": [
@@ -293,46 +293,13 @@
       "ordinal": 11,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
-    "c752e67787f9": {
-      "name": "ssh.listTargetSummaries#1",
-      "ordinal": 7,
-      "args": [
-        {
-          "name": "method",
-          "value": "ssh.listTargetSummaries"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "targets": [
-              {
-                "id": "ssh-1",
-                "label": "SSH"
-              }
-            ]
-          }
-        }
-      }
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
     },
-    "e62b46a04ba1": {
+    "c020f709d835": {
+      "hostHealthById": [],
       "hostLabelById": [["ssh:ssh-1", "SSH"]],
       "hostPlatform": "darwin",
       "repoColorsByName": [
@@ -376,6 +343,45 @@
         ["Avatar", "repo-3"]
       ]
     },
+    "c752e67787f9": {
+      "name": "ssh.listTargetSummaries#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "ssh.listTargetSummaries"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "targets": [
+              {
+                "id": "ssh-1",
+                "label": "SSH"
+              }
+            ]
+          }
+        }
+      }
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -444,14 +450,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "e62b46a04ba1",
+          "state": "c020f709d835",
           "effects": [
             "19bf6d2469a6",
             "ae27a5b525fa",
             "77cbfd1f087c",
             "6bc5e5b7a259",
-            "56ab81cb67dc",
-            "12ba3f41d4db"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "25b44bca9e45"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-refuse-after-data.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-refuse-after-data.json
index a458cc7adeb..53182455b8d 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-refuse-after-data.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-refuse-after-data.json
@@ -38,23 +38,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "0c4296f215a4": {
       "name": "settings.get#1",
       "ordinal": 8,
@@ -95,6 +78,11 @@
         }
       }
     },
+    "0ef3d910f42e": {
+      "name": "hostLabelById",
+      "ordinal": 29,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "19b2979d7fc2": {
       "name": "repo.list#1",
       "ordinal": 2,
@@ -131,44 +119,10 @@
       "ordinal": 4,
       "value": []
     },
-    "2a201bc09f96": {
-      "name": "ssh.listTargetSummaries#2",
-      "ordinal": 21,
-      "args": [
-        {
-          "name": "method",
-          "value": "ssh.listTargetSummaries"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-6",
-          "ok": true,
-          "result": {
-            "targets": [
-              {
-                "id": "ssh-1",
-                "label": "SSH"
-              }
-            ]
-          }
-        }
-      }
+    "2053629911e7": {
+      "name": "repo.list#2",
+      "ordinal": 17,
+      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
     },
     "2f1b95eac8f1": {
       "name": "repoColorsByName",
@@ -178,27 +132,16 @@
         ["Remote", "#f97316"]
       ]
     },
-    "339b07cb7b7e": {
-      "name": "repoHostIdByRepoId",
-      "ordinal": 20,
-      "value": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ]
-    },
-    "35a231ef3ff8": {
-      "name": "repoIdsByName",
-      "ordinal": 19,
-      "value": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "36a96ddbd396": {
       "name": "host.platform#1",
       "ordinal": 12,
       "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"host.platform\"}"
     },
+    "376d3874239c": {
+      "name": "repoIconsByName",
+      "ordinal": 19,
+      "value": []
+    },
     "4526bff18b74": {
       "name": "repo.list#1",
       "ordinal": 1,
@@ -246,37 +189,9 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
-      "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
-    },
-    "5b7bcd015aba": {
-      "name": "repoColorsByName",
-      "ordinal": 17,
-      "value": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ]
-    },
-    "6134b73f18d0": {
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
-    "64986b5eb58e": {
+    "455855a85ab4": {
       "name": "settings.get#2",
-      "ordinal": 22,
+      "ordinal": 23,
       "args": [
         {
           "name": "method",
@@ -309,24 +224,240 @@
         }
       }
     },
-    "64aa5287977c": {
-      "name": "hostLabelById",
-      "ordinal": 27,
-      "value": [["ssh:ssh-1", "SSH"]]
+    "4771e3dbbbcf": {
+      "name": "host.platform#2",
+      "ordinal": 24,
+      "args": [
+        {
+          "name": "method",
+          "value": "host.platform"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-8",
+          "ok": true,
+          "result": {
+            "platform": "linux"
+          }
+        }
+      }
+    },
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
+    "6063e534d9db": {
+      "name": "hostHealthById",
+      "ordinal": 13,
+      "value": []
+    },
+    "6134b73f18d0": {
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     },
     "668a7e313975": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 10,
       "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.listTargetSummaries\"}"
     },
-    "673a2bbe62e3": {
-      "name": "hostPlatform",
+    "7e772c1c111d": {
+      "name": "repoIdsByName",
+      "ordinal": 5,
+      "value": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
+    },
+    "8c5c812580ad": {
+      "name": "host.platform#2",
+      "ordinal": 27,
+      "json": "{\"id\":\"frame-8\",\"deviceToken\":\"recording-device\",\"method\":\"host.platform\"}"
+    },
+    "8ef3b348c179": {
+      "name": "repoHostIdByRepoId",
+      "ordinal": 6,
+      "value": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ]
+    },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
+    "96e0c54d86b0": {
+      "name": "settings.get#1",
+      "ordinal": 8,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "a67416f78b93": {
+      "name": "hostHealthById",
       "ordinal": 28,
+      "value": []
+    },
+    "b428bce85ee7": {
+      "name": "settings.get#1",
+      "ordinal": 11,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
+    "c497d2d846c9": {
+      "name": "ssh.listTargetSummaries#2",
+      "ordinal": 25,
+      "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.listTargetSummaries\"}"
+    },
+    "c752e67787f9": {
+      "name": "ssh.listTargetSummaries#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "ssh.listTargetSummaries"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "targets": [
+              {
+                "id": "ssh-1",
+                "label": "SSH"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "ceef481be25c": {
+      "name": "hostPlatform",
+      "ordinal": 30,
       "value": "linux"
     },
-    "7d3ba1e92188": {
+    "d51254d2537f": {
+      "name": "settings.get#2",
+      "ordinal": 26,
+      "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "d569b5b2500f": {
+      "name": "ssh.listTargetSummaries#2",
+      "ordinal": 22,
+      "args": [
+        {
+          "name": "method",
+          "value": "ssh.listTargetSummaries"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-6",
+          "ok": true,
+          "result": {
+            "targets": [
+              {
+                "id": "ssh-1",
+                "label": "SSH"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "da7cf9752395": {
+      "name": "repoColorsByName",
+      "ordinal": 18,
+      "value": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ]
+    },
+    "df78d2202264": {
       "name": "repo.list#2",
-      "ordinal": 15,
+      "ordinal": 16,
       "args": [
         {
           "name": "method",
@@ -371,22 +502,51 @@
         }
       }
     },
-    "7e772c1c111d": {
+    "ea2ced0895f3": {
+      "name": "repoHostIdByRepoId",
+      "ordinal": 21,
+      "value": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ]
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "eb885d2ceee5": {
       "name": "repoIdsByName",
-      "ordinal": 5,
+      "ordinal": 20,
       "value": [
         ["Local", "repo-1"],
         ["Remote", "repo-2"]
       ]
     },
-    "8800889a5f18": {
-      "name": "host.platform#2",
-      "ordinal": 26,
-      "json": "{\"id\":\"frame-8\",\"deviceToken\":\"recording-device\",\"method\":\"host.platform\"}"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     },
-    "8dd3e3e2a847": {
+    "fa585aceeec2": {
       "name": "repo.list#2",
-      "ordinal": 15,
+      "ordinal": 16,
       "args": [
         {
           "name": "method",
@@ -409,155 +569,6 @@
         "status": "pending",
         "startedAt": 0
       }
-    },
-    "8ef3b348c179": {
-      "name": "repoHostIdByRepoId",
-      "ordinal": 6,
-      "value": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ]
-    },
-    "9270aeb7d9c6": {
-      "status": "pending",
-      "startedAt": 0
-    },
-    "96e0c54d86b0": {
-      "name": "settings.get#1",
-      "ordinal": 8,
-      "args": [
-        {
-          "name": "method",
-          "value": "settings.get"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
-    "983e55643949": {
-      "name": "settings.get#2",
-      "ordinal": 25,
-      "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
-    },
-    "b428bce85ee7": {
-      "name": "settings.get#1",
-      "ordinal": 11,
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
-    },
-    "be773224294b": {
-      "name": "repoIconsByName",
-      "ordinal": 18,
-      "value": []
-    },
-    "c752e67787f9": {
-      "name": "ssh.listTargetSummaries#1",
-      "ordinal": 7,
-      "args": [
-        {
-          "name": "method",
-          "value": "ssh.listTargetSummaries"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "targets": [
-              {
-                "id": "ssh-1",
-                "label": "SSH"
-              }
-            ]
-          }
-        }
-      }
-    },
-    "d1f0a64c0651": {
-      "name": "ssh.listTargetSummaries#2",
-      "ordinal": 24,
-      "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.listTargetSummaries\"}"
-    },
-    "de81371c7ac8": {
-      "name": "repo.list#2",
-      "ordinal": 16,
-      "json": "{\"id\":\"frame-5\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
-    },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
-    },
-    "fc50a8ac2e64": {
-      "name": "host.platform#2",
-      "ordinal": 23,
-      "args": [
-        {
-          "name": "method",
-          "value": "host.platform"
-        },
-        {
-          "name": "params",
-          "value": {
-            "$rpc": "absent"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-8",
-          "ok": true,
-          "result": {
-            "platform": "linux"
-          }
-        }
-      }
     }
   },
   "recording": {
@@ -585,14 +596,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -605,14 +617,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -624,28 +637,29 @@
             "c752e67787f9",
             "0c4296f215a4",
             "03c9a2ba60b9",
-            "8dd3e3e2a847"
+            "fa585aceeec2"
           ],
           "payloads": [
             "19b2979d7fc2",
             "668a7e313975",
             "b428bce85ee7",
             "36a96ddbd396",
-            "de81371c7ac8"
+            "2053629911e7"
           ],
           "settlements": {
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a",
             "reload": "9270aeb7d9c6"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       },
@@ -657,40 +671,42 @@
             "c752e67787f9",
             "0c4296f215a4",
             "03c9a2ba60b9",
-            "7d3ba1e92188",
-            "2a201bc09f96",
-            "64986b5eb58e",
-            "fc50a8ac2e64"
+            "df78d2202264",
+            "d569b5b2500f",
+            "455855a85ab4",
+            "4771e3dbbbcf"
           ],
           "payloads": [
             "19b2979d7fc2",
             "668a7e313975",
             "b428bce85ee7",
             "36a96ddbd396",
-            "de81371c7ac8",
-            "d1f0a64c0651",
-            "983e55643949",
-            "8800889a5f18"
+            "2053629911e7",
+            "c497d2d846c9",
+            "d51254d2537f",
+            "8c5c812580ad"
           ],
           "settlements": {
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a",
             "reload": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824",
-            "5b7bcd015aba",
-            "be773224294b",
-            "35a231ef3ff8",
-            "339b07cb7b7e",
-            "64aa5287977c",
-            "673a2bbe62e3"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3",
+            "da7cf9752395",
+            "376d3874239c",
+            "eb885d2ceee5",
+            "ea2ced0895f3",
+            "a67416f78b93",
+            "0ef3d910f42e",
+            "ceef481be25c"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-refused.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-refused.json
index 0e850d65689..17e304bc7bc 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-refused.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-refused.json
@@ -38,23 +38,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "19b2979d7fc2": {
       "name": "repo.list#1",
       "ordinal": 2,
@@ -186,10 +169,15 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
+    },
+    "6063e534d9db": {
+      "name": "hostHealthById",
       "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+      "value": []
     },
     "6134b73f18d0": {
       "repoColorsByName": [
@@ -262,6 +250,11 @@
       "ordinal": 11,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -309,10 +302,23 @@
         "$rpc": "undefined"
       }
     },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     }
   },
   "recording": {
@@ -340,14 +346,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-single-host.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-single-host.json
index f3d00fb95da..277522dfed5 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-single-host.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-single-host.json
@@ -9,6 +9,32 @@
       "ordinal": 2,
       "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"repo.list\"}"
     },
+    "1a160fc2d137": {
+      "name": "host.platform#1",
+      "ordinal": 9,
+      "args": [
+        {
+          "name": "method",
+          "value": "host.platform"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
     "1ff13ee8621c": {
       "name": "repoIconsByName",
       "ordinal": 4,
@@ -29,6 +55,11 @@
         ["Remote folder", "repo-2"]
       ]
     },
+    "36a96ddbd396": {
+      "name": "host.platform#1",
+      "ordinal": 12,
+      "json": "{\"id\":\"frame-4\",\"deviceToken\":\"recording-device\",\"method\":\"host.platform\"}"
+    },
     "4b6956e45bac": {
       "name": "repo.list#1",
       "ordinal": 1,
@@ -74,6 +105,110 @@
         }
       }
     },
+    "4bf1ed33de14": {
+      "name": "ssh.listTargetSummaries#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "ssh.listTargetSummaries"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "Connection closed",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "53dea128b181": {
+      "name": "host.platform#1",
+      "ordinal": 9,
+      "args": [
+        {
+          "name": "method",
+          "value": "host.platform"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "Connection closed",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "6063e534d9db": {
+      "name": "hostHealthById",
+      "ordinal": 13,
+      "value": []
+    },
+    "668a7e313975": {
+      "name": "ssh.listTargetSummaries#1",
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"ssh.listTargetSummaries\"}"
+    },
+    "6a227ad27189": {
+      "name": "ssh.listTargetSummaries#1",
+      "ordinal": 7,
+      "args": [
+        {
+          "name": "method",
+          "value": "ssh.listTargetSummaries"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "9270aeb7d9c6": {
+      "status": "pending",
+      "startedAt": 0
+    },
     "937107a86348": {
       "name": "repoIdsByName",
       "ordinal": 5,
@@ -82,6 +217,39 @@
         ["Remote folder", "repo-2"]
       ]
     },
+    "96e0c54d86b0": {
+      "name": "settings.get#1",
+      "ordinal": 8,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "9d20695fdb34": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": {
+        "$rpc": "null"
+      }
+    },
     "a086cfd03185": {
       "name": "repoHostIdByRepoId",
       "ordinal": 6,
@@ -90,6 +258,48 @@
         ["repo-2", "ssh:ssh-1"]
       ]
     },
+    "b428bce85ee7": {
+      "name": "settings.get#1",
+      "ordinal": 11,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
+    },
+    "daecdc0e521b": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": []
+    },
+    "dd3998116e8e": {
+      "name": "settings.get#1",
+      "ordinal": 8,
+      "args": [
+        {
+          "name": "method",
+          "value": "settings.get"
+        },
+        {
+          "name": "params",
+          "value": {
+            "$rpc": "absent"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "Connection closed",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
     "eb79a9b3682a": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -113,14 +323,35 @@
       {
         "id": "single-host-without-label-lookups",
         "observation": {
-          "sender": ["4b6956e45bac"],
-          "payloads": ["19b2979d7fc2"],
+          "sender": ["4b6956e45bac", "6a227ad27189", "96e0c54d86b0", "1a160fc2d137"],
+          "payloads": ["19b2979d7fc2", "668a7e313975", "b428bce85ee7", "36a96ddbd396"],
+          "settlements": {
+            "mount": "eb79a9b3682a",
+            "load": "9270aeb7d9c6"
+          },
+          "state": "2bd489a9fa29",
+          "effects": ["fc0785cc0b08", "1ff13ee8621c", "937107a86348", "a086cfd03185"]
+        }
+      },
+      {
+        "id": "cleanup",
+        "observation": {
+          "sender": ["4b6956e45bac", "4bf1ed33de14", "dd3998116e8e", "53dea128b181"],
+          "payloads": ["19b2979d7fc2", "668a7e313975", "b428bce85ee7", "36a96ddbd396"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
           "state": "2bd489a9fa29",
-          "effects": ["fc0785cc0b08", "1ff13ee8621c", "937107a86348", "a086cfd03185"]
+          "effects": [
+            "fc0785cc0b08",
+            "1ff13ee8621c",
+            "937107a86348",
+            "a086cfd03185",
+            "6063e534d9db",
+            "daecdc0e521b",
+            "9d20695fdb34"
+          ]
         }
       }
     ]
diff --git a/mobile/rpc-foundation/goldens/settings-repo-metadata-transport-error.json b/mobile/rpc-foundation/goldens/settings-repo-metadata-transport-error.json
index 3dec40ec45f..965d2f81320 100644
--- a/mobile/rpc-foundation/goldens/settings-repo-metadata-transport-error.json
+++ b/mobile/rpc-foundation/goldens/settings-repo-metadata-transport-error.json
@@ -38,23 +38,6 @@
         }
       }
     },
-    "071880b671a1": {
-      "hostLabelById": [["ssh:ssh-1", "SSH"]],
-      "hostPlatform": "linux",
-      "repoColorsByName": [
-        ["Local", "#6366f1"],
-        ["Remote", "#f97316"]
-      ],
-      "repoHostIdByRepoId": [
-        ["repo-1", "local"],
-        ["repo-2", "ssh:ssh-1"]
-      ],
-      "repoIconsByName": [],
-      "repoIdsByName": [
-        ["Local", "repo-1"],
-        ["Remote", "repo-2"]
-      ]
-    },
     "19b2979d7fc2": {
       "name": "repo.list#1",
       "ordinal": 2,
@@ -151,10 +134,10 @@
         }
       }
     },
-    "56ab81cb67dc": {
-      "name": "hostLabelById",
-      "ordinal": 13,
-      "value": [["ssh:ssh-1", "SSH"]]
+    "53226cb82ec3": {
+      "name": "hostPlatform",
+      "ordinal": 15,
+      "value": "linux"
     },
     "6021c58b2fd2": {
       "name": "settings.get#1",
@@ -188,6 +171,11 @@
         }
       }
     },
+    "6063e534d9db": {
+      "name": "hostHealthById",
+      "ordinal": 13,
+      "value": []
+    },
     "6134b73f18d0": {
       "repoColorsByName": [
         ["Local", "#6366f1"],
@@ -259,6 +247,11 @@
       "ordinal": 11,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"settings.get\"}"
     },
+    "bea13a4a2e87": {
+      "name": "hostLabelById",
+      "ordinal": 14,
+      "value": [["ssh:ssh-1", "SSH"]]
+    },
     "c752e67787f9": {
       "name": "ssh.listTargetSummaries#1",
       "ordinal": 7,
@@ -306,10 +299,23 @@
         "$rpc": "undefined"
       }
     },
-    "f9193cae5824": {
-      "name": "hostPlatform",
-      "ordinal": 14,
-      "value": "linux"
+    "f4667dda0187": {
+      "hostHealthById": [],
+      "hostLabelById": [["ssh:ssh-1", "SSH"]],
+      "hostPlatform": "linux",
+      "repoColorsByName": [
+        ["Local", "#6366f1"],
+        ["Remote", "#f97316"]
+      ],
+      "repoHostIdByRepoId": [
+        ["repo-1", "local"],
+        ["repo-2", "ssh:ssh-1"]
+      ],
+      "repoIconsByName": [],
+      "repoIdsByName": [
+        ["Local", "repo-1"],
+        ["Remote", "repo-2"]
+      ]
     }
   },
   "recording": {
@@ -337,14 +343,15 @@
             "mount": "eb79a9b3682a",
             "load": "eb79a9b3682a"
           },
-          "state": "071880b671a1",
+          "state": "f4667dda0187",
           "effects": [
             "2f1b95eac8f1",
             "1ff13ee8621c",
             "7e772c1c111d",
             "8ef3b348c179",
-            "56ab81cb67dc",
-            "f9193cae5824"
+            "6063e534d9db",
+            "bea13a4a2e87",
+            "53226cb82ec3"
           ]
         }
       }