diff --git a/.agents/agent_assets_metadata.toml b/.agents/agent_assets_metadata.toml
index ac20cfeb..8d3b02e2 100644
--- a/.agents/agent_assets_metadata.toml
+++ b/.agents/agent_assets_metadata.toml
@@ -6,3 +6,39 @@ id = "eD84DGRCWiOa5scCp_Thx"
 uri = "file://artifacts/teaboy-os/src/assets/login-art.png"
 type = "image"
 title = "login art"
+
+[[generated]]
+id = "Dy7wCo-RCUzJlVjqDJODC"
+uri = "file://artifacts/teaboy-os/public/service-images/tea.png"
+type = "image"
+title = "generated_image"
+
+[[generated]]
+id = "zvodbXSr2tAsyVcYJXTxE"
+uri = "file://artifacts/teaboy-os/public/service-images/arabic-coffee.png"
+type = "image"
+title = "generated_image"
+
+[[generated]]
+id = "RyxcoHUo53xV4Vm4SIC9u"
+uri = "file://artifacts/teaboy-os/public/service-images/water.png"
+type = "image"
+title = "generated_image"
+
+[[generated]]
+id = "mxCcnlnUFIa-DVsz3EAkI"
+uri = "file://artifacts/teaboy-os/public/service-images/nescafe.png"
+type = "image"
+title = "generated_image"
+
+[[generated]]
+id = "BsyqgR_m14Yf0_KjQ7IG8"
+uri = "file://artifacts/teaboy-os/public/service-images/juice.png"
+type = "image"
+title = "generated_image"
+
+[[generated]]
+id = "rNA7O4IB9yyq38zpUWFi6"
+uri = "file://artifacts/teaboy-os/public/service-images/soft-drink.png"
+type = "image"
+title = "generated_image"
diff --git a/artifacts/teaboy-os/public/service-images/arabic-coffee.png b/artifacts/teaboy-os/public/service-images/arabic-coffee.png
new file mode 100644
index 00000000..066ebbd6
Binary files /dev/null and b/artifacts/teaboy-os/public/service-images/arabic-coffee.png differ
diff --git a/artifacts/teaboy-os/public/service-images/juice.png b/artifacts/teaboy-os/public/service-images/juice.png
new file mode 100644
index 00000000..548e2ae6
Binary files /dev/null and b/artifacts/teaboy-os/public/service-images/juice.png differ
diff --git a/artifacts/teaboy-os/public/service-images/nescafe.png b/artifacts/teaboy-os/public/service-images/nescafe.png
new file mode 100644
index 00000000..d4c52dbe
Binary files /dev/null and b/artifacts/teaboy-os/public/service-images/nescafe.png differ
diff --git a/artifacts/teaboy-os/public/service-images/soft-drink.png b/artifacts/teaboy-os/public/service-images/soft-drink.png
new file mode 100644
index 00000000..9a742a49
Binary files /dev/null and b/artifacts/teaboy-os/public/service-images/soft-drink.png differ
diff --git a/artifacts/teaboy-os/public/service-images/tea.png b/artifacts/teaboy-os/public/service-images/tea.png
new file mode 100644
index 00000000..0d522f16
Binary files /dev/null and b/artifacts/teaboy-os/public/service-images/tea.png differ
diff --git a/artifacts/teaboy-os/public/service-images/water.png b/artifacts/teaboy-os/public/service-images/water.png
new file mode 100644
index 00000000..acf1f98f
Binary files /dev/null and b/artifacts/teaboy-os/public/service-images/water.png differ
diff --git a/artifacts/teaboy-os/src/lib/image-url.ts b/artifacts/teaboy-os/src/lib/image-url.ts
index 8b710760..bb2664b6 100644
--- a/artifacts/teaboy-os/src/lib/image-url.ts
+++ b/artifacts/teaboy-os/src/lib/image-url.ts
@@ -3,5 +3,9 @@ export function resolveServiceImageUrl(value: string | null | undefined): string
   const trimmed = value.trim();
   if (!trimmed) return null;
   if (trimmed.startsWith("/objects/")) return `/api/storage${trimmed}`;
-  return trimmed;
+  if (/^https?:\/\//i.test(trimmed)) return trimmed;
+  // Treat as a path relative to the frontend's base (e.g. files in /public).
+  const base = import.meta.env.BASE_URL ?? "/";
+  const cleaned = trimmed.replace(/^\/+/, "");
+  return `${base}${cleaned}`;
 }