diff --git a/.drone.env b/.drone.env
index aa206fc2749..9cb855a275f 100644
--- a/.drone.env
+++ b/.drone.env
@@ -1,3 +1,3 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=c2c7478bf494ef700b76453f262ff8747dbc159c
+OCIS_COMMITID=f612ca788ea5ca5991b2b976e4ac6ae634ead409
 OCIS_BRANCH=master
diff --git a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
index eef0d330253..58805d09f9e 100644
--- a/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
+++ b/packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue
@@ -8,6 +8,7 @@
       :class="['oc-sidebar-nav-item-link', { active: active }]"
       :to="target"
       :data-nav-id="index"
+      :data-nav-name="navName"
     >
       <oc-icon :name="icon" :fill-type="fillType" />
       <span class="oc-ml-m text" :class="{ 'text-invisible': collapsed }" v-text="name" />
@@ -17,6 +18,7 @@
 </template>
 <script>
 import SidebarNavItemHighlight from './SidebarNavItemHighlight.vue'
+import get from 'lodash-es/get'
 
 export default {
   components: {
@@ -57,6 +59,9 @@ export default {
     }
   },
   computed: {
+    navName() {
+      return get(this.$router?.resolve(this.target), 'route.name')
+    },
     toolTip() {
       const value = this.collapsed
         ? this.$gettextInterpolate(this.$gettext('Navigate to %{ pageName } page'), {
diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
index 21ab6d800aa..ee907a46e72 100644
--- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
+++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
@@ -490,11 +490,15 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUISharingInternalGroups/shareWithGroups.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L77)
 -   [webUISharingInternalUsers/shareWithUsers.feature:57](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L57)
 
-### [shares are not listed with full paths](https://github.com/owncloud/ocis/issues/2462)
--   [webUISharingPublicBasic/publicLinkCreate.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L88)
-
 ### [web config update is not properly reflected after the ocis start](https://github.com/owncloud/ocis/issues/2944)
 -   [webUIFiles/breadcrumb.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/breadcrumb.feature#L50)
 
 ### [empty subfolder inside a folder to be uploaded is not created on the server](https://github.com/owncloud/web/issues/6348)
 -   [webUIUpload/upload.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L42)
+
+### [Creating public link share still has # in the link with the latest oCIS server and the link doesn't work.](https://github.com/owncloud/web/issues/6478)
+-   [webUISharingPublicManagement/shareByPublicLink.feature:78](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L78)
+
+### [Logging out doesn't work with the latest oCIS server](https://github.com/owncloud/web/issues/6479)
+-   [webUILogin/openidLogin.feature:22](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUILogin/openidLogin.feature#L22)
+-   [webUILogin/openidLogin.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUILogin/openidLogin.feature#L29)
diff --git a/tests/acceptance/features/webUILogin/oauthLogin.feature b/tests/acceptance/features/webUILogin/oauthLogin.feature
index 0f2454fc4e7..e73694162f9 100644
--- a/tests/acceptance/features/webUILogin/oauthLogin.feature
+++ b/tests/acceptance/features/webUILogin/oauthLogin.feature
@@ -11,7 +11,7 @@ Feature: login users
   Background:
     Given user "Alice" has been created with default attributes and without skeleton files in the server
 
-  @ocisSmokeTest
+
   Scenario: admin login
     Given the user has browsed to the login page
     When the user logs in with username "admin" and password "admin" using the webUI
diff --git a/tests/acceptance/features/webUIUserJourney/journey1.feature b/tests/acceptance/features/webUIUserJourney/journey1.feature
index 79917c59629..0cdbb26492b 100644
--- a/tests/acceptance/features/webUIUserJourney/journey1.feature
+++ b/tests/acceptance/features/webUIUserJourney/journey1.feature
@@ -5,7 +5,6 @@ Feature: User Journey 1
 
   Background:
     Given user "Alice" has been created with default attributes and without skeleton files in the server
-    And user "Brian" has been created with default attributes and without skeleton files in the server
 
   @journey
   Scenario: simple upload of a file that does not exist before
@@ -17,11 +16,12 @@ Feature: User Journey 1
     When the user browses to the files page
     And the user downloads file "new-lorem.txt" using the webUI
     Then no message should be displayed on the webUI
-    And the user renames file "new-lorem.txt" to "new-lorem2.txt" using the webUI
-    And file "new-lorem2.txt" should be listed on the webUI
-    And the user deletes file "new-lorem2.txt" using the webUI
+    When the user renames file "new-lorem.txt" to "new-lorem2.txt" using the webUI
+    Then file "new-lorem2.txt" should be listed on the webUI
+    When the user deletes file "new-lorem2.txt" using the webUI
     And the user browses to the trashbin page
-    And file "new-lorem2.txt" should be listed on the webUI
-    And the user restores file "new-lorem2.txt" from the trashbin using the webUI
-    And the user browses to the files page
-    And file "new-lorem2.txt" should be listed on the webUI
+    Then file "new-lorem2.txt" should be listed on the webUI
+    When the user restores file "new-lorem2.txt" from the trashbin using the webUI
+    Then there should be no resources listed on the webUI
+    When the user browses to the files page
+    Then file "new-lorem2.txt" should be listed on the webUI
diff --git a/tests/acceptance/nightwatch.conf.js b/tests/acceptance/nightwatch.conf.js
index c7330bd4122..3017185a0c5 100644
--- a/tests/acceptance/nightwatch.conf.js
+++ b/tests/acceptance/nightwatch.conf.js
@@ -53,7 +53,8 @@ const config = {
   custom_assertions_path: ['node_modules/nightwatch-vrt/assertions'],
   test_settings: {
     default: {
-      launch_url: LOCAL_LAUNCH_URL,
+      // ocis doesn't have '#' in the url path anymore
+      launch_url: RUN_ON_OCIS ? LOCAL_LAUNCH_URL : `${LOCAL_LAUNCH_URL}/#`,
       globals: {
         waitForConditionTimeout: 10000,
         waitForNegativeConditionTimeout: 300,
diff --git a/tests/acceptance/pageObjects/accountPage.js b/tests/acceptance/pageObjects/accountPage.js
index b5712bfe598..c841681f089 100644
--- a/tests/acceptance/pageObjects/accountPage.js
+++ b/tests/acceptance/pageObjects/accountPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/account/')
+    return join(this.api.launchUrl, '/account/')
   },
   commands: {
     /**
diff --git a/tests/acceptance/pageObjects/favoritesPage.js b/tests/acceptance/pageObjects/favoritesPage.js
index 733fa6744ad..a1bcfa3e1ca 100644
--- a/tests/acceptance/pageObjects/favoritesPage.js
+++ b/tests/acceptance/pageObjects/favoritesPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/favorites/')
+    return join(this.api.launchUrl, '/files/favorites/')
   },
   commands: {
     /**
diff --git a/tests/acceptance/pageObjects/filesDropPage.js b/tests/acceptance/pageObjects/filesDropPage.js
index c8f500e34a8..8f9bdd68a9f 100644
--- a/tests/acceptance/pageObjects/filesDropPage.js
+++ b/tests/acceptance/pageObjects/filesDropPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/public/drop/')
+    return join(this.api.launchUrl, '/files/public/drop/')
   },
   commands: {
     /**
diff --git a/tests/acceptance/pageObjects/loginErrorPage.js b/tests/acceptance/pageObjects/loginErrorPage.js
index 517322f4a4b..1aa3e47a71b 100644
--- a/tests/acceptance/pageObjects/loginErrorPage.js
+++ b/tests/acceptance/pageObjects/loginErrorPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/access-denied')
+    return join(this.api.launchUrl, '/access-denied')
   },
   elements: {
     body: 'body',
diff --git a/tests/acceptance/pageObjects/loginPage.js b/tests/acceptance/pageObjects/loginPage.js
index 6cd45daea24..e835e8fa7d4 100644
--- a/tests/acceptance/pageObjects/loginPage.js
+++ b/tests/acceptance/pageObjects/loginPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/login')
+    return join(this.api.launchUrl, '/login')
   },
   elements: {
     body: 'body',
diff --git a/tests/acceptance/pageObjects/personalPage.js b/tests/acceptance/pageObjects/personalPage.js
index 8109ad11c2b..4f82facca65 100644
--- a/tests/acceptance/pageObjects/personalPage.js
+++ b/tests/acceptance/pageObjects/personalPage.js
@@ -5,7 +5,7 @@ const { client } = require('nightwatch-api')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '#/files/list/all')
+    return join(this.api.launchUrl, '/files/list/all')
   },
   commands: {
     /**
diff --git a/tests/acceptance/pageObjects/publicLinkFilesPage.js b/tests/acceptance/pageObjects/publicLinkFilesPage.js
index 3fc5a4d1b2a..ec005a680d6 100644
--- a/tests/acceptance/pageObjects/publicLinkFilesPage.js
+++ b/tests/acceptance/pageObjects/publicLinkFilesPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/ops/resolver/public-link/')
+    return join(this.api.launchUrl, '/files/ops/resolver/public-link/')
   },
   commands: {
     /**
@@ -15,7 +15,7 @@ module.exports = {
       )
     },
     navigateAndWaitForPasswordPage: function (token) {
-      this.navigate(join(this.api.launchUrl, '/#/files/ops/resolver/public-link', token))
+      this.navigate(join(this.api.launchUrl, '/files/ops/resolver/public-link', token))
       return this.page.publicLinkPasswordPage().waitForElementPresent('@passwordInput')
     },
     /**
diff --git a/tests/acceptance/pageObjects/sharedViaLinkPage.js b/tests/acceptance/pageObjects/sharedViaLinkPage.js
index 32bc0a17b95..34a31caa8ea 100644
--- a/tests/acceptance/pageObjects/sharedViaLinkPage.js
+++ b/tests/acceptance/pageObjects/sharedViaLinkPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/shares/via-link/')
+    return join(this.api.launchUrl, '/files/shares/via-link/')
   },
   commands: {
     /**
diff --git a/tests/acceptance/pageObjects/sharedWithMePage.js b/tests/acceptance/pageObjects/sharedWithMePage.js
index 72b15ed6918..6b726417073 100644
--- a/tests/acceptance/pageObjects/sharedWithMePage.js
+++ b/tests/acceptance/pageObjects/sharedWithMePage.js
@@ -4,7 +4,7 @@ const { SHARE_STATE } = require('../helpers/sharingHelper')
 
 module.exports = {
   url: function (viewMode) {
-    return join(this.api.launchUrl, '/#/files/shares/with-me/?view-mode=' + viewMode)
+    return join(this.api.launchUrl, '/files/shares/with-me/?view-mode=' + viewMode)
   },
   commands: {
     /**
diff --git a/tests/acceptance/pageObjects/sharedWithOthersPage.js b/tests/acceptance/pageObjects/sharedWithOthersPage.js
index 7d451bd59da..7a76c85620a 100644
--- a/tests/acceptance/pageObjects/sharedWithOthersPage.js
+++ b/tests/acceptance/pageObjects/sharedWithOthersPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/shares/with-others/')
+    return join(this.api.launchUrl, '/files/shares/with-others/')
   },
   commands: {
     /**
diff --git a/tests/acceptance/pageObjects/trashbinPage.js b/tests/acceptance/pageObjects/trashbinPage.js
index 7915860862c..6a976d828f3 100644
--- a/tests/acceptance/pageObjects/trashbinPage.js
+++ b/tests/acceptance/pageObjects/trashbinPage.js
@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/trash/')
+    return join(this.api.launchUrl, '/files/trash/')
   },
   commands: {
     /**
diff --git a/tests/acceptance/pageObjects/webPage.js b/tests/acceptance/pageObjects/webPage.js
index 91f8d6eb3e3..72259522f08 100644
--- a/tests/acceptance/pageObjects/webPage.js
+++ b/tests/acceptance/pageObjects/webPage.js
@@ -5,7 +5,7 @@ const { defaultUsers } = require('../helpers/userSettings')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/')
+    return join(this.api.launchUrl, '/')
   },
   commands: {
     /**
diff --git a/tests/e2e/support/page/files/allFiles.ts b/tests/e2e/support/page/files/allFiles.ts
index 71ea787e92a..e66f4eea6ec 100644
--- a/tests/e2e/support/page/files/allFiles.ts
+++ b/tests/e2e/support/page/files/allFiles.ts
@@ -13,8 +13,7 @@ export class AllFilesPage {
   async navigate(): Promise<void> {
     const { page } = this.actor
 
-    const allFilesBtn = page.locator('a[href="#/files/spaces/personal/home"] .text')
-    await allFilesBtn.click()
+    await page.locator('//a[@data-nav-name="files-spaces-personal-home"]').click()
   }
 
   async createFolder({ name }: { name: string }): Promise<void> {
@@ -316,10 +315,19 @@ export class AllFilesPage {
 
     for (const user of users) {
       const userColumn = `//*[@data-testid="collaborator-user-item-${user.id}"]`
-      await page.click(`${userColumn}//button[contains(@class,"files-recipient-role-select-btn")]`)
-      await page.click(
-        `${userColumn}//ul[contains(@class,"files-recipient-role-drop-list")]//button[@id="files-recipient-role-drop-btn-${role}"]`
-      )
+
+      await Promise.all([
+        page.click(`${userColumn}//button[contains(@class,"files-recipient-role-select-btn")]`),
+        page.click(
+          `${userColumn}//ul[contains(@class,"files-recipient-role-drop-list")]//button[@id="files-recipient-role-drop-btn-${role}"]`
+        ),
+        page.waitForResponse(
+          (resp) =>
+            resp.url().includes('shares') &&
+            resp.status() === 200 &&
+            resp.request().method() === 'PUT'
+        )
+      ])
     }
     await page.goto(startUrl)
   }
diff --git a/tests/e2e/support/page/files/publicLink.ts b/tests/e2e/support/page/files/publicLink.ts
index b3ae1564d03..193c466115e 100644
--- a/tests/e2e/support/page/files/publicLink.ts
+++ b/tests/e2e/support/page/files/publicLink.ts
@@ -22,7 +22,6 @@ export class PublicLink {
   private readonly publicLinkListSelector: string
   private readonly roleSelector: string
   private readonly folderSelector: string
-  private dateType: string
 
   constructor({ actor }: { actor: Actor }) {
     this.actor = actor
@@ -51,110 +50,11 @@ export class PublicLink {
     this.folderSelector = `//*[@data-test-resource-name="%s"]/ancestor::tr//button[contains(@class, "files-quick-action-collaborators")]`
   }
 
-  async selectRole(role: string): Promise<void> {
-    await this.roleDropdownLocator.click()
-    await this.actor.page.locator(util.format(this.roleSelector, role)).click()
-  }
-
-  async selectExpiryMonth(year: string, month: string): Promise<void> {
-    await this.actor.page.locator(util.format(this.monthSelector, year, month)).click()
-  }
-
-  async selectExpiryDay(dayMonthYear: string): Promise<void> {
-    await this.actor.page.locator(util.format(this.daySelector, dayMonthYear)).click()
-  }
-
-  getDateType = (expiryDate: string): string => {
-    if (expiryDate.charAt(0).includes('-')) {
-      throw new Error('The provided date is negative and has already expired !!')
-    } else if (expiryDate.charAt(0).includes('+')) {
-      return expiryDate.toLowerCase().match(/[dayrmonthwek]+/)[0]
-    }
-  }
-
-  async selectDate(dateOfExpiration: string): Promise<void> {
-    const newExpiryDate = getActualExpiryDate(this.dateType, dateOfExpiration)
-    const expiryDay = newExpiryDate.getDate()
-    const expiryMonth = ('0' + (newExpiryDate.getMonth() + 1)).slice(-2)
-    const expiryYear = newExpiryDate.getFullYear().toString()
-    await this.expirationDateDropdownLocator.click()
-    const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
-    const months = [
-      'January',
-      'February',
-      'March',
-      'April',
-      'May',
-      'June',
-      'July',
-      'August',
-      'September',
-      'October',
-      'November',
-      'December'
-    ]
-    const dayMonthYear =
-      days[newExpiryDate.getDay()] +
-      ', ' +
-      months[newExpiryDate.getMonth()] +
-      ' ' +
-      expiryDay +
-      ', ' +
-      expiryYear
-    await this.monthAndYearDropdownLocator.click()
-    if ((await this.yearButtonLocator.innerText()) !== expiryYear) {
-      await this.yearButtonLocator.click()
-      while (true) {
-        const nextYearSpanValue = await this.yearButtonLocator.innerText()
-        const splitNextSpanYear = nextYearSpanValue.split('-')
-        if (
-          newExpiryDate.getFullYear() >= parseInt(splitNextSpanYear[0]) &&
-          newExpiryDate.getFullYear() <= parseInt(splitNextSpanYear[1])
-        ) {
-          const yearLocator = await this.actor.page.locator(
-            util.format(this.yearSelector, expiryYear)
-          )
-          await yearLocator.click()
-          break
-        }
-        await this.nextSpanYearLocator.click()
-      }
-    }
-
-    await this.selectExpiryMonth(expiryYear, expiryMonth)
-    await this.selectExpiryDay(dayMonthYear)
-  }
-
   async getLinksCount(): Promise<number> {
     await this.actor.page.waitForSelector(this.publicLinkListSelector)
     return await this.actor.page.locator(this.publicLinkListSelector).count()
   }
 
-  async fillThePublicLinkForm({
-    name,
-    password,
-    role,
-    dateOfExpiration
-  }: {
-    name: string
-    password: string
-    role: string
-    dateOfExpiration: string
-  }): Promise<void> {
-    if (name) {
-      await this.publicLinkNameLocator.fill(name)
-    }
-    if (role) {
-      await this.selectRole(role)
-    }
-    if (dateOfExpiration) {
-      await this.selectDate(dateOfExpiration)
-    }
-    if (password) {
-      await this.publicLinkPasswordLocator.fill(password)
-    }
-  }
-
   async createPublicLinkForResource({
     resource,
     name,
@@ -170,7 +70,6 @@ export class PublicLink {
     password: string
     via: 'SIDEBAR_PANEL' | 'QUICK_ACTION'
   }): Promise<void> {
-    this.dateType = this.getDateType(dateOfExpiration)
     const { page } = this.actor
     const resourcePaths = resource.split('/')
     const resourceName = resourcePaths.pop()
@@ -189,7 +88,34 @@ export class PublicLink {
         break
     }
     await this.publicLinkButtonLocator.click()
-    await this.fillThePublicLinkForm({ name, password, role, dateOfExpiration })
+
+    if (name) {
+      await this.publicLinkNameLocator.fill(name)
+    }
+
+    if (role) {
+      await this.roleDropdownLocator.click()
+      await this.actor.page.locator(util.format(this.roleSelector, role)).click()
+    }
+
+    if (dateOfExpiration) {
+      const newExpiryDate = getActualExpiryDate(
+        dateOfExpiration.toLowerCase().match(/[dayrmonthwek]+/)[0],
+        dateOfExpiration
+      )
+
+      await page.locator('#oc-files-file-link-expire-date').evaluate(
+        (datePicker: any, { newExpiryDate }): any => {
+          datePicker.__vue__.updateValue(newExpiryDate)
+        },
+        { newExpiryDate }
+      )
+    }
+
+    if (password) {
+      await this.publicLinkPasswordLocator.fill(password)
+    }
+
     await this.createLinkButtonLocator.click()
   }
 }
diff --git a/tests/e2e/support/page/files/sharedWithMe.ts b/tests/e2e/support/page/files/sharedWithMe.ts
index 9430bd52f2b..78ba623c12c 100644
--- a/tests/e2e/support/page/files/sharedWithMe.ts
+++ b/tests/e2e/support/page/files/sharedWithMe.ts
@@ -11,7 +11,7 @@ export class SharedWithMePage {
 
   async navigate(): Promise<void> {
     const { page } = this.actor
-    await page.locator('a[href="#/files/shares/with-me"]').click()
+    await page.locator('//a[@data-nav-name="files-shares-with-me"]').click()
   }
 
   async acceptShare({ name }: { name: string }): Promise<void> {
diff --git a/tests/e2e/support/page/runtime.ts b/tests/e2e/support/page/runtime.ts
index 3df5c80f473..60a005bed01 100644
--- a/tests/e2e/support/page/runtime.ts
+++ b/tests/e2e/support/page/runtime.ts
@@ -10,7 +10,11 @@ export class RuntimePage {
   async navigateToApp({ name }: { name: string }): Promise<void> {
     const { page } = this.actor
     await page.locator('#_appSwitcherButton').click()
-    await page.locator(`a[href="#/${name}"]`).click()
+    await page
+      .locator(
+        `//ul[contains(@class, "applications-list")]//a[@href="#/${name}" or @href="/${name}"]`
+      )
+      .click()
   }
 
   async logout(): Promise<void> {