diff --git a/scripts/hwlab-g14-contract-test.ts b/scripts/hwlab-g14-contract-test.ts
index c4749c9d..661e61d4 100644
--- a/scripts/hwlab-g14-contract-test.ts
+++ b/scripts/hwlab-g14-contract-test.ts
@@ -273,8 +273,10 @@ assertCondition(
   triggerSnapshot,
 );
 assertCondition(
-  !v02PipelineServiceIds().includes("hwlab-cli"),
-  "v0.2 PipelineRun service matrix must not build hwlab-cli because cli is short-connection source tool",
+  !v02PipelineServiceIds().includes("hwlab-cli")
+    && !v02PipelineServiceIds().includes("hwlab-agent-mgr")
+    && !v02PipelineServiceIds().includes("hwlab-agent-worker"),
+  "v0.2 PipelineRun service matrix must exclude short-connection cli and removed HWLAB-owned code-agent control-plane services",
   v02PipelineServiceIds(),
 );
 assertCondition(
diff --git a/scripts/src/hwlab-g14.ts b/scripts/src/hwlab-g14.ts
index 71a68341..0cdb74cd 100644
--- a/scripts/src/hwlab-g14.ts
+++ b/scripts/src/hwlab-g14.ts
@@ -41,8 +41,6 @@ const GIT_MIRROR_LEGACY_CRONJOB = "git-mirror-hwlab-sync";
 const V02_SERVICE_IDS = [
   "hwlab-cloud-api",
   "hwlab-cloud-web",
-  "hwlab-agent-mgr",
-  "hwlab-agent-worker",
   "hwlab-device-pod",
   "hwlab-gateway",
   "hwlab-edge-proxy",