diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml
index 1a2b3c871a..3406fe73bd 100644
--- a/.gitlab/ci/deploy.yml
+++ b/.gitlab/ci/deploy.yml
@@ -64,3 +64,21 @@ deploy_update_SHA_in_esp-dockerfiles:
   environment:
     name: deploy_update_SHA_in_esp-dockerfiles_production
     deployment_tier: production
+
+upload_junit_report:
+  extends:
+    - .deploy_job_template
+  tags: [ fast_run, shiny ]
+  needs:
+    - pipeline_variables
+    - job: build_child_pipeline
+      artifacts: false
+  script:
+    - run_cmd idf-ci gitlab download-artifacts --type junit
+  rules:
+    - when: always
+  artifacts:
+    reports:
+      junit: XUNIT_RESULT_*.xml
+    expire_in: 1 week
+    when: always
diff --git a/.idf_ci.toml b/.idf_ci.toml
index a6ab6b69f9..7e1e802f5c 100644
--- a/.idf_ci.toml
+++ b/.idf_ci.toml
@@ -88,13 +88,13 @@ patterns = [
 [gitlab.artifacts.s3.junit]
 bucket = "idf-artifacts"
 patterns = [
-    'XUNIT_RESULT_*.xml',
+    '**/XUNIT_RESULT_*.xml',
 ]
 
 [gitlab.artifacts.s3.env]
 bucket = "idf-artifacts"
 patterns = [
-    'pipeline.env',
+    '**/pipeline.env',
 ]
 
 [gitlab.artifacts.s3.longterm]