diff --git a/changelog/unreleased/change-auth-store b/changelog/unreleased/change-auth-store
new file mode 100644
index 00000000000..b6d1025d072
--- /dev/null
+++ b/changelog/unreleased/change-auth-store
@@ -0,0 +1,16 @@
+Change: Auth store to pinia
+
+BREAKING CHANGE for developers: Auth information is no longer stored in a vuex store but in pinia instead. You can access all the store functionality via the new `useAuthStore` composable.
+
+Note that the following composables have also been removed in favour of the pinia composable:
+
+- `useAccessToken`
+- `usePublicLinkContext`
+- `usePublicLinkPassword`
+- `usePublicLinkToken`
+- `useUserContext`
+
+For more details please see the linked PR down below.
+
+https://github.com/owncloud/web/pull/10323
+https://github.com/owncloud/web/issues/10210
diff --git a/packages/web-app-admin-settings/package.json b/packages/web-app-admin-settings/package.json
index 33120092bd8..1977c75731a 100644
--- a/packages/web-app-admin-settings/package.json
+++ b/packages/web-app-admin-settings/package.json
@@ -22,7 +22,6 @@
     "pinia": "2.1.7",
     "uuid": "9.0.1",
     "vue-concurrency": "4.0.1",
-    "vuex": "4.1.0",
     "web-app-admin-settings": "workspace:*"
   }
 }
diff --git a/packages/web-app-admin-settings/src/views/Spaces.vue b/packages/web-app-admin-settings/src/views/Spaces.vue
index 7c8efdff6ff..6c03654fb59 100644
--- a/packages/web-app-admin-settings/src/views/Spaces.vue
+++ b/packages/web-app-admin-settings/src/views/Spaces.vue
@@ -68,7 +68,6 @@ import {
   eventBus,
   configurationManager,
   queryItemAsString,
-  useAccessToken,
   useClientService,
   useRouteQuery,
   useSideBar,
@@ -99,7 +98,6 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
-    const accessToken = useAccessToken({ store })
     const spaces = ref([])
     const clientService = useClientService()
     const { $gettext } = useGettext()
@@ -272,7 +270,6 @@ export default defineComponent({
       sideBarActivePanel,
       spaces,
       loadResourcesTask,
-      accessToken,
       breadcrumbs,
       batchActions,
       selectedSpaces,
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index 1c77fcccd59..edb6069788e 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -152,7 +152,6 @@ import {
   NoContentMessage,
   eventBus,
   queryItemAsString,
-  useAccessToken,
   useCapabilitySpacesMaxQuota,
   useClientService,
   useConfigurationManager,
@@ -199,7 +198,6 @@ export default defineComponent({
     const route = useRoute()
     const store = useStore()
     const { showErrorMessage } = useMessages()
-    const accessToken = useAccessToken({ store })
     const clientService = useClientService()
     const configurationManager = useConfigurationManager()
     const userStore = useUserStore()
@@ -627,7 +625,6 @@ export default defineComponent({
       loadResourcesTask,
       loadAdditionalUserDataTask,
       clientService,
-      accessToken,
       batchActions,
       filterGroups,
       filterRoles,
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 1f5ba208a70..1196930cd85 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -204,7 +204,6 @@ import {
   useCapabilityShareJailEnabled,
   useCapabilitySpacesEnabled,
   useStore,
-  useUserContext,
   useClientService
 } from '@ownclouders/web-pkg'
 
@@ -432,7 +431,6 @@ export default defineComponent({
       isSpacesGenericLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-generic'),
       hasShareJail: useCapabilityShareJailEnabled(),
       hasSpaces: useCapabilitySpacesEnabled(),
-      isUserContext: useUserContext({ store }),
       canUpload,
       currentFolder,
       createNewFileActions,
diff --git a/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue b/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue
index 5b2ba8e6cdd..34064411578 100644
--- a/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue
+++ b/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue
@@ -67,7 +67,7 @@ export default defineComponent({
       store,
       spaceImageInput
     })
-    const { actions: downloadArchiveActions } = useFileActionsDownloadArchive({ store })
+    const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
 
     const actions = computed(() =>
       [
diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
index e0a9335da3a..9724e0110f9 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -19,7 +19,7 @@
         <resource-icon class="details-icon" :resource="resource" size="xxxlarge" />
       </div>
       <div
-        v-if="!isPublicLinkContext && shareIndicators.length"
+        v-if="!publicLinkContextReady && shareIndicators.length"
         key="file-shares"
         data-testid="sharingInfo"
         class="oc-flex oc-flex-middle oc-my-m"
@@ -125,13 +125,17 @@
 import { storeToRefs } from 'pinia'
 import { computed, defineComponent, inject, Ref, ref, unref, watch } from 'vue'
 import { mapGetters } from 'vuex'
-import { ImageDimension, useConfigurationManager, useUserStore } from '@ownclouders/web-pkg'
+import {
+  ImageDimension,
+  useAuthStore,
+  useConfigurationManager,
+  useUserStore
+} from '@ownclouders/web-pkg'
 import upperFirst from 'lodash-es/upperFirst'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
 import {
   useCapabilityFilesTags,
   useClientService,
-  usePublicLinkContext,
   useStore,
   usePreviewService,
   useGetMatchingSpace
@@ -152,7 +156,7 @@ import { AncestorMetaData, ResourceIcon } from '@ownclouders/web-pkg'
 import { tagsHelper } from '../../../helpers/contextualHelpers'
 import { ContextualHelper } from '@ownclouders/design-system/src/helpers'
 import TagsSelect from './TagsSelect.vue'
-import WebDavDetails from '@ownclouders/web-pkg/src/components/SideBar/WebDavDetails.vue'
+import { WebDavDetails } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'FileDetails',
@@ -181,13 +185,15 @@ export default defineComponent({
 
     const resource = inject<Ref<Resource>>('resource')
     const space = inject<Ref<SpaceResource>>('space')
-    const isPublicLinkContext = usePublicLinkContext({ store })
     const previewService = usePreviewService()
     const preview = ref(undefined)
 
+    const authStore = useAuthStore()
+    const { publicLinkContextReady } = storeToRefs(authStore)
+
     const loadData = async () => {
       const calls = []
-      if (unref(resource).type === 'file' && !unref(isPublicLinkContext)) {
+      if (unref(resource).type === 'file' && !unref(publicLinkContextReady)) {
         calls.push(
           store.dispatch('Files/loadVersions', {
             client: clientService.webdav,
@@ -269,7 +275,7 @@ export default defineComponent({
     return {
       user,
       preview,
-      isPublicLinkContext,
+      publicLinkContextReady,
       space,
       resource,
       hasTags,
@@ -309,7 +315,7 @@ export default defineComponent({
       return this.showShares && this.sharedAncestor
     },
     showShares() {
-      if (this.isPublicLinkContext) {
+      if (this.publicLinkContextReady) {
         return false
       }
       return this.hasAnyShares
@@ -340,7 +346,7 @@ export default defineComponent({
       return this.resourceSize !== '?'
     },
     showVersions() {
-      if (this.resource.type === 'folder' || this.isPublicLinkContext) {
+      if (this.resource.type === 'folder' || this.publicLinkContextReady) {
         return
       }
       return this.versions.length > 0
diff --git a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
index 63b2f9002e5..994de6341c8 100644
--- a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
+++ b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
@@ -82,7 +82,7 @@ export default defineComponent({
     const store = useStore()
     const clientService = useClientService()
     const { current: currentLanguage } = useGettext()
-    const { downloadFile } = useDownloadFile({ store, clientService })
+    const { downloadFile } = useDownloadFile({ clientService })
 
     const space = inject<Ref<SpaceResource>>('space')
     const resource = inject<Ref<Resource>>('resource')
diff --git a/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue b/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
index 76046085ffb..6f3e65a2920 100644
--- a/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
+++ b/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
@@ -65,7 +65,7 @@ export default defineComponent({
     const { actions: restoreActions } = useSpaceActionsRestore({ store })
     const { actions: showDetailsActions } = useFileActionsShowDetails({ store })
     const { actions: showMembersActions } = useSpaceActionsShowMembers({ store })
-    const { actions: downloadArchiveActions } = useFileActionsDownloadArchive({ store })
+    const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: navigateToTrashActions } = useSpaceActionsNavigateToTrash()
 
     const spaceImageInput: VNodeRef = ref(null)
diff --git a/packages/web-app-files/src/views/FilesDrop.vue b/packages/web-app-files/src/views/FilesDrop.vue
index 925235558b2..e77944e3f84 100644
--- a/packages/web-app-files/src/views/FilesDrop.vue
+++ b/packages/web-app-files/src/views/FilesDrop.vue
@@ -40,6 +40,7 @@ import { mapGetters } from 'vuex'
 import {
   createLocationPublic,
   createLocationSpaces,
+  useAuthStore,
   useMessages,
   useThemeStore,
   useUserStore
@@ -58,13 +59,11 @@ import {
 import { useGettext } from 'vue3-gettext'
 import {
   useClientService,
-  usePublicLinkToken,
   useStore,
   useRouter,
   useRoute,
   useCapabilitySpacesEnabled,
   useGetMatchingSpace,
-  useUserContext,
   useRouteQuery,
   queryItemAsString,
   useUpload
@@ -94,8 +93,7 @@ export default defineComponent({
     const hasSpaces = useCapabilitySpacesEnabled(store)
     const authService = useAuthService()
     const clientService = useClientService()
-    const publicToken = usePublicLinkToken({ store })
-    const isUserContext = useUserContext({ store })
+    const authStore = useAuthStore()
     const { getInternalSpace } = useGetMatchingSpace()
     useUpload({ uppyService })
 
@@ -152,7 +150,7 @@ export default defineComponent({
     const resolvePublicLink = async () => {
       loading.value = true
 
-      if (unref(isUserContext) && unref(fileId)) {
+      if (authStore.userContextReady && unref(fileId)) {
         try {
           const path = await clientService.webdav.getPathForFileId(unref(fileId))
           await resolveToInternalLocation(path)
@@ -164,7 +162,7 @@ export default defineComponent({
       }
 
       const spaces: SpaceResource[] = store.getters['runtime/spaces/spaces']
-      const space = spaces.find((s) => s.driveAlias === `public/${unref(publicToken)}`)
+      const space = spaces.find((s) => s.driveAlias === `public/${authStore.publicLinkToken}`)
 
       clientService.webdav
         .listFiles(space, {}, { depth: 0 })
@@ -174,7 +172,7 @@ export default defineComponent({
           if (linkRoleUploaderFolder.bitmask(false) !== sharePermissions) {
             router.replace(
               createLocationPublic('files-public-link', {
-                params: { driveAliasAndItem: `public/${unref(publicToken)}` }
+                params: { driveAliasAndItem: `public/${authStore.publicLinkToken}` }
               })
             )
             return
diff --git a/packages/web-app-files/src/views/spaces/DriveResolver.vue b/packages/web-app-files/src/views/spaces/DriveResolver.vue
index 66bf0107312..95b75e7ca66 100644
--- a/packages/web-app-files/src/views/spaces/DriveResolver.vue
+++ b/packages/web-app-files/src/views/spaces/DriveResolver.vue
@@ -16,6 +16,7 @@ import GenericTrash from './GenericTrash.vue'
 import { computed, defineComponent, onMounted, ref, unref } from 'vue'
 import {
   queryItemAsString,
+  useAuthStore,
   useClientService,
   useConfigurationManager,
   useDriveResolver,
@@ -23,8 +24,7 @@ import {
   useRouteParam,
   useRouteQuery,
   useRouter,
-  useStore,
-  useUserContext
+  useStore
 } from '@ownclouders/web-pkg'
 import { useActiveLocation } from '@ownclouders/web-pkg'
 import { createLocationSpaces, isLocationTrashActive } from '@ownclouders/web-pkg'
@@ -50,7 +50,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
-    const isUserContext = useUserContext({ store })
+    const authStore = useAuthStore()
     const clientService = useClientService()
     const router = useRouter()
     const driveAliasAndItem = useRouteParam('driveAliasAndItem')
@@ -135,7 +135,7 @@ export default defineComponent({
       const space = unref(resolvedDrive.space)
       if (space && isPublicSpaceResource(space)) {
         const isRunningOnEos = store.getters.configuration?.options?.runningOnEos
-        if (unref(isUserContext) && unref(fileId) && !isRunningOnEos) {
+        if (authStore.userContextReady && unref(fileId) && !isRunningOnEos) {
           try {
             const path = await clientService.webdav.getPathForFileId(unref(fileId))
             await resolveToInternalLocation(path)
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
index 18f8a0286d2..818e967d8f0 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.ts
@@ -18,7 +18,6 @@ import { ref } from 'vue'
 
 jest.mock('@ownclouders/web-pkg', () => ({
   ...jest.requireActual('@ownclouders/web-pkg'),
-  useAccessToken: jest.fn(),
   useExtensionRegistry: jest.fn(),
   useRequest: jest.fn(),
   useFileActionsCreateNewFile: jest.fn(),
diff --git a/packages/web-app-files/tests/unit/components/FilesList/ResourceDetails.spec.ts b/packages/web-app-files/tests/unit/components/FilesList/ResourceDetails.spec.ts
index 16630c1de7b..a315619be89 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/ResourceDetails.spec.ts
+++ b/packages/web-app-files/tests/unit/components/FilesList/ResourceDetails.spec.ts
@@ -15,6 +15,7 @@ import { ref } from 'vue'
 
 jest.mock('@ownclouders/web-pkg', () => ({
   ...jest.requireActual('@ownclouders/web-pkg'),
+  getIndicators: jest.fn(() => []),
   useRouteQuery: jest.fn(),
   useFileActions: jest.fn()
 }))
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Details/FileDetails.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Details/FileDetails.spec.ts
index ffe0aa8212d..05833db507e 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Details/FileDetails.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Details/FileDetails.spec.ts
@@ -208,9 +208,6 @@ function createWrapper({
   storeOptions.modules.runtime.modules.ancestorMetaData.getters.ancestorMetaData.mockReturnValue(
     ancestorMetaData
   )
-  storeOptions.modules.runtime.modules.auth.getters.isPublicLinkContextReady.mockReturnValue(
-    isPublicLinkContext
-  )
   const store = createStore(storeOptions)
 
   const spacesLocation = createLocationSpaces('files-spaces-generic')
@@ -226,7 +223,15 @@ function createWrapper({
           resource,
           space: mockDeep<SpaceResource>()
         },
-        plugins: [...defaultPlugins({ piniaOptions: { userState: { user } } }), store],
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: {
+              userState: { user },
+              authState: { publicLinkContextReady: isPublicLinkContext }
+            }
+          }),
+          store
+        ],
         mocks
       }
     })
diff --git a/packages/web-app-files/tests/unit/components/SideBar/TagsSelect.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/TagsSelect.spec.ts
index 7a565477382..d943b0ccc95 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/TagsSelect.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/TagsSelect.spec.ts
@@ -11,11 +11,6 @@ import { mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 import { ClientService, eventBus, useMessages } from '@ownclouders/web-pkg'
 
-jest.mock('@ownclouders/web-pkg', () => ({
-  ...jest.requireActual('@ownclouders/web-pkg'),
-  useAccessToken: jest.fn()
-}))
-
 describe('Tag Select', () => {
   it('show tags input form if loaded successfully', () => {
     const resource = mockDeep<Resource>({ tags: [] })
diff --git a/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts b/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
index 752cc85714c..1fb1ec6d4db 100644
--- a/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
+++ b/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
@@ -10,6 +10,7 @@ import {
 } from 'web-test-helpers'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { ClientService } from '@ownclouders/web-pkg'
+import { ListFilesResult } from '@ownclouders/web-client/src/webdav/listFiles'
 
 describe('FilesDrop view', () => {
   describe('different files view states', () => {
@@ -29,7 +30,7 @@ describe('FilesDrop view', () => {
 
 function getMountedWrapper() {
   const $clientService = mockDeep<ClientService>()
-  $clientService.webdav.listFiles.mockReturnValue(undefined)
+  $clientService.webdav.listFiles.mockResolvedValue(mock<ListFilesResult>())
   const defaultMocks = {
     ...defaultComponentMocks({
       currentRoute: mock<RouteLocation>({ name: 'files-common-favorites' })
diff --git a/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts b/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
index a8d8c513eca..976c29b1a2e 100644
--- a/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
@@ -149,16 +149,18 @@ function getMountedWrapper({
     ...(mocks && mocks)
   }
   const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.modules.runtime.modules.auth.getters.isUserContextReady.mockReturnValue(
-    isUserContextReady
-  )
   const store = createStore(storeOptions)
   return {
     mocks: defaultMocks,
     storeOptions,
     wrapper: mount(DriveResolver, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: { authState: { userContextReady: isUserContextReady } }
+          }),
+          store
+        ],
         mocks: defaultMocks,
         provide: defaultMocks,
         stubs: { ...defaultStubs, 'app-banner': true }
diff --git a/packages/web-app-importer/src/extensions.ts b/packages/web-app-importer/src/extensions.ts
index 688dd0f6a41..cbdce730f6d 100644
--- a/packages/web-app-importer/src/extensions.ts
+++ b/packages/web-app-importer/src/extensions.ts
@@ -1,10 +1,10 @@
 import { storeToRefs } from 'pinia'
 import {
   useStore,
-  usePublicLinkContext,
   useThemeStore,
   useModals,
-  useUserStore
+  useUserStore,
+  useAuthStore
 } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 import { useService } from '@ownclouders/web-pkg'
@@ -24,7 +24,7 @@ export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
   const userStore = useUserStore()
   const { $gettext } = useGettext()
   const uppyService = useService<UppyService>('$uppyService')
-  const publicLinkContext = usePublicLinkContext({ store })
+  const authStore = useAuthStore()
   const themeStore = useThemeStore()
   const { currentTheme } = storeToRefs(themeStore)
   const { dispatchModal, removeModal, activeModal } = useModals()
@@ -134,7 +134,7 @@ export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
                 return false
               }
 
-              if (unref(publicLinkContext)) {
+              if (authStore.publicLinkContextReady) {
                 return false
               }
 
diff --git a/packages/web-app-importer/tests/unit/extensions.spec.ts b/packages/web-app-importer/tests/unit/extensions.spec.ts
index 1f9c149fb4f..b33b6c4e653 100644
--- a/packages/web-app-importer/tests/unit/extensions.spec.ts
+++ b/packages/web-app-importer/tests/unit/extensions.spec.ts
@@ -143,7 +143,6 @@ function getWrapper({
   }
   const storeOptions = defaultStoreMockOptions
   storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
-  storeOptions.modules.runtime.modules.auth.getters.isPublicLinkContextReady.mockReturnValue(false)
   const store = createStore(storeOptions)
   return {
     wrapper: getComposableWrapper(setup, {
diff --git a/packages/web-app-ocm/src/views/IncomingInvitations.vue b/packages/web-app-ocm/src/views/IncomingInvitations.vue
index 1017e9a3b6d..e0786dcf48b 100644
--- a/packages/web-app-ocm/src/views/IncomingInvitations.vue
+++ b/packages/web-app-ocm/src/views/IncomingInvitations.vue
@@ -61,7 +61,6 @@
 <script lang="ts">
 import { computed, defineComponent, onMounted, ref, unref, VNodeRef } from 'vue'
 import {
-  useStore,
   queryItemAsString,
   useClientService,
   useRoute,
@@ -77,7 +76,6 @@ import { providerListSchema } from '../schemas'
 export default defineComponent({
   emits: ['highlightNewConnections'],
   setup(props, { emit }) {
-    const store = useStore()
     const { showErrorMessage } = useMessages()
     const router = useRouter()
     const clientService = useClientService()
diff --git a/packages/web-app-search/package.json b/packages/web-app-search/package.json
index 2869e857fde..0c7efb49daf 100644
--- a/packages/web-app-search/package.json
+++ b/packages/web-app-search/package.json
@@ -14,6 +14,7 @@
     "@ownclouders/web-client": "workspace:*",
     "@ownclouders/web-pkg": "workspace:*",
     "lodash-es": "^4.17.21",
+    "pinia": "2.1.7",
     "vue3-gettext": "2.4.0",
     "web-app-files": "workspace:*"
   }
diff --git a/packages/web-app-search/src/portals/SearchBar.vue b/packages/web-app-search/src/portals/SearchBar.vue
index 702c5275941..750406d92a2 100644
--- a/packages/web-app-search/src/portals/SearchBar.vue
+++ b/packages/web-app-search/src/portals/SearchBar.vue
@@ -104,11 +104,13 @@
 import {
   createLocationCommon,
   isLocationCommonActive,
-  isLocationSpacesActive
+  isLocationSpacesActive,
+  useAuthStore
 } from '@ownclouders/web-pkg'
 import Mark from 'mark.js'
+import { storeToRefs } from 'pinia'
 import { debounce } from 'lodash-es'
-import { useRouteQuery, useRouter, useStore, useUserContext } from '@ownclouders/web-pkg'
+import { useRouteQuery, useRouter, useStore } from '@ownclouders/web-pkg'
 import { eventBus } from '@ownclouders/web-pkg'
 import { computed, defineComponent, GlobalComponents, inject, Ref, ref, unref, watch } from 'vue'
 import { SearchLocationFilterConstants } from '@ownclouders/web-pkg'
@@ -125,6 +127,10 @@ export default defineComponent({
     const isMobileWidth = inject<Ref<boolean>>('isMobileWidth')
     const scopeQueryValue = useRouteQuery('scope')
     const availableProviders = useAvailableProviders()
+
+    const authStore = useAuthStore()
+    const { userContextReady } = storeToRefs(authStore)
+
     const locationFilterId = ref(SearchLocationFilterConstants.everywhere)
     const optionsDropRef = ref(null)
     const activePreviewIndex = ref(null)
@@ -271,7 +277,7 @@ export default defineComponent({
     }
 
     return {
-      isUserContext: useUserContext({ store }),
+      userContextReady,
       showCancelButton,
       onLocationFilterChange,
       currentFolderAvailable,
@@ -308,7 +314,7 @@ export default defineComponent({
     },
 
     isSearchBarEnabled() {
-      return this.availableProviders.length && this.isUserContext
+      return this.availableProviders.length && this.userContextReady
     },
     displayProviders() {
       /**
diff --git a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
index 3406484463c..8d0fde261ae 100644
--- a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
+++ b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
@@ -246,15 +246,17 @@ function getMountedWrapper({
   }
 
   const storeOptions = defaultStoreMockOptions
-  storeOptions.modules.runtime.modules.auth.getters.isUserContextReady.mockImplementation(
-    () => isUserContextReady
-  )
   const store = createStore(storeOptions)
   return {
     wrapper: mount(SearchBar, {
       attachTo: document.body,
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: { authState: { userContextReady: isUserContextReady } }
+          }),
+          store
+        ],
         mocks: localMocks,
         provide: localMocks,
         stubs: {
diff --git a/packages/web-pkg/src/components/AppBar/AppBar.vue b/packages/web-pkg/src/components/AppBar/AppBar.vue
index 2104f6e1fa8..5782c4d22f6 100644
--- a/packages/web-pkg/src/components/AppBar/AppBar.vue
+++ b/packages/web-pkg/src/components/AppBar/AppBar.vue
@@ -157,7 +157,7 @@ export default defineComponent({
     const { actions: duplicateActions } = useSpaceActionsDuplicate({ store })
     const { actions: declineShareActions } = useFileActionsDeclineShare({ store })
     const { actions: deleteActions } = useFileActionsDelete({ store })
-    const { actions: downloadArchiveActions } = useFileActionsDownloadArchive({ store })
+    const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: downloadFileActions } = useFileActionsDownloadFile()
     const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin({ store })
     const { actions: moveActions } = useFileActionsMove({ store })
diff --git a/packages/web-pkg/src/components/FilesList/ContextActions.vue b/packages/web-pkg/src/components/FilesList/ContextActions.vue
index e24bd6b1f44..cbec34c82c0 100644
--- a/packages/web-pkg/src/components/FilesList/ContextActions.vue
+++ b/packages/web-pkg/src/components/FilesList/ContextActions.vue
@@ -59,7 +59,7 @@ export default defineComponent({
     const { actions: createQuickLinkActions } = useFileActionsCopyQuickLink()
     const { actions: declineShareActions } = useFileActionsDeclineShare({ store })
     const { actions: deleteActions } = useFileActionsDelete({ store })
-    const { actions: downloadArchiveActions } = useFileActionsDownloadArchive({ store })
+    const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: downloadFileActions } = useFileActionsDownloadFile()
     const { actions: favoriteActions } = useFileActionsFavorite({ store })
     const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin({ store })
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index e11dedd4fa3..0a1f9135b04 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -97,7 +97,7 @@
     </template>
     <template #tags="{ item }">
       <component
-        :is="isUserContext ? 'router-link' : 'span'"
+        :is="userContextReady ? 'router-link' : 'span'"
         v-for="tag in item.tags.slice(0, 2)"
         :key="tag"
         v-bind="getTagComponentAttrs(tag)"
@@ -227,13 +227,12 @@ import {
   useCapabilityProjectSpacesEnabled,
   useCapabilityShareJailEnabled,
   SortDir,
-  useStore,
-  useUserContext,
   ViewModeConstants,
   useConfigurationManager,
   useGetMatchingSpace,
   useFolderLink,
-  useEmbedMode
+  useEmbedMode,
+  useAuthStore
 } from '../../composables'
 import ResourceListItem from './ResourceListItem.vue'
 import ResourceGhostElement from './ResourceGhostElement.vue'
@@ -258,7 +257,7 @@ import get from 'lodash-es/get'
 
 // ODS component import is necessary here for CERN to overwrite OcTable
 import OcTable from 'design-system/src/components/OcTable/OcTable.vue'
-import { useGettext } from 'vue3-gettext'
+import { storeToRefs } from 'pinia'
 
 const TAGS_MINIMUM_SCREEN_WIDTH = 850
 
@@ -452,12 +451,13 @@ export default defineComponent({
     'update:modelValue'
   ],
   setup(props, context) {
-    const store = useStore()
     const configurationManager = useConfigurationManager()
     const { getMatchingSpace } = useGetMatchingSpace()
-    const { $gettext } = useGettext()
     const { isLocationPicker } = useEmbedMode()
 
+    const authStore = useAuthStore()
+    const { userContextReady } = storeToRefs(authStore)
+
     const dragItem = ref<Resource>()
     const ghostElement = ref()
 
@@ -496,7 +496,7 @@ export default defineComponent({
       isResourceDisabled,
       hasShareJail: useCapabilityShareJailEnabled(),
       hasProjectSpaces: useCapabilityProjectSpacesEnabled(),
-      isUserContext: useUserContext({ store }),
+      userContextReady,
       getMatchingSpace,
       ...useResourceRouteResolver(
         {
@@ -764,7 +764,7 @@ export default defineComponent({
       })
     },
     getTagComponentAttrs(tag) {
-      if (!this.isUserContext) {
+      if (!this.userContextReady) {
         return {}
       }
 
diff --git a/packages/web-pkg/src/components/SideBar/index.ts b/packages/web-pkg/src/components/SideBar/index.ts
index c3d796c4138..54b1f9b13c8 100644
--- a/packages/web-pkg/src/components/SideBar/index.ts
+++ b/packages/web-pkg/src/components/SideBar/index.ts
@@ -5,4 +5,4 @@ export * from './types'
 export { default as CompareSaveDialog } from './CompareSaveDialog.vue'
 export { default as SideBar } from './SideBar.vue'
 export { default as FileSideBar } from './FileSideBar.vue'
-export { default as WevDavDetails } from './WebDavDetails.vue'
+export { default as WebDavDetails } from './WebDavDetails.vue'
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActions.ts b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
index 4b2ebc9bf13..10d49a10fe3 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActions.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
@@ -59,7 +59,7 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
   const { actions: copyActions } = useFileActionsCopy({ store })
   const { actions: deleteActions } = useFileActionsDelete({ store })
   const { actions: declineShareActions } = useFileActionsDeclineShare({ store })
-  const { actions: downloadArchiveActions } = useFileActionsDownloadArchive({ store })
+  const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
   const { actions: downloadFileActions } = useFileActionsDownloadFile()
   const { actions: favoriteActions } = useFileActionsFavorite({ store })
   const { actions: moveActions } = useFileActionsMove({ store })
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsDownloadArchive.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsDownloadArchive.ts
index 3d479f458d2..3c57b417302 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsDownloadArchive.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsDownloadArchive.ts
@@ -12,27 +12,23 @@ import {
   isPublicSpaceResource,
   Resource
 } from '@ownclouders/web-client/src/helpers'
-import { Store } from 'vuex'
 import { computed, unref } from 'vue'
-import { usePublicLinkPassword } from '../../authContext'
 import { useLoadingService } from '../../loadingService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 
 import { FileAction, FileActionOptions } from '../types'
 import { useGettext } from 'vue3-gettext'
 import { useArchiverService } from '../../archiverService'
 import { formatFileSize } from '../../../helpers/filesize'
-import { useMessages } from '../../piniaStores'
+import { useAuthStore, useMessages } from '../../piniaStores'
 
-export const useFileActionsDownloadArchive = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsDownloadArchive = () => {
   const { showErrorMessage } = useMessages()
   const router = useRouter()
   const loadingService = useLoadingService()
   const archiverService = useArchiverService()
   const { $ngettext, $gettext, current } = useGettext()
-  const publicLinkPassword = usePublicLinkPassword({ store })
+  const authStore = useAuthStore()
   const isFilesAppActive = useIsFilesAppActive()
 
   const handler = ({ space, resources }: FileActionOptions) => {
@@ -56,7 +52,7 @@ export const useFileActionsDownloadArchive = ({ store }: { store?: Store<any> }
         ...(space &&
           isPublicSpaceResource(space) && {
             publicToken: space.id as string,
-            publicLinkPassword: unref(publicLinkPassword)
+            publicLinkPassword: authStore.publicLinkPassword
           })
       })
       .catch((e) => {
diff --git a/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts b/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
index f8148bc2fe7..cdb96c996a7 100644
--- a/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
+++ b/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
@@ -16,11 +16,13 @@ import { useAppConfig, AppConfigResult } from './useAppConfig'
 import { useAppFileHandling, AppFileHandlingResult } from './useAppFileHandling'
 import { useAppFolderHandling, AppFolderHandlingResult } from './useAppFolderHandling'
 import { useAppDocumentTitle } from './useAppDocumentTitle'
-import { RequestResult, usePublicLinkContext, useRequest } from '../authContext'
+import { RequestResult, useRequest } from '../authContext'
 import { useClientService } from '../clientService'
 import { MaybeRef } from '../../utils'
 import { useDriveResolver } from '../driveResolver'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
+import { useAuthStore } from '../piniaStores'
+import { storeToRefs } from 'pinia'
 
 // TODO: this file/folder contains file/folder loading logic extracted from preview and drawio extensions
 // Discussion how to progress from here can be found in this issue:
@@ -48,7 +50,8 @@ export function useAppDefaults(options: AppDefaultsOptions): AppDefaultsResult {
   const clientService = options.clientService ?? useClientService()
   const applicationId = options.applicationId
 
-  const isPublicLinkContext = usePublicLinkContext({ store })
+  const authStore = useAuthStore()
+  const { publicLinkContextReady } = storeToRefs(authStore)
 
   const driveAliasAndItem = useRouteParam('driveAliasAndItem')
   const { space, item, itemId, loading } = useDriveResolver({
@@ -88,7 +91,7 @@ export function useAppDefaults(options: AppDefaultsOptions): AppDefaultsResult {
   })
 
   return {
-    isPublicLinkContext,
+    isPublicLinkContext: publicLinkContextReady,
     currentFileContext,
     ...useAppConfig({ store, ...options }),
     ...useAppNavigation({ router, currentFileContext }),
@@ -101,6 +104,6 @@ export function useAppDefaults(options: AppDefaultsOptions): AppDefaultsResult {
       store,
       currentRoute
     }),
-    ...useRequest({ clientService, store, currentRoute: unref(currentRoute) })
+    ...useRequest({ clientService, currentRoute: unref(currentRoute) })
   }
 }
diff --git a/packages/web-pkg/src/composables/authContext/index.ts b/packages/web-pkg/src/composables/authContext/index.ts
index 48ec33b2701..8a57b72bb8a 100644
--- a/packages/web-pkg/src/composables/authContext/index.ts
+++ b/packages/web-pkg/src/composables/authContext/index.ts
@@ -1,7 +1,2 @@
-export * from './useAccessToken'
 export * from './useAuthService'
-export * from './usePublicLinkContext'
-export * from './usePublicLinkPassword'
-export * from './usePublicLinkToken'
 export * from './useRequest'
-export * from './useUserContext'
diff --git a/packages/web-pkg/src/composables/authContext/useAccessToken.ts b/packages/web-pkg/src/composables/authContext/useAccessToken.ts
deleted file mode 100644
index a8304ca3df6..00000000000
--- a/packages/web-pkg/src/composables/authContext/useAccessToken.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Store } from 'vuex'
-import { computed } from 'vue'
-
-interface AccessTokenOptions {
-  store: Store<any>
-}
-
-export const useAccessToken = ({ store }: AccessTokenOptions) => {
-  return computed(() => {
-    return store.getters['runtime/auth/accessToken'] as string
-  })
-}
diff --git a/packages/web-pkg/src/composables/authContext/usePublicLinkContext.ts b/packages/web-pkg/src/composables/authContext/usePublicLinkContext.ts
deleted file mode 100644
index de4d0b78cf6..00000000000
--- a/packages/web-pkg/src/composables/authContext/usePublicLinkContext.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { computed } from 'vue'
-import { Store } from 'vuex'
-
-interface PublicLinkContextOptions {
-  store: Store<any>
-}
-
-export const usePublicLinkContext = ({ store }: PublicLinkContextOptions) => {
-  return computed((): boolean => {
-    return store.getters['runtime/auth/isPublicLinkContextReady']
-  })
-}
diff --git a/packages/web-pkg/src/composables/authContext/usePublicLinkPassword.ts b/packages/web-pkg/src/composables/authContext/usePublicLinkPassword.ts
deleted file mode 100644
index 1d5d0091f76..00000000000
--- a/packages/web-pkg/src/composables/authContext/usePublicLinkPassword.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Store } from 'vuex'
-import { computed } from 'vue'
-
-interface PublicLinkPasswordOptions {
-  store: Store<any>
-}
-
-export const usePublicLinkPassword = ({ store }: PublicLinkPasswordOptions) => {
-  return computed(() => {
-    return store.getters['runtime/auth/publicLinkPassword']
-  })
-}
diff --git a/packages/web-pkg/src/composables/authContext/usePublicLinkToken.ts b/packages/web-pkg/src/composables/authContext/usePublicLinkToken.ts
deleted file mode 100644
index 02a3e089866..00000000000
--- a/packages/web-pkg/src/composables/authContext/usePublicLinkToken.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { computed } from 'vue'
-import { Store } from 'vuex'
-
-interface PublicLinkTokenOptions {
-  store: Store<any>
-}
-
-export const usePublicLinkToken = ({ store }: PublicLinkTokenOptions) => {
-  return computed(() => {
-    return store.getters['runtime/auth/publicLinkToken']
-  })
-}
diff --git a/packages/web-pkg/src/composables/authContext/useRequest.ts b/packages/web-pkg/src/composables/authContext/useRequest.ts
index 0759bce0b5c..fc6069d3935 100644
--- a/packages/web-pkg/src/composables/authContext/useRequest.ts
+++ b/packages/web-pkg/src/composables/authContext/useRequest.ts
@@ -1,15 +1,12 @@
-import { unref } from 'vue'
 import { useClientService } from '../clientService'
-import type { Store } from 'vuex'
 import type { Router, RouteLocationNormalizedLoaded } from 'vue-router'
 import type { Method, AxiosRequestConfig, AxiosResponse } from 'axios'
 import { ClientService } from '../../services'
-import { useAccessToken, usePublicLinkPassword, usePublicLinkToken, usePublicLinkContext } from './'
-import { useStore } from '../store'
+import { AuthStore, useAuthStore } from '../piniaStores'
 
 interface RequestOptions {
   router?: Router
-  store?: Store<any>
+  authStore?: AuthStore
   clientService?: ClientService
   currentRoute?: RouteLocationNormalizedLoaded
 }
@@ -20,31 +17,27 @@ export interface RequestResult {
 
 export function useRequest(options: RequestOptions = {}): RequestResult {
   const clientService = options.clientService ?? useClientService()
-  const store = options.store ?? useStore()
-
-  const isPublicLinkContext = usePublicLinkContext({ store })
-  const publicLinkPassword = usePublicLinkPassword({ store })
-  const accessToken = useAccessToken({ store })
-  const publicToken = usePublicLinkToken({ store })
+  const authStore = options.authStore ?? useAuthStore()
 
   const makeRequest = (
     method: Method,
     url: string,
     config: AxiosRequestConfig = {}
   ): Promise<AxiosResponse> => {
-    const httpClient = unref(accessToken)
+    const httpClient = authStore.accessToken
       ? clientService.httpAuthenticated
       : clientService.httpUnAuthenticated
 
     config.headers = config.headers || {}
 
-    if (unref(isPublicLinkContext)) {
-      if (unref(publicLinkPassword)) {
+    if (authStore.publicLinkContextReady) {
+      if (authStore.publicLinkPassword) {
         config.headers.Authorization =
-          'Basic ' + Buffer.from(['public', unref(publicLinkPassword)].join(':')).toString('base64')
+          'Basic ' +
+          Buffer.from(['public', authStore.publicLinkPassword].join(':')).toString('base64')
       }
-      if (unref(publicToken)) {
-        config.headers['public-token'] = unref(publicToken)
+      if (authStore.publicLinkToken) {
+        config.headers['public-token'] = authStore.publicLinkToken
       }
     }
 
diff --git a/packages/web-pkg/src/composables/authContext/useUserContext.ts b/packages/web-pkg/src/composables/authContext/useUserContext.ts
deleted file mode 100644
index 0ec036df2dd..00000000000
--- a/packages/web-pkg/src/composables/authContext/useUserContext.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { computed } from 'vue'
-import { Store } from 'vuex'
-
-interface UserContextOptions {
-  store: Store<any>
-}
-
-export const useUserContext = ({ store }: UserContextOptions) => {
-  return computed(() => {
-    return store.getters['runtime/auth/isUserContextReady']
-  })
-}
diff --git a/packages/web-pkg/src/composables/download/useDownloadFile.ts b/packages/web-pkg/src/composables/download/useDownloadFile.ts
index 1b7b2b2dbbe..7dcd7640f10 100644
--- a/packages/web-pkg/src/composables/download/useDownloadFile.ts
+++ b/packages/web-pkg/src/composables/download/useDownloadFile.ts
@@ -1,34 +1,28 @@
 import { unref } from 'vue'
-import { usePublicLinkContext } from '../authContext'
 import { useClientService } from '../clientService'
-import { useStore } from '../store'
 import { triggerDownloadWithFilename } from '../../../src/helpers'
 import { useGettext } from 'vue3-gettext'
 import { useCapabilityCoreSupportUrlSigning } from '../capability'
-import { Store } from 'vuex'
 import { ClientService } from '../../services'
-import { useMessages } from '../piniaStores'
+import { useAuthStore, useMessages } from '../piniaStores'
 
 export interface DownloadFileOptions {
-  store?: Store<any>
   clientService?: ClientService
 }
 
 export const useDownloadFile = (options?: DownloadFileOptions) => {
-  const store = options?.store || useStore()
+  const authStore = useAuthStore()
   const { showErrorMessage } = useMessages()
-  const isPublicLinkContext = usePublicLinkContext({ store })
   const isUrlSigningEnabled = useCapabilityCoreSupportUrlSigning()
   const clientService = options?.clientService || useClientService()
   const { $gettext } = useGettext()
 
   const downloadFile = async (file, version = null) => {
     const { owncloudSdk: client } = clientService
-    const isUserContext = store.getters['runtime/auth/isUserContextReady']
 
     // construct the url and headers
     let url
-    if (unref(isPublicLinkContext)) {
+    if (authStore.publicLinkContextReady) {
       url = file.downloadURL
     } else {
       if (version === null) {
@@ -39,7 +33,7 @@ export const useDownloadFile = (options?: DownloadFileOptions) => {
     }
 
     // download with signing enabled
-    if (isUserContext && unref(isUrlSigningEnabled)) {
+    if (authStore.userContextReady && unref(isUrlSigningEnabled)) {
       const httpClient = clientService.httpAuthenticated
       try {
         const response = await httpClient.head(url)
diff --git a/packages/web-pkg/src/composables/piniaStores/auth.ts b/packages/web-pkg/src/composables/piniaStores/auth.ts
new file mode 100644
index 00000000000..7ab0efe0144
--- /dev/null
+++ b/packages/web-pkg/src/composables/piniaStores/auth.ts
@@ -0,0 +1,67 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export const useAuthStore = defineStore('auth', () => {
+  const accessToken = ref<string>()
+  const idpContextReady = ref(false)
+  const userContextReady = ref(false)
+  const publicLinkToken = ref<string>()
+  const publicLinkPassword = ref<string>()
+  const publicLinkType = ref<string>()
+  const publicLinkContextReady = ref(false)
+
+  const setAccessToken = (value: string) => {
+    accessToken.value = value
+  }
+  const setIdpContextReady = (value: boolean) => {
+    idpContextReady.value = value
+  }
+  const setUserContextReady = (value: boolean) => {
+    userContextReady.value = value
+  }
+  const setPublicLinkContext = (context: {
+    publicLinkToken: string
+    publicLinkPassword: string
+    publicLinkType: string
+    publicLinkContextReady: boolean
+  }) => {
+    publicLinkToken.value = context.publicLinkToken
+    publicLinkPassword.value = context.publicLinkPassword
+    publicLinkType.value = context.publicLinkType
+    publicLinkContextReady.value = context.publicLinkContextReady
+  }
+
+  const clearUserContext = () => {
+    setAccessToken(null)
+    setIdpContextReady(null)
+    setUserContextReady(null)
+  }
+
+  const clearPublicLinkContext = () => {
+    setPublicLinkContext({
+      publicLinkToken: null,
+      publicLinkPassword: null,
+      publicLinkType: null,
+      publicLinkContextReady: false
+    })
+  }
+
+  return {
+    accessToken,
+    idpContextReady,
+    userContextReady,
+    publicLinkToken,
+    publicLinkPassword,
+    publicLinkType,
+    publicLinkContextReady,
+
+    setAccessToken,
+    setIdpContextReady,
+    setUserContextReady,
+    setPublicLinkContext,
+    clearUserContext,
+    clearPublicLinkContext
+  }
+})
+
+export type AuthStore = ReturnType<typeof useAuthStore>
diff --git a/packages/web-pkg/src/composables/piniaStores/index.ts b/packages/web-pkg/src/composables/piniaStores/index.ts
index 544adedd993..4f06abc1885 100644
--- a/packages/web-pkg/src/composables/piniaStores/index.ts
+++ b/packages/web-pkg/src/composables/piniaStores/index.ts
@@ -1,3 +1,4 @@
+export * from './auth'
 export * from './extensionRegistry'
 export * from './messages'
 export * from './modals'
diff --git a/packages/web-pkg/src/composables/upload/useUpload.ts b/packages/web-pkg/src/composables/upload/useUpload.ts
index 1dd7bd1d9b2..09fb733426d 100644
--- a/packages/web-pkg/src/composables/upload/useUpload.ts
+++ b/packages/web-pkg/src/composables/upload/useUpload.ts
@@ -1,5 +1,4 @@
 import { useStore } from '../store'
-import { useAccessToken, usePublicLinkContext, usePublicLinkPassword } from '../authContext'
 import {
   useCapabilityFilesTusExtension,
   useCapabilityFilesTusSupportHttpMethodOverride,
@@ -9,6 +8,7 @@ import { computed, unref, watch } from 'vue'
 import { UppyService } from '../../services/uppy/uppyService'
 import { v4 as uuidV4 } from 'uuid'
 import { useGettext } from 'vue3-gettext'
+import { useAuthStore } from '../piniaStores'
 
 interface UploadOptions {
   uppyService: UppyService
@@ -17,9 +17,7 @@ interface UploadOptions {
 export function useUpload(options: UploadOptions) {
   const store = useStore()
   const { current: currentLanguage } = useGettext()
-  const publicLinkPassword = usePublicLinkPassword({ store })
-  const isPublicLinkContext = usePublicLinkContext({ store })
-  const accessToken = useAccessToken({ store })
+  const authStore = useAuthStore()
 
   const tusHttpMethodOverride = useCapabilityFilesTusSupportHttpMethodOverride()
   const tusMaxChunkSize = useCapabilityFilesTusSupportMaxChunkSize()
@@ -27,8 +25,8 @@ export function useUpload(options: UploadOptions) {
 
   const headers = computed((): { [key: string]: string } => {
     const headers = { 'Accept-Language': currentLanguage }
-    if (unref(isPublicLinkContext)) {
-      const password = unref(publicLinkPassword)
+    if (authStore.publicLinkContextReady) {
+      const password = authStore.publicLinkPassword
       if (password) {
         return {
           ...headers,
@@ -40,7 +38,7 @@ export function useUpload(options: UploadOptions) {
     }
     return {
       ...headers,
-      Authorization: 'Bearer ' + unref(accessToken)
+      Authorization: 'Bearer ' + authStore.accessToken
     }
   })
 
diff --git a/packages/web-pkg/src/services/client/client.ts b/packages/web-pkg/src/services/client/client.ts
index 71e220821d0..0a7fbfcffb2 100644
--- a/packages/web-pkg/src/services/client/client.ts
+++ b/packages/web-pkg/src/services/client/client.ts
@@ -6,10 +6,10 @@ import { v4 as uuidV4 } from 'uuid'
 import { WebDAV } from '@ownclouders/web-client/src/webdav'
 import { OwnCloudSdk } from '@ownclouders/web-client/src/types'
 import { ConfigurationManager } from '../../configuration'
-import { Store } from 'vuex'
 import { Language } from 'vue3-gettext'
 import { FetchEventSourceInit } from '@microsoft/fetch-event-source'
 import { sse } from '@ownclouders/web-client/src/sse'
+import { AuthStore } from '../../composables'
 
 interface OcClient {
   token: string
@@ -53,13 +53,13 @@ const createAxiosInstance = (authParams: AuthParameters, language: string): Axio
 export interface ClientServiceOptions {
   configurationManager: ConfigurationManager
   language: Language
-  store: Store<any>
+  authStore: AuthStore
 }
 
 export class ClientService {
   private configurationManager: ConfigurationManager
   private language: Language
-  private store: Store<any>
+  private authStore: AuthStore
 
   private httpAuthenticatedClient: HttpClient
   private httpUnAuthenticatedClient: HttpClient
@@ -73,7 +73,7 @@ export class ClientService {
   constructor(options: ClientServiceOptions) {
     this.configurationManager = options.configurationManager
     this.language = options.language
-    this.store = options.store
+    this.authStore = options.authStore
   }
 
   public get httpAuthenticated(): _HttpClient {
@@ -92,7 +92,7 @@ export class ClientService {
 
   public get graphAuthenticated(): Graph {
     if (this.clientNeedsInit(this.ocUserContextClient)) {
-      this.ocUserContextClient = this.getOcsClient({ accessToken: this.token })
+      this.ocUserContextClient = this.getOcsClient({ accessToken: this.authStore.accessToken })
     }
     return this.ocUserContextClient.graph
   }
@@ -100,13 +100,13 @@ export class ClientService {
   public get sseAuthenticated(): EventSource {
     return sse(
       this.configurationManager.serverUrl,
-      createFetchOptions({ accessToken: this.token }, this.currentLanguage)
+      createFetchOptions({ accessToken: this.authStore.accessToken }, this.currentLanguage)
     )
   }
 
   public get ocsUserContext(): OCS {
     if (this.clientNeedsInit(this.ocUserContextClient)) {
-      this.ocUserContextClient = this.getOcsClient({ accessToken: this.token })
+      this.ocUserContextClient = this.getOcsClient({ accessToken: this.authStore.accessToken })
     }
     return this.ocUserContextClient.ocs
   }
@@ -114,7 +114,7 @@ export class ClientService {
   public ocsPublicLinkContext(password?: string): OCS {
     if (this.clientNeedsInit(this.ocPublicLinkContextClient)) {
       this.ocPublicLinkContextClient = this.getOcsClient({
-        publicLinkToken: this.token,
+        publicLinkToken: this.authStore.accessToken,
         publicLinkPassword: password
       })
     }
@@ -123,13 +123,13 @@ export class ClientService {
 
   private getHttpClient(authenticated = false): HttpClient {
     return {
-      ...(!!authenticated && { token: this.token }),
+      ...(!!authenticated && { token: this.authStore.accessToken }),
       language: this.currentLanguage,
       client: new _HttpClient({
         baseURL: this.configurationManager.serverUrl,
         headers: {
           'Accept-Language': this.currentLanguage,
-          ...(!!authenticated && { Authorization: 'Bearer ' + this.token }),
+          ...(!!authenticated && { Authorization: 'Bearer ' + this.authStore.accessToken }),
           'X-Requested-With': 'XMLHttpRequest',
           'X-Request-ID': uuidV4()
         }
@@ -143,7 +143,7 @@ export class ClientService {
       createAxiosInstance(authParams, this.currentLanguage)
     )
     return {
-      token: this.token,
+      token: this.authStore.accessToken,
       language: this.currentLanguage,
       graph,
       ocs
@@ -153,7 +153,7 @@ export class ClientService {
   private clientNeedsInit(client, hasToken = true) {
     return (
       !client ||
-      (hasToken && client.token !== this.token) ||
+      (hasToken && client.token !== this.authStore.accessToken) ||
       client.language !== this.currentLanguage
     )
   }
@@ -174,10 +174,6 @@ export class ClientService {
     this.webdavClient = webdav
   }
 
-  get token(): string {
-    return this.store.getters['runtime/auth/accessToken']
-  }
-
   get currentLanguage(): string {
     return this.language.current
   }
diff --git a/packages/web-pkg/src/services/preview/previewService.ts b/packages/web-pkg/src/services/preview/previewService.ts
index 8dff91a0413..e6014407554 100644
--- a/packages/web-pkg/src/services/preview/previewService.ts
+++ b/packages/web-pkg/src/services/preview/previewService.ts
@@ -8,13 +8,14 @@ import { ConfigurationManager } from '../../configuration'
 import { encodePath } from '../../utils'
 import { isPublicSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { BuildQueryStringOptions, LoadPreviewOptions, PreviewCapability } from '.'
-import { UserStore } from '../../composables'
+import { AuthStore, UserStore } from '../../composables'
 
 export class PreviewService {
   store: Store<unknown>
   clientService: ClientService
   configurationManager: ConfigurationManager
   userStore: UserStore
+  authStore: AuthStore
 
   capability?: PreviewCapability
 
@@ -22,17 +23,20 @@ export class PreviewService {
     store,
     clientService,
     configurationManager,
-    userStore
+    userStore,
+    authStore
   }: {
     store: Store<unknown>
     clientService: ClientService
     configurationManager: ConfigurationManager
     userStore: UserStore
+    authStore: AuthStore
   }) {
     this.store = store
     this.clientService = clientService
     this.configurationManager = configurationManager
     this.userStore = userStore
+    this.authStore = authStore
 
     this.capability = get(store, 'getters.capabilities.files.thumbnail', {
       enabled: true,
@@ -53,10 +57,6 @@ export class PreviewService {
     return this.userStore.user
   }
 
-  private get token() {
-    return this.store.getters['runtime/auth/accessToken']
-  }
-
   private get serverUrl() {
     return this.configurationManager.serverUrl
   }
@@ -85,7 +85,10 @@ export class PreviewService {
     }
 
     const isPublic = isPublicSpaceResource(space)
-    if (!isPublic && (!this.serverUrl || !this.user.onPremisesSamAccountName || !this.token)) {
+    if (
+      !isPublic &&
+      (!this.serverUrl || !this.user.onPremisesSamAccountName || !this.authStore.accessToken)
+    ) {
       return undefined
     }
 
diff --git a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
index f5a73652329..e899ba33233 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
+++ b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
@@ -460,9 +460,6 @@ function getMountedWrapper({
   addProcessingResources = false
 } = {}) {
   const storeOptions = defaultStoreMockOptions
-  storeOptions.modules.runtime.modules.auth.getters.isUserContextReady.mockReturnValue(
-    isUserContextReady
-  )
   storeOptions.getters.capabilities.mockImplementation(() => ({
     files: {
       tags: true
@@ -496,7 +493,12 @@ function getMountedWrapper({
       },
       global: {
         renderStubDefaultSlot: true,
-        plugins: [...defaultPlugins(), store],
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: { authState: { userContextReady: isUserContextReady } }
+          }),
+          store
+        ],
         stubs: {
           OcButton: false,
           'router-link': true
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDownloadArchive.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDownloadArchive.spec.ts
index 1960878874d..7a1ef0fa240 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDownloadArchive.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDownloadArchive.spec.ts
@@ -2,15 +2,8 @@ import { mock } from 'jest-mock-extended'
 import { unref } from 'vue'
 import { useFileActionsDownloadArchive } from '../../../../../src/composables/actions'
 import { Resource } from '@ownclouders/web-client'
-
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  RouteLocation,
-  getComposableWrapper
-} from 'web-test-helpers'
-import { useArchiverService, useStore } from '../../../../../src/composables'
+import { defaultComponentMocks, RouteLocation, getComposableWrapper } from 'web-test-helpers'
+import { useArchiverService } from '../../../../../src/composables'
 
 jest.mock('../../../../../src/composables/archiverService/useArchiverService')
 
@@ -42,8 +35,7 @@ describe('downloadArchive', () => {
             searchLocation: true,
             triggerDownloadMock,
             setup: () => {
-              const store = useStore()
-              const { actions } = useFileActionsDownloadArchive({ store })
+              const { actions } = useFileActionsDownloadArchive()
 
               unref(actions)[0].handler({ space: null, resources })
 
@@ -76,14 +68,10 @@ function getWrapper({
     ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: routeName }) }),
     space: { driveType: 'personal', spaceRoles: { viewer: [], editor: [], manager: [] } }
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.getters.capabilities.mockImplementation(() => ({ spaces: { enabled: true } }))
-  const store = createStore(storeOptions)
   return {
     wrapper: getComposableWrapper(setup, {
       mocks,
-      provide: mocks,
-      store
+      provide: mocks
     })
   }
 }
diff --git a/packages/web-pkg/tests/unit/services/client.spec.ts b/packages/web-pkg/tests/unit/services/client.spec.ts
index b052767622d..d38fa0cfec0 100644
--- a/packages/web-pkg/tests/unit/services/client.spec.ts
+++ b/packages/web-pkg/tests/unit/services/client.spec.ts
@@ -1,20 +1,25 @@
 import { HttpClient } from '../../../src/http'
-import { ClientService, ConfigurationManager } from '../../../src/'
+import { ClientService, ConfigurationManager, useAuthStore } from '../../../src/'
 import { Language } from 'vue3-gettext'
-import { Store } from 'vuex'
 import mockAxios from 'jest-mock-axios'
 import { client as _client } from '@ownclouders/web-client'
+import { createTestingPinia } from 'web-test-helpers'
 
 const getters = { 'runtime/auth/accessToken': 'token' }
 const language = { current: 'en' }
 const serverUrl = 'someUrl'
 
 const getClientServiceMock = () => {
-  return new ClientService({
-    configurationManager: { serverUrl } as ConfigurationManager,
-    language: language as Language,
-    store: { getters } as Store<any>
-  })
+  const authStore = useAuthStore()
+
+  return {
+    clientService: new ClientService({
+      configurationManager: { serverUrl } as ConfigurationManager,
+      language: language as Language,
+      authStore
+    }),
+    authStore
+  }
 }
 const v4uuid = '00000000-0000-0000-0000-000000000000'
 jest.mock('uuid', () => ({ v4: () => v4uuid }))
@@ -22,11 +27,11 @@ jest.mock('@ownclouders/web-client', () => ({ client: jest.fn(() => ({ graph: {}
 
 describe('ClientService', () => {
   beforeEach(() => {
-    getters['runtime/auth/accessToken'] = 'token'
+    createTestingPinia({ initialState: { auth: { accessToken: 'token' } } })
     language.current = 'en'
   })
   it('initializes a http authenticated client', () => {
-    const clientService = getClientServiceMock()
+    const { clientService, authStore } = getClientServiceMock()
     const client = clientService.httpAuthenticated
     expect(client).toBeInstanceOf(HttpClient)
     expect(mockAxios.create).toHaveBeenCalledWith(
@@ -43,7 +48,7 @@ describe('ClientService', () => {
     // test re-instantiation on token and language change
     clientService.httpAuthenticated
     expect(mockAxios.create).toHaveBeenCalledTimes(1)
-    getters['runtime/auth/accessToken'] = 'changedToken'
+    authStore.accessToken = 'changedToken'
     clientService.httpAuthenticated
     expect(mockAxios.create).toHaveBeenCalledTimes(2)
     language.current = 'de'
@@ -51,7 +56,7 @@ describe('ClientService', () => {
     expect(mockAxios.create).toHaveBeenCalledTimes(3)
   })
   it('initializes a http unauthenticated client', () => {
-    const clientService = getClientServiceMock()
+    const { clientService } = getClientServiceMock()
     const client = clientService.httpUnAuthenticated
     expect(client).toBeInstanceOf(HttpClient)
     expect(mockAxios.create).toHaveBeenCalledWith(
@@ -77,7 +82,7 @@ describe('ClientService', () => {
     jest.mocked(_client).mockImplementation(() => {
       return { graph: graphClient, ocs: {} } as any
     })
-    const clientService = getClientServiceMock()
+    const { clientService, authStore } = getClientServiceMock()
     const client = clientService.graphAuthenticated
     expect(_client).toHaveBeenCalledWith(serverUrl, expect.anything())
     expect(_client).toHaveBeenCalledTimes(1)
@@ -85,7 +90,7 @@ describe('ClientService', () => {
     // test re-instantiation on token and language change
     clientService.graphAuthenticated
     expect(_client).toHaveBeenCalledTimes(1)
-    getters['runtime/auth/accessToken'] = 'changedToken'
+    authStore.accessToken = 'changedToken'
     clientService.graphAuthenticated
     expect(_client).toHaveBeenCalledTimes(2)
     language.current = 'de'
@@ -97,7 +102,7 @@ describe('ClientService', () => {
     jest.mocked(_client).mockImplementation(() => {
       return { graph: {}, ocs: ocsClient } as any
     })
-    const clientService = getClientServiceMock()
+    const { clientService, authStore } = getClientServiceMock()
     const client = clientService.ocsUserContext
     expect(_client).toHaveBeenCalledWith(serverUrl, expect.anything())
     expect(_client).toHaveBeenCalledTimes(1)
@@ -105,7 +110,7 @@ describe('ClientService', () => {
     // test re-instantiation on token and language change
     clientService.ocsUserContext
     expect(_client).toHaveBeenCalledTimes(1)
-    getters['runtime/auth/accessToken'] = 'changedToken'
+    authStore.accessToken = 'changedToken'
     clientService.ocsUserContext
     expect(_client).toHaveBeenCalledTimes(2)
     language.current = 'de'
@@ -117,7 +122,7 @@ describe('ClientService', () => {
     jest.mocked(_client).mockImplementation(() => {
       return { graph: {}, ocs: ocsClient } as any
     })
-    const clientService = getClientServiceMock()
+    const { clientService, authStore } = getClientServiceMock()
     const client = clientService.ocsPublicLinkContext()
     expect(_client).toHaveBeenCalledWith(serverUrl, expect.anything())
     expect(_client).toHaveBeenCalledTimes(1)
@@ -125,7 +130,7 @@ describe('ClientService', () => {
     // test re-instantiation on token and language change
     clientService.ocsPublicLinkContext()
     expect(_client).toHaveBeenCalledTimes(1)
-    getters['runtime/auth/accessToken'] = 'changedToken'
+    authStore.accessToken = 'changedToken'
     clientService.ocsPublicLinkContext()
     expect(_client).toHaveBeenCalledTimes(2)
     language.current = 'de'
diff --git a/packages/web-pkg/tests/unit/services/previewService.spec.ts b/packages/web-pkg/tests/unit/services/previewService.spec.ts
index 194ac73085c..fb2263d60b8 100644
--- a/packages/web-pkg/tests/unit/services/previewService.spec.ts
+++ b/packages/web-pkg/tests/unit/services/previewService.spec.ts
@@ -4,7 +4,7 @@ import { ConfigurationManager } from '../../../src/configuration'
 import { createStore, createTestingPinia, defaultStoreMockOptions } from 'web-test-helpers'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
 import { AxiosResponse } from 'axios'
-import { useUserStore } from '../../../src/composables/piniaStores'
+import { useAuthStore, useUserStore } from '../../../src/composables/piniaStores'
 import { User } from '@ownclouders/web-client/src/generated'
 
 describe('PreviewService', () => {
@@ -125,9 +125,12 @@ describe('PreviewService', () => {
   })
 })
 
-const getWrapper = ({ supportedMimeTypes = [], version = undefined, token = 'token' } = {}) => {
+const getWrapper = ({
+  supportedMimeTypes = [],
+  version = undefined,
+  accessToken = 'token'
+} = {}) => {
   const storeOptions = defaultStoreMockOptions
-  storeOptions.modules.runtime.modules.auth.getters.accessToken.mockReturnValue(token)
   storeOptions.getters.capabilities.mockReturnValue({
     files: {
       thumbnail: {
@@ -146,11 +149,18 @@ const getWrapper = ({ supportedMimeTypes = [], version = undefined, token = 'tok
   const configurationManager = mock<ConfigurationManager>()
   configurationManager.serverUrl = 'https://someUrl.com'
 
-  createTestingPinia({ initialState: { user: { user: mock<User>() } } })
+  createTestingPinia({ initialState: { user: { user: mock<User>() }, auth: { accessToken } } })
   const userStore = useUserStore()
+  const authStore = useAuthStore()
 
   return {
-    previewService: new PreviewService({ store, clientService, configurationManager, userStore }),
+    previewService: new PreviewService({
+      store,
+      clientService,
+      configurationManager,
+      userStore,
+      authStore
+    }),
     clientService
   }
 }
diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index 05b491801d4..d898046ad24 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -10,7 +10,7 @@
   </div>
 </template>
 <script lang="ts">
-import { mapGetters, mapState } from 'vuex'
+import { mapGetters } from 'vuex'
 import SkipTo from './components/SkipTo.vue'
 import ModalWrapper from './components/ModalWrapper.vue'
 import { useLayout } from './composables/layout'
@@ -36,7 +36,7 @@ export default defineComponent({
 
     const activeRoute = computed(() => router.resolve(unref(router.currentRoute)))
 
-    const { layout } = useLayout({ store, router })
+    const { layout } = useLayout({ router })
 
     watch(
       () => unref(activeRoute),
@@ -76,7 +76,6 @@ export default defineComponent({
     }
   },
   computed: {
-    ...mapState(['modal']),
     ...mapGetters(['configuration'])
   },
   watch: {
diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
index d529bedc500..52cf0ab20b2 100644
--- a/packages/web-runtime/src/components/Topbar/TopBar.vue
+++ b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -53,13 +53,12 @@ import SideBarToggle from './SideBarToggle.vue'
 import ThemeSwitcher from './ThemeSwitcher.vue'
 import {
   useAbility,
+  useAuthStore,
   useCapabilityNotifications,
   useEmbedMode,
-  usePublicLinkContext,
   useRouter,
   useStore,
-  useThemeStore,
-  useUserContext
+  useThemeStore
 } from '@ownclouders/web-pkg'
 import { isRuntimeRoute } from '../../router'
 
@@ -85,8 +84,7 @@ export default {
     const { currentTheme } = storeToRefs(themeStore)
 
     const notificationsSupport = useCapabilityNotifications()
-    const isUserContext = useUserContext({ store })
-    const isPublicLinkContext = usePublicLinkContext({ store })
+    const authStore = useAuthStore()
     const language = useGettext()
     const router = useRouter()
     const ability = useAbility()
@@ -94,11 +92,11 @@ export default {
 
     const logoWidth = ref('150px')
     const isNotificationBellEnabled = computed(() => {
-      return unref(isUserContext) && unref(notificationsSupport).includes('list')
+      return authStore.userContextReady && unref(notificationsSupport).includes('list')
     })
 
     const isSideBarToggleVisible = computed(() => {
-      return unref(isUserContext) || unref(isPublicLinkContext)
+      return authStore.userContextReady || authStore.publicLinkContextReady
     })
     const isSideBarToggleDisabled = computed(() => {
       return isRuntimeRoute(unref(router.currentRoute))
diff --git a/packages/web-runtime/src/composables/layout/useLayout.ts b/packages/web-runtime/src/composables/layout/useLayout.ts
index 6d09a3b0adc..f869548fdce 100644
--- a/packages/web-runtime/src/composables/layout/useLayout.ts
+++ b/packages/web-runtime/src/composables/layout/useLayout.ts
@@ -4,11 +4,10 @@ import LayoutLoading from '../../layouts/Loading.vue'
 import { isPublicLinkContextRequired, isUserContextRequired } from '../../router'
 import { computed, unref } from 'vue'
 import { Router } from 'vue-router'
-import { Store } from 'vuex'
-import { useStore, useRouter, useUserContext, usePublicLinkContext } from '@ownclouders/web-pkg'
+import { useRouter, useAuthStore, AuthStore } from '@ownclouders/web-pkg'
 
 export interface LayoutOptions {
-  store?: Store<any>
+  authStore?: AuthStore
   router?: Router
 }
 
@@ -16,10 +15,8 @@ const layoutTypes = ['plain', 'loading', 'application'] as const
 type LayoutType = (typeof layoutTypes)[number]
 
 export const useLayout = (options?: LayoutOptions) => {
-  const store = options?.store || useStore()
+  const authStore = options?.authStore || useAuthStore()
   const router = options?.router || useRouter()
-  const isPublicLinkContextReady = usePublicLinkContext({ store })
-  const isUserContextReady = useUserContext({ store })
 
   const layoutType = computed<LayoutType>(() => {
     const plainLayoutRoutes = [
@@ -37,10 +34,10 @@ export const useLayout = (options?: LayoutOptions) => {
       return 'plain'
     }
     if (isPublicLinkContextRequired(router, unref(router.currentRoute))) {
-      return unref(isPublicLinkContextReady) ? 'application' : 'loading'
+      return authStore.publicLinkContextReady ? 'application' : 'loading'
     }
     if (isUserContextRequired(router, unref(router.currentRoute))) {
-      return unref(isUserContextReady) ? 'application' : 'loading'
+      return authStore.userContextReady ? 'application' : 'loading'
     }
     return 'application'
   })
diff --git a/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts b/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts
index ab098cf6959..b07c08b338a 100644
--- a/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts
+++ b/packages/web-runtime/src/composables/tokenInfo/useLoadTokenInfo.ts
@@ -1,21 +1,20 @@
-import { Ref, unref } from 'vue'
 import { useTask } from 'vue-concurrency'
-import { useClientService, useStore, useUserContext } from '@ownclouders/web-pkg'
+import { useClientService, useAuthStore, AuthStore } from '@ownclouders/web-pkg'
 import { ClientService } from '@ownclouders/web-pkg'
 
 export interface LoadTokenInfoOptions {
   clientService?: ClientService
-  isUserContext?: Ref<boolean>
+  authStore?: AuthStore
 }
 
 export function useLoadTokenInfo(options: LoadTokenInfoOptions) {
   const { owncloudSdk } = options.clientService || useClientService()
-  const isUserContext = options.isUserContext || useUserContext({ store: useStore() })
+  const authStore = options.authStore || useAuthStore()
 
   const loadTokenInfoTask = useTask(function* (signal, token: string) {
     let tokenInfo
     try {
-      if (unref(isUserContext)) {
+      if (authStore.userContextReady) {
         tokenInfo = yield owncloudSdk.shares.getProtectedTokenInfo(token)
       } else {
         tokenInfo = yield owncloudSdk.shares.getUnprotectedTokenInfo(token)
diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
index b458ade243d..ca52fade738 100644
--- a/packages/web-runtime/src/container/bootstrap.ts
+++ b/packages/web-runtime/src/container/bootstrap.ts
@@ -13,7 +13,9 @@ import {
   useThemeStore,
   useUserStore,
   UserStore,
-  useMessages
+  useMessages,
+  useAuthStore,
+  AuthStore
 } from '@ownclouders/web-pkg'
 import { authService } from '../services/auth'
 import {
@@ -337,10 +339,11 @@ export const announceTheme = async ({
 }
 
 export const announcePiniaStores = () => {
+  const authStore = useAuthStore()
   const messagesStore = useMessages()
   const modalStore = useModals()
   const userStore = useUserStore()
-  return { messagesStore, modalStore, userStore }
+  return { authStore, messagesStore, modalStore, userStore }
 }
 
 /**
@@ -384,27 +387,29 @@ export const announceClientService = ({
   runtimeConfiguration,
   configurationManager,
   store,
-  userStore
+  userStore,
+  authStore
 }: {
   app: App
   runtimeConfiguration: RuntimeConfiguration
   configurationManager: ConfigurationManager
   store: Store<any>
   userStore: UserStore
+  authStore: AuthStore
 }): void => {
   const sdk = new OwnCloud()
   sdk.init({ baseUrl: runtimeConfiguration.server || window.location.origin })
   const clientService = new ClientService({
     configurationManager,
     language: app.config.globalProperties.$language,
-    store
+    authStore
   })
   app.config.globalProperties.$client = sdk
   app.config.globalProperties.$clientService = clientService
   app.config.globalProperties.$clientService.owncloudSdk = sdk
   app.config.globalProperties.$clientService.webdav = webdav({
     sdk,
-    accessToken: computed(() => store.getters['runtime/auth/accessToken']),
+    accessToken: computed(() => authStore.accessToken),
     baseUrl: runtimeConfiguration.server,
     capabilities: computed(() => store.getters.capabilities),
     clientService: app.config.globalProperties.$clientService,
@@ -446,19 +451,22 @@ export const announcePreviewService = ({
   app,
   store,
   configurationManager,
-  userStore
+  userStore,
+  authStore
 }: {
   app: App
   store: Store<any>
   configurationManager: ConfigurationManager
   userStore: UserStore
+  authStore: AuthStore
 }): void => {
   const clientService = app.config.globalProperties.$clientService
   const previewService = new PreviewService({
     store,
     clientService,
     configurationManager,
-    userStore
+    userStore,
+    authStore
   })
   app.config.globalProperties.$previewService = previewService
   app.provide('$previewService', previewService)
@@ -477,13 +485,15 @@ export const announceAuthService = ({
   configurationManager,
   store,
   router,
-  userStore
+  userStore,
+  authStore
 }: {
   app: App
   configurationManager: ConfigurationManager
   store: Store<any>
   router: Router
   userStore: UserStore
+  authStore: AuthStore
 }): void => {
   const ability = app.config.globalProperties.$ability
   const language = app.config.globalProperties.$language
@@ -495,7 +505,8 @@ export const announceAuthService = ({
     router,
     ability,
     language,
-    userStore
+    userStore,
+    authStore
   )
   app.config.globalProperties.$authService = authService
   app.provide('$authService', authService)
diff --git a/packages/web-runtime/src/index.ts b/packages/web-runtime/src/index.ts
index ed0bdfa16cc..4b6d4448ec6 100644
--- a/packages/web-runtime/src/index.ts
+++ b/packages/web-runtime/src/index.ts
@@ -51,7 +51,7 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
   const app = createApp(pages.success)
   app.use(pinia)
 
-  const { userStore } = announcePiniaStores()
+  const { authStore, userStore } = announcePiniaStores()
 
   app.provide('$router', router)
 
@@ -71,7 +71,14 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
   })
   announceUppyService({ app })
 
-  announceClientService({ app, runtimeConfiguration, configurationManager, store, userStore })
+  announceClientService({
+    app,
+    runtimeConfiguration,
+    configurationManager,
+    store,
+    userStore,
+    authStore
+  })
   // TODO: move to announceArchiverService function
   app.config.globalProperties.$archiverService = new ArchiverService(
     app.config.globalProperties.$clientService,
@@ -89,7 +96,7 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
   )
   app.provide('$archiverService', app.config.globalProperties.$archiverService)
   announceLoadingService({ app })
-  announcePreviewService({ app, store, configurationManager, userStore })
+  announcePreviewService({ app, store, configurationManager, userStore, authStore })
   announcePasswordPolicyService({ app })
   await announceClient(runtimeConfiguration)
 
@@ -121,7 +128,7 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
 
   announceAdditionalTranslations({ gettext, translations: merge(customTranslations) })
 
-  announceAuthService({ app, configurationManager, store, router, userStore })
+  announceAuthService({ app, configurationManager, store, router, userStore, authStore })
   announceCustomStyles({ runtimeConfiguration })
   announceCustomScripts({ runtimeConfiguration })
   announceDefaults({ store, router })
@@ -142,9 +149,7 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
 
   store.watch(
     (state, getters) =>
-      getters['runtime/auth/isUserContextReady'] ||
-      getters['runtime/auth/isIdpContextReady'] ||
-      getters['runtime/auth/isPublicLinkContextReady'],
+      authStore.userContextReady || authStore.idpContextReady || authStore.publicLinkContextReady,
     async (newValue, oldValue) => {
       if (!newValue || newValue === oldValue) {
         return
@@ -159,7 +164,7 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
 
   store.watch(
     (state, getters) => {
-      return getters['runtime/auth/isUserContextReady']
+      return authStore.userContextReady
     },
     async (userContextReady) => {
       if (!userContextReady) {
@@ -198,16 +203,16 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
   )
   store.watch(
     (state, getters) => {
-      return getters['runtime/auth/isPublicLinkContextReady']
+      return authStore.publicLinkContextReady
     },
     (publicLinkContextReady) => {
       if (!publicLinkContextReady) {
         return
       }
       // Create virtual space for public link
-      const publicLinkToken = store.getters['runtime/auth/publicLinkToken']
-      const publicLinkPassword = store.getters['runtime/auth/publicLinkPassword']
-      const publicLinkType = store.getters['runtime/auth/publicLinkType']
+      const publicLinkToken = authStore.publicLinkToken
+      const publicLinkPassword = authStore.publicLinkPassword
+      const publicLinkType = authStore.publicLinkType
 
       const space = buildPublicSpaceResource({
         id: publicLinkToken,
@@ -228,10 +233,10 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
     // only needed if a public link gets re-resolved with a changed password prop (changed or removed).
     // don't need to set { immediate: true } on the watcher.
     (state, getters) => {
-      return getters['runtime/auth/publicLinkPassword']
+      return authStore.publicLinkPassword
     },
     (publicLinkPassword: string | undefined) => {
-      const publicLinkToken = store.getters['runtime/auth/publicLinkToken']
+      const publicLinkToken = authStore.publicLinkToken
       const space = store.getters['runtime/spaces/spaces'].find((space: Resource) => {
         return isPublicSpaceResource(space) && space.id === publicLinkToken
       })
diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
index 9232d443abc..577ba9fcf3f 100644
--- a/packages/web-runtime/src/layouts/Application.vue
+++ b/packages/web-runtime/src/layouts/Application.vue
@@ -36,7 +36,12 @@
 <script lang="ts">
 import { mapGetters } from 'vuex'
 import orderBy from 'lodash-es/orderBy'
-import { AppLoadingSpinner, SidebarNavExtension, useExtensionRegistry } from '@ownclouders/web-pkg'
+import {
+  AppLoadingSpinner,
+  SidebarNavExtension,
+  useAuthStore,
+  useExtensionRegistry
+} from '@ownclouders/web-pkg'
 import TopBar from '../components/Topbar/TopBar.vue'
 import MessageBar from '../components/MessageBar.vue'
 import SidebarNav from '../components/SidebarNav/SidebarNav.vue'
@@ -49,8 +54,7 @@ import {
   useRoute,
   useRouteMeta,
   useSpacesLoading,
-  useStore,
-  useUserContext
+  useStore
 } from '@ownclouders/web-pkg'
 import { computed, defineComponent, provide, ref, unref, watch } from 'vue'
 import { useRouter } from 'vue-router'
@@ -77,7 +81,7 @@ export default defineComponent({
     const router = useRouter()
     const route = useRoute()
     const { $gettext } = useGettext()
-    const isUserContext = useUserContext({ store })
+    const authStore = useAuthStore()
     const activeApp = useActiveApp()
     const extensionRegistry = useExtensionRegistry()
 
@@ -127,7 +131,7 @@ export default defineComponent({
     }
 
     const navItems = computed<NavItem[]>(() => {
-      if (!unref(isUserContext)) {
+      if (!authStore.userContextReady) {
         return []
       }
 
diff --git a/packages/web-runtime/src/pages/resolvePublicLink.vue b/packages/web-runtime/src/pages/resolvePublicLink.vue
index 80824f252e5..b72328f3615 100644
--- a/packages/web-runtime/src/pages/resolvePublicLink.vue
+++ b/packages/web-runtime/src/pages/resolvePublicLink.vue
@@ -64,15 +64,14 @@ import { authService } from '../services/auth'
 
 import {
   queryItemAsString,
+  useAuthStore,
   useClientService,
   useConfigurationManager,
   useRoute,
   useRouteParam,
   useRouteQuery,
   useRouter,
-  useStore,
-  useThemeStore,
-  useUserContext
+  useThemeStore
 } from '@ownclouders/web-pkg'
 import { useTask } from 'vue-concurrency'
 import { ref, unref, computed, defineComponent, onMounted } from 'vue'
@@ -97,7 +96,7 @@ export default defineComponent({
     const clientService = useClientService()
     const router = useRouter()
     const route = useRoute()
-    const store = useStore()
+    const authStore = useAuthStore()
     const { $gettext } = useGettext()
     const token = useRouteParam('token')
     const redirectUrl = useRouteQuery('redirectUrl')
@@ -128,15 +127,13 @@ export default defineComponent({
       return queryItemAsString(unref(route).params.driveAliasAndItem)
     })
 
-    const isUserContext = useUserContext({ store })
-
     const detailsQuery = useRouteQuery('details')
     const details = computed(() => {
       return queryItemAsString(unref(detailsQuery))
     })
 
     // token info
-    const { loadTokenInfoTask } = useLoadTokenInfo({ clientService, isUserContext })
+    const { loadTokenInfoTask } = useLoadTokenInfo({ clientService, authStore })
     const tokenInfo = ref(null)
 
     // generic public link loading
diff --git a/packages/web-runtime/src/router/setupAuthGuard.ts b/packages/web-runtime/src/router/setupAuthGuard.ts
index 0aa9841ec95..f876542cebb 100644
--- a/packages/web-runtime/src/router/setupAuthGuard.ts
+++ b/packages/web-runtime/src/router/setupAuthGuard.ts
@@ -5,7 +5,12 @@ import {
   isUserContextRequired
 } from './index'
 import { Router, RouteLocation } from 'vue-router'
-import { contextRouteNameKey, queryItemAsString, useEmbedMode } from '@ownclouders/web-pkg'
+import {
+  contextRouteNameKey,
+  queryItemAsString,
+  useAuthStore,
+  useEmbedMode
+} from '@ownclouders/web-pkg'
 import { authService } from '../services/auth/authService'
 import { unref } from 'vue'
 
@@ -18,7 +23,7 @@ export const setupAuthGuard = (router: Router) => {
       return true
     }
 
-    const store = (window as any).__$store
+    const authStore = useAuthStore()
     await authService.initializeContext(to)
 
     // vue-router currently (4.1.6) does not cancel navigations when a new one is triggered
@@ -29,7 +34,7 @@ export const setupAuthGuard = (router: Router) => {
     }
 
     if (isPublicLinkContextRequired(router, to)) {
-      if (!store.getters['runtime/auth/isPublicLinkContextReady']) {
+      if (!authStore.publicLinkContextReady) {
         const publicLinkToken = extractPublicLinkToken(to)
         return {
           name: 'resolvePublicLink',
@@ -41,7 +46,7 @@ export const setupAuthGuard = (router: Router) => {
     }
 
     if (isUserContextRequired(router, to)) {
-      if (!store.getters['runtime/auth/isUserContextReady']) {
+      if (!authStore.userContextReady) {
         if (unref(isDelegatingAuthentication)) {
           return { path: '/web-oidc-callback' }
         }
@@ -52,7 +57,7 @@ export const setupAuthGuard = (router: Router) => {
     }
 
     if (isIdpContextRequired(router, to)) {
-      if (!store.getters['runtime/auth/isIdpContextReady']) {
+      if (!authStore.idpContextReady) {
         if (unref(isDelegatingAuthentication)) {
           return { path: '/web-oidc-callback' }
         }
diff --git a/packages/web-runtime/src/services/auth/authService.ts b/packages/web-runtime/src/services/auth/authService.ts
index 34170c4321e..095f58bd880 100644
--- a/packages/web-runtime/src/services/auth/authService.ts
+++ b/packages/web-runtime/src/services/auth/authService.ts
@@ -1,7 +1,7 @@
 import { UserManager } from './userManager'
 import { PublicLinkManager } from './publicLinkManager'
 import { Store } from 'vuex'
-import { ClientService, UserStore } from '@ownclouders/web-pkg'
+import { AuthStore, ClientService, UserStore } from '@ownclouders/web-pkg'
 import { ConfigurationManager } from '@ownclouders/web-pkg'
 import { RouteLocation, Router } from 'vue-router'
 import {
@@ -26,6 +26,7 @@ export class AuthService {
   private ability: Ability
   private language: Language
   private userStore: UserStore
+  private authStore: AuthStore
 
   public hasAuthErrorOccurred: boolean
 
@@ -36,7 +37,8 @@ export class AuthService {
     router: Router,
     ability: Ability,
     language: Language,
-    userStore: UserStore
+    userStore: UserStore,
+    authStore: AuthStore
   ): void {
     this.configurationManager = configurationManager
     this.clientService = clientService
@@ -46,6 +48,7 @@ export class AuthService {
     this.ability = ability
     this.language = language
     this.userStore = userStore
+    this.authStore = authStore
   }
 
   /**
@@ -64,7 +67,8 @@ export class AuthService {
       this.publicLinkManager = new PublicLinkManager({
         clientService: this.clientService,
         configurationManager: this.configurationManager,
-        store: this.store
+        store: this.store,
+        authStore: this.authStore
       })
     }
 
@@ -84,7 +88,8 @@ export class AuthService {
         store: this.store,
         ability: this.ability,
         language: this.language,
-        userStore: this.userStore
+        userStore: this.userStore,
+        authStore: this.authStore
       })
     }
 
@@ -298,11 +303,10 @@ export class AuthService {
     }
   }
 
-  private async resetStateAfterUserLogout() {
+  private resetStateAfterUserLogout() {
     // TODO: create UserUnloadTask interface and allow registering unload-tasks in the authService
     this.userStore.$reset()
-    await this.store.dispatch('runtime/auth/clearUserContext')
-    await this.store.dispatch('clearDynamicNavItems')
+    this.authStore.clearUserContext()
   }
 
   private handleDelegatedTokenUpdate(event: MessageEvent): void {
diff --git a/packages/web-runtime/src/services/auth/publicLinkManager.ts b/packages/web-runtime/src/services/auth/publicLinkManager.ts
index 3f56c70a630..14541d74507 100644
--- a/packages/web-runtime/src/services/auth/publicLinkManager.ts
+++ b/packages/web-runtime/src/services/auth/publicLinkManager.ts
@@ -1,4 +1,4 @@
-import { ClientService } from '@ownclouders/web-pkg'
+import { AuthStore, ClientService } from '@ownclouders/web-pkg'
 import { ConfigurationManager } from '@ownclouders/web-pkg'
 import { Store } from 'vuex'
 import isEmpty from 'lodash-es/isEmpty'
@@ -8,28 +8,31 @@ export interface PublicLinkManagerOptions {
   clientService: ClientService
   configurationManager: ConfigurationManager
   store: Store<any>
+  authStore: AuthStore
 }
 
 export class PublicLinkManager {
   private clientService: ClientService
   private configurationManager: ConfigurationManager
   private store: Store<any>
+  private authStore: AuthStore
 
   constructor(options: PublicLinkManagerOptions) {
     this.clientService = options.clientService
     this.configurationManager = options.configurationManager
     this.store = options.store
+    this.authStore = options.authStore
   }
 
   private static buildStorageKey(token: string, suffix: string): string {
     return `oc.publicLink.${token}.${suffix}`
   }
 
-  async clear(token: string): Promise<void> {
+  clear(token: string) {
     ;['resolved', 'passwordRequired', 'password'].forEach((key) => {
       sessionStorage.removeItem(PublicLinkManager.buildStorageKey(token, key))
     })
-    await this.store.dispatch('runtime/auth/clearPublicLinkContext')
+    this.authStore.clearPublicLinkContext()
   }
 
   isResolved(token: string): boolean {
@@ -88,10 +91,7 @@ export class PublicLinkManager {
     if (!this.isResolved(token)) {
       return
     }
-    if (
-      this.store.getters['runtime/auth/isPublicLinkContextReady'] &&
-      this.store.getters['runtime/auth/publicLinkToken'] === token
-    ) {
+    if (this.authStore.publicLinkContextReady && this.authStore.publicLinkToken === token) {
       return
     }
 
@@ -108,7 +108,7 @@ export class PublicLinkManager {
       console.error(e)
     }
 
-    this.store.commit('runtime/auth/SET_PUBLIC_LINK_CONTEXT', {
+    this.authStore.setPublicLinkContext({
       publicLinkToken: token,
       publicLinkPassword: password,
       publicLinkContextReady: true,
@@ -117,9 +117,7 @@ export class PublicLinkManager {
   }
 
   clearContext() {
-    this.store.commit('runtime/auth/SET_PUBLIC_LINK_CONTEXT', {
-      publicLinkContextReady: false
-    })
+    this.authStore.clearPublicLinkContext()
   }
 
   private async fetchCapabilities({ password = '' }): Promise<void> {
diff --git a/packages/web-runtime/src/services/auth/userManager.ts b/packages/web-runtime/src/services/auth/userManager.ts
index 7ab23d04b8a..b6ad0e4e4b9 100644
--- a/packages/web-runtime/src/services/auth/userManager.ts
+++ b/packages/web-runtime/src/services/auth/userManager.ts
@@ -8,7 +8,7 @@ import {
 } from 'oidc-client-ts'
 import { buildUrl } from '@ownclouders/web-pkg/src/helpers/router/buildUrl'
 import { getAbilities } from './abilities'
-import { ConfigurationManager, UserStore } from '@ownclouders/web-pkg'
+import { AuthStore, ConfigurationManager, UserStore } from '@ownclouders/web-pkg'
 import { ClientService } from '@ownclouders/web-pkg'
 import { Store } from 'vuex'
 import isEmpty from 'lodash-es/isEmpty'
@@ -29,6 +29,7 @@ export interface UserManagerOptions {
   ability: Ability
   language: Language
   userStore: UserStore
+  authStore: AuthStore
 }
 
 export class UserManager extends OidcUserManager {
@@ -37,6 +38,7 @@ export class UserManager extends OidcUserManager {
   private configurationManager: ConfigurationManager
   private store: Store<any>
   private userStore: UserStore
+  private authStore: AuthStore
   private updateAccessTokenPromise: Promise<void> | null
   private _unloadReason: UnloadReason
   private ability: Ability
@@ -113,6 +115,7 @@ export class UserManager extends OidcUserManager {
     this.ability = options.ability
     this.language = options.language
     this.userStore = options.userStore
+    this.authStore = options.authStore
   }
 
   /**
@@ -150,16 +153,16 @@ export class UserManager extends OidcUserManager {
 
   updateContext(accessToken: string, fetchUserData: boolean): Promise<void> {
     const userKnown = !!this.userStore.user
-    const accessTokenChanged = this.store.getters['runtime/auth/accessToken'] !== accessToken
+    const accessTokenChanged = this.authStore.accessToken !== accessToken
     if (!accessTokenChanged) {
       return this.updateAccessTokenPromise
     }
 
-    this.store.commit('runtime/auth/SET_ACCESS_TOKEN', accessToken)
+    this.authStore.setAccessToken(accessToken)
 
     this.updateAccessTokenPromise = (async () => {
       if (!fetchUserData) {
-        this.store.commit('runtime/auth/SET_IDP_CONTEXT_READY', true)
+        this.authStore.setIdpContextReady(true)
         return
       }
 
@@ -172,7 +175,7 @@ export class UserManager extends OidcUserManager {
       if (!userKnown) {
         await this.fetchUserInfo(accessToken)
         await this.updateUserAbilities(this.userStore.user)
-        this.store.commit('runtime/auth/SET_USER_CONTEXT_READY', true)
+        this.authStore.setUserContextReady(true)
       }
     })()
     return this.updateAccessTokenPromise
diff --git a/packages/web-runtime/src/store/auth.ts b/packages/web-runtime/src/store/auth.ts
deleted file mode 100644
index 5138bea4b6b..00000000000
--- a/packages/web-runtime/src/store/auth.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-const state = {
-  accessToken: null,
-  idpContextReady: false,
-  userContextReady: false,
-  publicLinkToken: null,
-  publicLinkPassword: null,
-  publicLinkType: null,
-  publicLinkContextReady: false
-}
-
-const getters = {
-  accessToken: (state) => state.accessToken,
-  isIdpContextReady: (state) => state.idpContextReady,
-  isUserContextReady: (state) => state.userContextReady,
-  publicLinkToken: (state) => state.publicLinkToken,
-  publicLinkPassword: (state) => state.publicLinkPassword,
-  publicLinkType: (state) => state.publicLinkType,
-  isPublicLinkContextReady: (state) => state.publicLinkContextReady
-}
-
-const mutations = {
-  SET_ACCESS_TOKEN(state, accessToken) {
-    state.accessToken = accessToken
-  },
-  SET_IDP_CONTEXT_READY(state, ready) {
-    state.idpContextReady = ready
-  },
-  SET_USER_CONTEXT_READY(state, ready) {
-    state.userContextReady = ready
-  },
-  SET_PUBLIC_LINK_CONTEXT(
-    state,
-    { publicLinkToken, publicLinkPassword, publicLinkType, publicLinkContextReady }
-  ) {
-    state.publicLinkToken = publicLinkToken
-    state.publicLinkPassword = publicLinkPassword
-    state.publicLinkType = publicLinkType
-    if (typeof publicLinkContextReady === 'boolean') {
-      state.publicLinkContextReady = publicLinkContextReady
-    }
-  }
-}
-
-const actions = {
-  clearUserContext({ commit }) {
-    commit('SET_ACCESS_TOKEN', null)
-    commit('SET_IDP_CONTEXT_READY', false)
-    commit('SET_USER_CONTEXT_READY', false)
-  },
-  clearPublicLinkContext({ commit }) {
-    commit('SET_PUBLIC_LINK_CONTEXT', {
-      publicLinkToken: null,
-      publicLinkPassword: null,
-      publicLinkType: null,
-      publicLinkContextReady: false
-    })
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  getters,
-  mutations,
-  actions
-}
diff --git a/packages/web-runtime/src/store/index.ts b/packages/web-runtime/src/store/index.ts
index b851c9eefb3..2093d391ea4 100644
--- a/packages/web-runtime/src/store/index.ts
+++ b/packages/web-runtime/src/store/index.ts
@@ -1,6 +1,5 @@
 import ancestorMetaData from './ancestorMetaData'
 import apps from './apps'
-import auth from './auth'
 import config from './config'
 import user from './user'
 import navigation from './navigation'
@@ -12,7 +11,6 @@ const runtime = {
   namespaced: true,
   modules: {
     ancestorMetaData,
-    auth,
     spaces
   }
 }
diff --git a/packages/web-runtime/tests/unit/components/Topbar/TopBar.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/TopBar.spec.ts
index de4742aebaa..9dab82509eb 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/TopBar.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Topbar/TopBar.spec.ts
@@ -89,9 +89,7 @@ const getWrapper = ({ capabilities = {}, isUserContextReady = true } = {}) => {
   storeOptions.getters.configuration.mockImplementation(() => ({
     options: { disableFeedbackLink: false }
   }))
-  storeOptions.modules.runtime.modules.auth.getters.isUserContextReady.mockReturnValue(
-    isUserContextReady
-  )
+
   const store = createStore(storeOptions)
   return {
     wrapper: shallowMount(TopBar, {
@@ -99,7 +97,12 @@ const getWrapper = ({ capabilities = {}, isUserContextReady = true } = {}) => {
         applicationsList: ['testApp']
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: { authState: { userContextReady: isUserContextReady } }
+          }),
+          store
+        ],
         stubs: { 'router-link': true, 'portal-target': true, notifications: true },
         mocks,
         provide: mocks
diff --git a/packages/web-runtime/tests/unit/services/auth/authService.spec.ts b/packages/web-runtime/tests/unit/services/auth/authService.spec.ts
index 5157b635930..46e785f5d63 100644
--- a/packages/web-runtime/tests/unit/services/auth/authService.spec.ts
+++ b/packages/web-runtime/tests/unit/services/auth/authService.spec.ts
@@ -1,13 +1,29 @@
-import { ConfigurationManager } from '@ownclouders/web-pkg'
+import { ConfigurationManager, useAuthStore } from '@ownclouders/web-pkg'
 import { mock } from 'jest-mock-extended'
 import { Store } from 'vuex'
 import { AuthService } from 'web-runtime/src/services/auth/authService'
 import { UserManager } from 'web-runtime/src/services/auth/userManager'
-import { RouteLocation, createRouter } from 'web-test-helpers/src'
+import { RouteLocation, createRouter, createTestingPinia } from 'web-test-helpers/src'
 
 const mockUpdateContext = jest.fn()
 console.debug = jest.fn()
 
+const initAuthService = ({ authService, configurationManager, router = null }) => {
+  createTestingPinia()
+  const authStore = useAuthStore()
+
+  authService.initialize(
+    configurationManager,
+    null,
+    mock<Store<any>>({}),
+    router,
+    null,
+    null,
+    null,
+    authStore
+  )
+}
+
 describe('AuthService', () => {
   describe('signInCallback', () => {
     it.each([
@@ -40,7 +56,7 @@ describe('AuthService', () => {
           options: { embed: { enabled: false } }
         })
 
-        authService.initialize(configurationManager, null, null, router, null, null, null)
+        initAuthService({ authService, configurationManager, router })
 
         await authService.signInCallback()
 
@@ -70,15 +86,7 @@ describe('AuthService', () => {
         server: 'http://server/address/',
         options: { embed: { enabled: false } }
       })
-      authService.initialize(
-        configurationManager,
-        null,
-        mock<Store<any>>({}),
-        null,
-        null,
-        null,
-        null
-      )
+      initAuthService({ authService, configurationManager })
 
       await authService.initializeContext(mock<RouteLocation>({}))
 
@@ -102,15 +110,7 @@ describe('AuthService', () => {
         server: 'http://server/address/',
         options: { embed: { enabled: false } }
       })
-      authService.initialize(
-        configurationManager,
-        null,
-        mock<Store<any>>({}),
-        null,
-        null,
-        null,
-        null
-      )
+      initAuthService({ authService, configurationManager })
 
       await authService.initializeContext(mock<RouteLocation>({}))
 
@@ -134,15 +134,7 @@ describe('AuthService', () => {
         server: 'http://server/address/',
         options: { embed: { enabled: true, delegateAuthentication: false } }
       })
-      authService.initialize(
-        configurationManager,
-        null,
-        mock<Store<any>>({}),
-        null,
-        null,
-        null,
-        null
-      )
+      initAuthService({ authService, configurationManager })
 
       await authService.initializeContext(mock<RouteLocation>({}))
 
@@ -166,15 +158,7 @@ describe('AuthService', () => {
         server: 'http://server/address/',
         options: { embed: { enabled: true, delegateAuthentication: true } }
       })
-      authService.initialize(
-        configurationManager,
-        null,
-        mock<Store<any>>({}),
-        null,
-        null,
-        null,
-        null
-      )
+      initAuthService({ authService, configurationManager })
 
       await authService.initializeContext(mock<RouteLocation>({}))
 
@@ -198,15 +182,7 @@ describe('AuthService', () => {
         server: 'http://server/address/',
         options: { embed: { enabled: false, delegateAuthentication: true } }
       })
-      authService.initialize(
-        configurationManager,
-        null,
-        mock<Store<any>>({}),
-        null,
-        null,
-        null,
-        null
-      )
+      initAuthService({ authService, configurationManager })
 
       await authService.initializeContext(mock<RouteLocation>({}))
 
diff --git a/packages/web-test-helpers/src/mocks/pinia.ts b/packages/web-test-helpers/src/mocks/pinia.ts
index 2a8974af7cb..1c6e8145ea1 100644
--- a/packages/web-test-helpers/src/mocks/pinia.ts
+++ b/packages/web-test-helpers/src/mocks/pinia.ts
@@ -8,6 +8,12 @@ export { createTestingPinia }
 
 export type PiniaMockOptions = {
   stubActions?: boolean
+  authState?: {
+    accessToken?: string
+    idpContextReady?: boolean
+    userContextReady?: boolean
+    publicLinkContextReady?: boolean
+  }
   themeState?: { availableThemes?: WebThemeType[]; currentTheme?: WebThemeType }
   messagesState?: { messages?: Message[] }
   modalsState?: { modals?: Modal[] }
@@ -16,6 +22,7 @@ export type PiniaMockOptions = {
 
 export function createMockStore({
   stubActions = true,
+  authState = {},
   themeState = {},
   messagesState = {},
   modalsState = {},
@@ -35,6 +42,7 @@ export function createMockStore({
   return createTestingPinia({
     stubActions,
     initialState: {
+      auth: { ...authState },
       messages: { messages: [], ...messagesState },
       modals: {
         modals: [],
diff --git a/packages/web-test-helpers/src/mocks/store/runtimeModuleMockOptions.ts b/packages/web-test-helpers/src/mocks/store/runtimeModuleMockOptions.ts
index 665a0caa139..8b73c5379b2 100644
--- a/packages/web-test-helpers/src/mocks/store/runtimeModuleMockOptions.ts
+++ b/packages/web-test-helpers/src/mocks/store/runtimeModuleMockOptions.ts
@@ -8,17 +8,6 @@ export const runtimeModuleMockOptions = {
           ancestorMetaData: jest.fn(() => ({}))
         }
       },
-      auth: {
-        namespaced: true,
-        getters: {
-          isPublicLinkContextReady: jest.fn(() => true),
-          isUserContextReady: jest.fn(() => true),
-          accessToken: jest.fn(() => '')
-        },
-        mutations: {
-          SET_PUBLIC_LINK_CONTEXT: jest.fn()
-        }
-      },
       spaces: {
         namespaced: true,
         getters: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9516ec8a494..d9ebf3bc211 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -612,9 +612,6 @@ importers:
       vue-concurrency:
         specifier: 4.0.1
         version: 4.0.1(vue@3.3.8)
-      vuex:
-        specifier: 4.1.0
-        version: 4.1.0(vue@3.3.8)
       web-app-admin-settings:
         specifier: workspace:*
         version: 'link:'
@@ -880,6 +877,9 @@ importers:
       mark.js:
         specifier: ^8.11.1
         version: 8.11.1
+      pinia:
+        specifier: 2.1.7
+        version: 2.1.7(typescript@5.3.3)(vue@3.3.8)
       vue3-gettext:
         specifier: 2.4.0
         version: 2.4.0(@vue/compiler-sfc@3.3.8)(vue@3.3.8)