diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25bddf8f..bd603757 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,7 @@ stages:
   - end-to-end-setup-arango
   - end-to-end-setup
   - end-to-end-test
+  - log
   - deploy-pypi-package
 
 # WARNING
diff --git a/.gitlab/common.yml b/.gitlab/common.yml
index 4d011ea7..b7fe85de 100644
--- a/.gitlab/common.yml
+++ b/.gitlab/common.yml
@@ -47,17 +47,13 @@
     - docker push "${REGISTRY}/${IMAGE_TAG}-${BRANCH_LOWER}"
 
 .error_logs_client_end_to_end:
-  stage: end-to-end-test
+  stage: log
   script:
     - BRANCH_LOWER=$(echo "$CI_COMMIT_REF_NAME" | tr '[:upper:]' '[:lower:]')
     - docker logs $(docker ps --filter "ancestor=${REGISTRY}/${IMAGE_TAG}${BRANCH_LOWER}" --format "{{.Names}}")
   needs:
     - job: end_to_end_client-test
       artifacts: false
-  rules:
-    - if: '$CI_JOB_STATUS == "failed" && $CI_JOB_NAME == "end_to_end_client-test"'
-      when: always
-    - when: never
 
 
 
diff --git a/.gitlab/end_to_end.yml b/.gitlab/end_to_end.yml
index 883ad66b..a5a94084 100644
--- a/.gitlab/end_to_end.yml
+++ b/.gitlab/end_to_end.yml
@@ -354,7 +354,7 @@ end_to_end_client-test:
     - cmake --build build --target test
 
 end_to_end_error_discovery_arango:
-  stage: end-to-end-test
+  stage: log
   tags:
     - ci-datafed-arango
   script:
@@ -362,10 +362,6 @@ end_to_end_error_discovery_arango:
   needs:
     - job: end_to_end_client-test
       artifacts: false
-  rules:
-    - if: '$CI_JOB_STATUS == "failed" && $CI_JOB_NAME == "end_to_end_client-test"'
-      when: always
-    - when: never
 
 end_to_end_error_discovery_gcs:
   extends: .error_logs_client_end_to_end