diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index 90f9946d354ce86d79fcd33d0512e0009666b6ef..0967583ed2afae179d35bef0b47aa8a0f33f4228 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -97,7 +97,7 @@ jobs:
 
       - name: Upload NC logs
         uses: actions/upload-artifact@v3
-        if: ${{ matrix.containers != 'component' }}
+        if: ( success() || failure() ) && matrix.containers != 'component'
         with:
           name: nc_logs_${{ matrix.containers }}
           path: nextcloud.log
diff --git a/cypress.config.ts b/cypress.config.ts
index b8cb90c5177e2ecb2c00455e87536cd6057ec54c..0fba6005dc24897661d9f84fc22d3dea43e506c0 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -71,7 +71,9 @@ export default defineConfig({
 
 			// Remove container after run
 			on('after:run', () => {
-				stopNextcloud()
+				if (!process.env.CI) {
+					stopNextcloud()
+				}
 			})
 
 			// Before the browser launches
diff --git a/cypress/e2e/files_versions/version_restoration.cy.ts b/cypress/e2e/files_versions/version_restoration.cy.ts
index 0e09b0d8aa693d905935fd9d5d54d9ec59e771f6..74bb82c2c2de7affbf443ca34b98121211792571 100644
--- a/cypress/e2e/files_versions/version_restoration.cy.ts
+++ b/cypress/e2e/files_versions/version_restoration.cy.ts
@@ -24,7 +24,7 @@ import { assertVersionContent, clickPopperAction, openVersionMenu, openVersionsP
 
 function restoreVersion(index: number) {
 	openVersionMenu(index)
-	clickPopperAction("Restore version")
+	clickPopperAction('Restore version')
 }
 
 describe('Versions restoration', () => {