diff --git a/codebundles/stg-workspace-smoke/.runwhen/SKILL_TEMPLATE.md b/codebundles/stg-workspace-smoke/.runwhen/SKILL_TEMPLATE.md
index 0e07e57..cf8e0e9 100644
--- a/codebundles/stg-workspace-smoke/.runwhen/SKILL_TEMPLATE.md
+++ b/codebundles/stg-workspace-smoke/.runwhen/SKILL_TEMPLATE.md
@@ -58,7 +58,7 @@
 
         - Generated by `runwhen-platform-mcp` `render_codecollection_skill` v0.0.0-dev
 - Source workspace: `stg-test`
-- Generated at: `2026-07-07T01:52:25Z`
+- Generated at: `2026-07-07T02:32:59Z`
 
         ## Deploying this codecollection
 
diff --git a/codebundles/stg-workspace-smoke/.runwhen/templates/stg-workspace-smoke-slx.yaml b/codebundles/stg-workspace-smoke/.runwhen/templates/stg-workspace-smoke-slx.yaml
index b284973..af9c6fd 100644
--- a/codebundles/stg-workspace-smoke/.runwhen/templates/stg-workspace-smoke-slx.yaml
+++ b/codebundles/stg-workspace-smoke/.runwhen/templates/stg-workspace-smoke-slx.yaml
@@ -17,6 +17,8 @@ spec:
     Verify tool-builder runtime can execute a simple custom task against the stg-test workspace.
   additionalContext:
     qualified_name: "{{ match_resource.qualified_name }}"
+    resourcePath: "custom/workspace/stg-test"
+    hierarchy: [platform, workspace]
   tags:
     - name: platform
       value: runwhen
diff --git a/codebundles/system-info-check-bash/.runwhen/SKILL_TEMPLATE.md b/codebundles/system-info-check-bash/.runwhen/SKILL_TEMPLATE.md
index 6faf93f..78f8a22 100644
--- a/codebundles/system-info-check-bash/.runwhen/SKILL_TEMPLATE.md
+++ b/codebundles/system-info-check-bash/.runwhen/SKILL_TEMPLATE.md
@@ -58,7 +58,7 @@
 
         - Generated by `runwhen-platform-mcp` `render_codecollection_skill` v0.0.0-dev
 - Source workspace: `stg-test`
-- Generated at: `2026-07-07T01:52:25Z`
+- Generated at: `2026-07-07T02:32:59Z`
 
         ## Deploying this codecollection
 
diff --git a/codebundles/system-info-check-bash/.runwhen/templates/system-info-check-bash-slx.yaml b/codebundles/system-info-check-bash/.runwhen/templates/system-info-check-bash-slx.yaml
index 030e74d..a900473 100644
--- a/codebundles/system-info-check-bash/.runwhen/templates/system-info-check-bash-slx.yaml
+++ b/codebundles/system-info-check-bash/.runwhen/templates/system-info-check-bash-slx.yaml
@@ -17,6 +17,8 @@ spec:
     The runner should report hostname and disk space when queried.
   additionalContext:
     qualified_name: "{{ match_resource.qualified_name }}"
+    resourcePath: "custom/workspace/stg-test"
+    hierarchy: [platform, workspace]
   tags:
     - name: platform
       value: runwhen
diff --git a/codebundles/system-info-check/.runwhen/SKILL_TEMPLATE.md b/codebundles/system-info-check/.runwhen/SKILL_TEMPLATE.md
index 457459a..2356409 100644
--- a/codebundles/system-info-check/.runwhen/SKILL_TEMPLATE.md
+++ b/codebundles/system-info-check/.runwhen/SKILL_TEMPLATE.md
@@ -58,7 +58,7 @@
 
         - Generated by `runwhen-platform-mcp` `render_codecollection_skill` v0.0.0-dev
 - Source workspace: `stg-test`
-- Generated at: `2026-07-07T01:52:25Z`
+- Generated at: `2026-07-07T02:32:59Z`
 
         ## Deploying this codecollection
 
diff --git a/codebundles/system-info-check/.runwhen/templates/system-info-check-slx.yaml b/codebundles/system-info-check/.runwhen/templates/system-info-check-slx.yaml
index 2238d03..5bcbac1 100644
--- a/codebundles/system-info-check/.runwhen/templates/system-info-check-slx.yaml
+++ b/codebundles/system-info-check/.runwhen/templates/system-info-check-slx.yaml
@@ -17,6 +17,8 @@ spec:
     The runner should report its kernel and system information when queried.
   additionalContext:
     qualified_name: "{{ match_resource.qualified_name }}"
+    resourcePath: "custom/workspace/stg-test"
+    hierarchy: [platform, workspace]
   tags:
     - name: platform
       value: runwhen