diff --git a/cypress/dockerNode.ts b/cypress/dockerNode.ts
index 5854411802446..af5619bbf806d 100644
--- a/cypress/dockerNode.ts
+++ b/cypress/dockerNode.ts
@@ -122,7 +122,6 @@ export const configureNextcloud = async function() {
 	await runExec(container, ['php', 'occ', 'config:system:set', 'default_locale', '--value', 'en_US'], true)
 	await runExec(container, ['php', 'occ', 'config:system:set', 'force_locale', '--value', 'en_US'], true)
 	await runExec(container, ['php', 'occ', 'config:system:set', 'enforce_theme', '--value', 'light'], true)
-	await runExec(container, ['php', 'occ', 'config:system:set', 'versions_retention_obligation', '--value', '0, 0'], true)
 
 	console.log('└─ Nextcloud is now ready to use 🎉')
 }
diff --git a/cypress/e2e/files_versions/version_expiration.cy.ts b/cypress/e2e/files_versions/version_expiration.cy.ts
index e0c9e36d52928..1c60e2dab1d0b 100644
--- a/cypress/e2e/files_versions/version_expiration.cy.ts
+++ b/cypress/e2e/files_versions/version_expiration.cy.ts
@@ -38,7 +38,9 @@ describe('Versions expiration', () => {
 	})
 
 	it('Expire all versions', () => {
+		cy.runOccCommand('config:system:set versions_retention_obligation --value 0, 0')
 		cy.runOccCommand('versions:expire')
+		cy.runOccCommand('config:system:set versions_retention_obligation --value auto')
 		cy.visit('/apps/files')
 		openVersionsPanel(randomFileName)