diff --git a/ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh b/ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh
index f31f09af255f1..0d53ec36ac399 100644
--- a/ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh
+++ b/ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh
@@ -243,8 +243,13 @@ load_secrets
 configure_claude
 
 # Use the edge-tooling source pre-installed in the image
-SRC_DIR="${EDGE_TOOLING_DIR}"
+# SRC_DIR="${EDGE_TOOLING_DIR}"
+# PLUGIN_DIR="${SRC_DIR}/plugins/microshift-ci"
+# cd "${SRC_DIR}"
+
+SRC_DIR=/tmp/edge-tooling
 PLUGIN_DIR="${SRC_DIR}/plugins/microshift-ci"
+git clone https://github.com/ggiguash/edge-tooling.git -b ci-doctor-analyse-workflow "${SRC_DIR}"
 cd "${SRC_DIR}"
 
 # Configure the GitHub token for MicroShift repo operations
@@ -263,7 +268,7 @@ echo "Automatic closing of duplicate rebase PRs completed"
 # Run analysis on all releases and open rebase PRs (45m and 100 turns).
 echo "Running Claude to analyze MicroShift CI jobs and pull requests..."
 CLAUDE_RC=0
-timeout 2700 claude \
+timeout 2700 claude-latest \
     --model "${CLAUDE_MODEL}" \
     --max-turns 100 \
     --output-format stream-json \