diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index dd7102f8..9c56f977 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -42,12 +42,6 @@ jobs:
         run: cd /tmp/DIRACRepo && ./integration_tests.py test-server || touch server-tests-failed
       - name: Client tests
         run: cd /tmp/DIRACRepo && ./integration_tests.py test-client || touch client-tests-failed
-      - name: diracx logs
-        if: ${{ failure() }}
-        run: sleep 15 && docker logs diracx
-      - name: DIRAC logs
-        if: ${{ failure() }}
-        run: cd /tmp/DIRACRepo && ./integration_tests.py logs --no-follow --lines 1000
       - name: Check test status
         run: |
           has_error=0
@@ -55,8 +49,15 @@ jobs:
           if [ -f server-tests-failed ]; then has_error=0; echo "Server tests failed"; fi
           if [ -f client-tests-failed ]; then has_error=0; echo "Client tests failed"; fi
           if [ ${has_error} = 1 ]; then exit 1; fi
-      - name: Setup tmate session
+      - name: diracx logs
+        if: ${{ failure() }}
+        run: |
+          mkdir -p /tmp/service-logs
+          docker logs diracx > /tmp/service-logs/diracx.log
+          cd /tmp/DIRACRepo
+          ./integration_tests.py logs --no-follow --lines 1000 > /tmp/service-logs/dirac.log
+      - uses: actions/upload-artifact@v3
         if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
         with:
-          limit-access-to-actor: true
+          name: serivce-logs
+          path: /tmp/service-logs/