diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 0d27886d..456611bb 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -58,7 +58,7 @@
       "name": "lvms-ci",
       "source": "./plugins/lvms-ci",
       "description": "LVMS CI Automation",
-      "version": "1.3.1"
+      "version": "1.3.2"
     },
     {
       "name": "mcp-atlassian",
@@ -70,7 +70,7 @@
       "name": "microshift-ci",
       "source": "./plugins/microshift-ci",
       "description": "MicroShift CI Automation",
-      "version": "1.5.3"
+      "version": "1.5.4"
     },
     {
       "name": "microshift-dev",
diff --git a/plugins/lvms-ci/.claude-plugin/plugin.json b/plugins/lvms-ci/.claude-plugin/plugin.json
index 2670f32b..b0a36bb9 100644
--- a/plugins/lvms-ci/.claude-plugin/plugin.json
+++ b/plugins/lvms-ci/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "lvms-ci",
   "description": "LVMS CI Automation",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "author": {
     "name": "knarra"
   },
diff --git a/plugins/lvms-ci/.claude/settings.json b/plugins/lvms-ci/hooks/hooks.json
similarity index 75%
rename from plugins/lvms-ci/.claude/settings.json
rename to plugins/lvms-ci/hooks/hooks.json
index a3f78109..94586244 100644
--- a/plugins/lvms-ci/.claude/settings.json
+++ b/plugins/lvms-ci/hooks/hooks.json
@@ -6,7 +6,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "python3 \"$CLAUDE_PLUGIN_ROOT/scripts/validate-rca-output.py\"",
+            "command": "python3 \"${CLAUDE_PLUGIN_ROOT}/scripts/validate-rca-output.py\"",
             "timeout": 30,
             "statusMessage": "Validating RCA output schema..."
           }
diff --git a/plugins/microshift-ci/.claude-plugin/plugin.json b/plugins/microshift-ci/.claude-plugin/plugin.json
index f4b4acda..065ede04 100644
--- a/plugins/microshift-ci/.claude-plugin/plugin.json
+++ b/plugins/microshift-ci/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "microshift-ci",
   "description": "MicroShift CI Automation",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "author": {
     "name": "ggiguash"
   },
diff --git a/plugins/microshift-ci/.claude/settings.json b/plugins/microshift-ci/.claude/settings.json
deleted file mode 100644
index 120a4366..00000000
--- a/plugins/microshift-ci/.claude/settings.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "hooks": {
-    "SubagentStop": [
-      {
-        "matcher": "microshift-ci:prow-job-analyzer",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "python3 \"$CLAUDE_PLUGIN_ROOT/scripts/validate-rca-output.py\"",
-            "timeout": 30,
-            "statusMessage": "Validating RCA output schema..."
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/plugins/microshift-ci/hooks/hooks.json b/plugins/microshift-ci/hooks/hooks.json
index f2bc7826..0e48f638 100644
--- a/plugins/microshift-ci/hooks/hooks.json
+++ b/plugins/microshift-ci/hooks/hooks.json
@@ -11,6 +11,19 @@
           }
         ]
       }
+    ],
+    "SubagentStop": [
+      {
+        "matcher": "microshift-ci:prow-job-analyzer",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 \"${CLAUDE_PLUGIN_ROOT}/scripts/validate-rca-output.py\"",
+            "timeout": 30,
+            "statusMessage": "Validating RCA output schema..."
+          }
+        ]
+      }
     ]
   }
 }