diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2
index d7e0c58a512..418e2bea462 100644
--- a/.circleci/config.continue.yml.j2
+++ b/.circleci/config.continue.yml.j2
@@ -941,13 +941,22 @@ jobs:
           no_output_timeout: 5m
           command: |
             cd system-tests
-            DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh DEBUGGER_SCENARIOS
+            export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY 
+            ./run.sh DEBUGGER_SCENARIOS
+
+      - run:
+          name: Collect log files
+          no_output_timeout: 5m
+          command: |
+            cd system-tests
+            mkdir -p log_debugger
+            find . -type d -name "log*" -exec mv {} log_debugger/ \;
 
       - store_test_results:
-          path: system-tests/logs_debugger*
+          path: system-tests/logs_debugger
 
       - store_artifacts:
-          path: system-tests/logs_debugger*
+          path: system-tests/logs_debugger
 
   parametric-tests:
     machine: