diff --git a/ci-operator/config/medik8s/system-tests/medik8s-system-tests-main__4.22-konflux.yaml b/ci-operator/config/medik8s/system-tests/medik8s-system-tests-main__4.22-konflux.yaml
index 90e934fc57a3b..ae0d80ab14570 100644
--- a/ci-operator/config/medik8s/system-tests/medik8s-system-tests-main__4.22-konflux.yaml
+++ b/ci-operator/config/medik8s/system-tests/medik8s-system-tests-main__4.22-konflux.yaml
@@ -3,6 +3,10 @@ base_images:
     name: "4.22"
     namespace: ocp
     tag: aws-efs-csi-operator-create-efs
+  claude-ai-helpers:
+    name: claude-ai-helpers
+    namespace: ci
+    tag: latest
   hypershift-operator:
     name: hypershift-operator
     namespace: hypershift
@@ -134,6 +138,10 @@ tests:
       OCP_VERSION: "422"
       OO_CHANNEL: stable
       OPERATORS: node-healthcheck-operator,self-node-remediation
+      TEST_NAME: e2e-nhc-aws
+      TEST_STEPS: e2e-test
+    post:
+    - ref: medik8s-analyze-e2e-failure
     test:
     - chain: medik8s-setup
     - ref: ssh-bastion
@@ -558,6 +566,10 @@ tests:
       OCP_VERSION: "422"
       OO_CHANNEL: stable
       OPERATORS: node-healthcheck-operator,self-node-remediation
+      TEST_NAME: e2e-nhc-weekly-aws
+      TEST_STEPS: e2e-test
+    post:
+    - ref: medik8s-analyze-e2e-failure
     test:
     - chain: medik8s-setup
     - ref: ssh-bastion