diff --git a/changelog/unreleased/change-resources-store b/changelog/unreleased/change-resources-store
new file mode 100644
index 00000000000..0fb5eacd044
--- /dev/null
+++ b/changelog/unreleased/change-resources-store
@@ -0,0 +1,10 @@
+Change: Resources store to pinia
+
+BREAKING CHANGE for developers: Resources are no longer stored in a vuex store module but in pinia instead. You can access all the store functionality via the new `useResourcesStore` composable.
+
+Technically the former vuex store was only supposed to be used inside the files app. However, it was reachable from the outside as well and was therefore quite frequently used by other apps. So we decided to declare this as a breaking change.
+
+For more details please see the linked PR down below.
+
+https://github.com/owncloud/web/pull/10368
+https://github.com/owncloud/web/issues/10210
diff --git a/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue b/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue
index 71287022183..c7689a090f5 100644
--- a/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue
+++ b/packages/web-app-admin-settings/src/components/Spaces/ContextActions.vue
@@ -8,7 +8,6 @@
 import { computed, defineComponent, PropType, unref } from 'vue'
 import { SpaceResource } from '@ownclouders/web-client'
 import { ContextActionMenu } from '@ownclouders/web-pkg'
-import { useStore } from '@ownclouders/web-pkg'
 
 import {
   useSpaceActionsDelete,
@@ -30,10 +29,9 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const store = useStore()
     const filterParams = computed(() => ({ resources: props.items }))
 
-    const { actions: deleteActions } = useSpaceActionsDelete({ store })
+    const { actions: deleteActions } = useSpaceActionsDelete()
     const { actions: disableActions } = useSpaceActionsDisable()
     const { actions: editQuotaActions } = useSpaceActionsEditQuota()
     const { actions: editDescriptionActions } = useSpaceActionsEditDescription()
diff --git a/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue b/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue
index e6eea650240..bb2a2ea9ec3 100644
--- a/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue
+++ b/packages/web-app-admin-settings/src/components/Spaces/SideBar/ActionsPanel.vue
@@ -24,13 +24,11 @@ import {
 } from '@ownclouders/web-pkg'
 import { computed, defineComponent, inject, unref } from 'vue'
 import { SpaceResource } from '@ownclouders/web-client'
-import { useStore } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'ActionsPanel',
   components: { ActionMenuItem },
   setup() {
-    const store = useStore()
     const resource = inject<SpaceResource>('resource')
     const resources = computed(() => {
       return [unref(resource)]
@@ -39,7 +37,7 @@ export default defineComponent({
       resources: unref(resources)
     }))
 
-    const { actions: deleteActions } = useSpaceActionsDelete({ store })
+    const { actions: deleteActions } = useSpaceActionsDelete()
     const { actions: disableActions } = useSpaceActionsDisable()
     const { actions: editDescriptionActions } = useSpaceActionsEditDescription()
     const { actions: editQuotaActions } = useSpaceActionsEditQuota()
diff --git a/packages/web-app-admin-settings/src/views/Spaces.vue b/packages/web-app-admin-settings/src/views/Spaces.vue
index 685ae19c712..646586ca685 100644
--- a/packages/web-app-admin-settings/src/views/Spaces.vue
+++ b/packages/web-app-admin-settings/src/views/Spaces.vue
@@ -74,7 +74,6 @@ import {
   useSpaceActionsDisable,
   useSpaceActionsRestore,
   useSpaceActionsEditQuota,
-  useStore,
   useConfigStore
 } from '@ownclouders/web-pkg'
 import { buildSpace, SpaceResource } from '@ownclouders/web-client/src/helpers'
@@ -97,7 +96,6 @@ export default defineComponent({
     }
   },
   setup() {
-    const store = useStore()
     const spaces = ref([])
     const clientService = useClientService()
     const { $gettext } = useGettext()
@@ -161,7 +159,7 @@ export default defineComponent({
       selectedSpaces.value.splice(0, selectedSpaces.value.length)
     }
 
-    const { actions: deleteActions } = useSpaceActionsDelete({ store })
+    const { actions: deleteActions } = useSpaceActionsDelete()
     const { actions: disableActions } = useSpaceActionsDisable()
     const { actions: editQuotaActions } = useSpaceActionsEditQuota()
     const { actions: restoreActions } = useSpaceActionsRestore()
diff --git a/packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts b/packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts
index a34543a1597..6f1915f0f08 100644
--- a/packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/AppTemplate.spec.ts
@@ -1,10 +1,8 @@
 import { ref } from 'vue'
 import AppTemplate from '../../../src/components/AppTemplate.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   RouteLocation,
   shallowMount
 } from 'web-test-helpers'
@@ -25,8 +23,6 @@ const elSelectors = {
 
 jest.mock('@ownclouders/web-pkg')
 
-afterEach(() => jest.clearAllMocks())
-
 describe('AppTemplate', () => {
   describe('loading is true', () => {
     it('should show app loading spinner component', () => {
@@ -114,9 +110,6 @@ describe('AppTemplate', () => {
   })
 })
 
-const storeOptions = { ...defaultStoreMockOptions }
-const store = createStore(storeOptions)
-
 function getWrapper({ props = {}, isMobileWidth = false } = {}) {
   return {
     wrapper: shallowMount(AppTemplate, {
@@ -129,7 +122,7 @@ function getWrapper({ props = {}, isMobileWidth = false } = {}) {
         ...props
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         provide: { isMobileWidth: ref(isMobileWidth) },
         stubs: {
           OcButton: false
diff --git a/packages/web-app-admin-settings/tests/unit/components/Groups/ContextActions.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Groups/ContextActions.spec.ts
index 33f130c4ffc..d21eed2f423 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Groups/ContextActions.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Groups/ContextActions.spec.ts
@@ -1,4 +1,4 @@
-import { defaultPlugins, defaultStoreMockOptions, mount } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import ContextActions from '../../../../src/components/Groups/ContextActions.vue'
@@ -63,9 +63,7 @@ describe.skip('ContextActions', () => {
 })
 
 function getWrapper() {
-  const storeOptions = { ...defaultStoreMockOptions }
   return {
-    storeOptions,
     wrapper: mount(ContextActions, {
       props: {
         items: [mock<Resource>()]
diff --git a/packages/web-app-admin-settings/tests/unit/components/Groups/CreateGroupModal.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Groups/CreateGroupModal.spec.ts
index 25e8ce24ab6..31bc097baf6 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Groups/CreateGroupModal.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Groups/CreateGroupModal.spec.ts
@@ -1,9 +1,7 @@
 import CreateGroupModal from '../../../../src/components/Groups/CreateGroupModal.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   mockAxiosReject,
   mockAxiosResolve,
   shallowMount
@@ -114,12 +112,9 @@ describe('CreateGroupModal', () => {
 
 function getWrapper() {
   const mocks = defaultComponentMocks()
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   return {
     mocks,
-    storeOptions,
     wrapper: shallowMount(CreateGroupModal, {
       props: {
         modal: mock<Modal>()
@@ -127,7 +122,7 @@ function getWrapper() {
       global: {
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-app-admin-settings/tests/unit/components/Groups/SideBar/EditPanel.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Groups/SideBar/EditPanel.spec.ts
index 5b8d427c706..420a1164b1b 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Groups/SideBar/EditPanel.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Groups/SideBar/EditPanel.spec.ts
@@ -1,12 +1,5 @@
 import EditPanel from '../../../../../src/components/Groups/SideBar/EditPanel.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  mockAxiosReject,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, mockAxiosReject, mount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { AxiosResponse } from 'axios'
 
@@ -79,8 +72,6 @@ describe('EditPanel', () => {
 
 function getWrapper() {
   const mocks = defaultComponentMocks()
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   return {
     mocks,
@@ -91,7 +82,7 @@ function getWrapper() {
       global: {
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         stubs: {
           'oc-text-input': true,
           'avatar-image': true,
diff --git a/packages/web-app-admin-settings/tests/unit/components/Spaces/ContextActions.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Spaces/ContextActions.spec.ts
index afd00f4825b..e32eeb22fc5 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Spaces/ContextActions.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Spaces/ContextActions.spec.ts
@@ -1,11 +1,4 @@
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  defaultStubs,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, defaultStubs, mount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import ContextActions from '../../../../src/components/Spaces/ContextActions.vue'
@@ -55,13 +48,10 @@ describe.skip('ContextActions', () => {
 })
 
 function getWrapper() {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks()
   }
   return {
-    storeOptions,
     mocks,
     wrapper: mount(ContextActions, {
       props: {
@@ -70,7 +60,7 @@ function getWrapper() {
       global: {
         mocks,
         stubs: { ...defaultStubs, 'action-menu-item': true },
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-app-admin-settings/tests/unit/components/Spaces/SideBar/ActionsPanel.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Spaces/SideBar/ActionsPanel.spec.ts
index 54d385159eb..3b8168ed398 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Spaces/SideBar/ActionsPanel.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Spaces/SideBar/ActionsPanel.spec.ts
@@ -1,11 +1,4 @@
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  defaultStubs,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, defaultStubs, mount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import ActionsPanel from '../../../../../src/components/Spaces/SideBar/ActionsPanel.vue'
@@ -66,13 +59,10 @@ describe('ActionsPanel', () => {
 })
 
 function getWrapper() {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks()
   }
   return {
-    storeOptions,
     mocks,
     wrapper: mount(ActionsPanel, {
       props: {
@@ -81,7 +71,7 @@ function getWrapper() {
       global: {
         mocks,
         stubs: { ...defaultStubs, 'action-menu-item': true },
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/groups/useGroupActionsDelete.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/groups/useGroupActionsDelete.spec.ts
index d617bddc3b7..5c18e475820 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/groups/useGroupActionsDelete.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/groups/useGroupActionsDelete.spec.ts
@@ -3,12 +3,7 @@ import { mock } from 'jest-mock-extended'
 import { unref } from 'vue'
 import { Group } from '@ownclouders/web-client/src/generated'
 import { eventBus } from '@ownclouders/web-pkg'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 
 describe('useGroupActionsDelete', () => {
   describe('method "isEnabled"', () => {
@@ -69,24 +64,20 @@ function getWrapper({
   setup: (
     instance: ReturnType<typeof useGroupActionsDelete>,
     {
-      storeOptions,
       clientService
     }: {
-      storeOptions: typeof defaultStoreMockOptions
       clientService: ReturnType<typeof defaultComponentMocks>['$clientService']
     }
   ) => void
 }) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks()
   return {
     wrapper: getComposableWrapper(
       () => {
         const instance = useGroupActionsDelete()
-        setup(instance, { storeOptions, clientService: mocks.$clientService })
+        setup(instance, { clientService: mocks.$clientService })
       },
-      { store, mocks, provide: mocks }
+      { mocks, provide: mocks }
     )
   }
 }
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsDelete.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsDelete.spec.ts
index 28fd497ec0d..4f23f15a210 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsDelete.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsDelete.spec.ts
@@ -3,13 +3,7 @@ import { mock } from 'jest-mock-extended'
 import { unref } from 'vue'
 import { User } from '@ownclouders/web-client/src/generated'
 import { eventBus, useCapabilityStore } from '@ownclouders/web-pkg'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper,
-  writable
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper, writable } from 'web-test-helpers'
 
 describe('useUserActionsDelete', () => {
   describe('method "isEnabled"', () => {
@@ -65,24 +59,20 @@ function getWrapper({
   setup: (
     instance: ReturnType<typeof useUserActionsDelete>,
     {
-      storeOptions,
       clientService
     }: {
-      storeOptions: typeof defaultStoreMockOptions
       clientService: ReturnType<typeof defaultComponentMocks>['$clientService']
     }
   ) => void
 }) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks()
   return {
     wrapper: getComposableWrapper(
       () => {
         const instance = useUserActionsDelete()
-        setup(instance, { storeOptions, clientService: mocks.$clientService })
+        setup(instance, { clientService: mocks.$clientService })
       },
-      { store, mocks, provide: mocks }
+      { mocks, provide: mocks }
     )
   }
 }
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsEditLogin.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsEditLogin.spec.ts
index 5ebe06a257a..86c7aee76e2 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsEditLogin.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsEditLogin.spec.ts
@@ -2,12 +2,7 @@ import { useUserActionsEditLogin } from '../../../../../src/composables/actions/
 import { mock } from 'jest-mock-extended'
 import { unref } from 'vue'
 import { User } from '@ownclouders/web-client/src/generated'
-import {
-  createStore,
-  defaultStoreMockOptions,
-  getComposableWrapper,
-  writable
-} from 'web-test-helpers'
+import { getComposableWrapper, writable } from 'web-test-helpers'
 import { useCapabilityStore, useModals } from '@ownclouders/web-pkg'
 
 describe('useUserActionsEditLogin', () => {
@@ -50,25 +45,12 @@ describe('useUserActionsEditLogin', () => {
 function getWrapper({
   setup
 }: {
-  setup: (
-    instance: ReturnType<typeof useUserActionsEditLogin>,
-    {
-      storeOptions
-    }: {
-      storeOptions: typeof defaultStoreMockOptions
-    }
-  ) => void
+  setup: (instance: ReturnType<typeof useUserActionsEditLogin>) => void
 }) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
-
   return {
-    wrapper: getComposableWrapper(
-      () => {
-        const instance = useUserActionsEditLogin()
-        setup(instance, { storeOptions })
-      },
-      { store }
-    )
+    wrapper: getComposableWrapper(() => {
+      const instance = useUserActionsEditLogin()
+      setup(instance)
+    })
   }
 }
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsEditQuota.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsEditQuota.spec.ts
index 526bf8d1296..ee7c741cb66 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsEditQuota.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsEditQuota.spec.ts
@@ -1,12 +1,5 @@
 import { useUserActionsEditQuota } from '../../../../../src/composables/actions/users/useUserActionsEditQuota'
-
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper,
-  writable
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper, writable } from 'web-test-helpers'
 import { unref } from 'vue'
 import { useCapabilityStore, useModals } from '@ownclouders/web-pkg'
 
@@ -86,31 +79,17 @@ function getWrapper({
   setup
 }: {
   canEditSpaceQuota?: boolean
-  setup: (
-    instance: ReturnType<typeof useUserActionsEditQuota>,
-    {
-      storeOptions
-    }: {
-      storeOptions: typeof defaultStoreMockOptions
-    }
-  ) => void
+  setup: (instance: ReturnType<typeof useUserActionsEditQuota>) => void
 }) {
   const mocks = defaultComponentMocks()
 
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: { ...defaultStoreMockOptions.modules, user: { state: { id: 'alice', uuid: 1 } } }
-  }
-  const store = createStore(storeOptions)
-
   return {
     wrapper: getComposableWrapper(
       () => {
         const instance = useUserActionsEditQuota()
-        setup(instance, { storeOptions })
+        setup(instance)
       },
       {
-        store,
         mocks,
         pluginOptions: {
           abilities: canEditSpaceQuota ? [{ action: 'set-quota-all', subject: 'Drive' }] : []
diff --git a/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
index d7a86c2c7c7..361abfef173 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
@@ -2,13 +2,7 @@ import Groups from '../../../src/views/Groups.vue'
 import { mockAxiosResolve, mockAxiosReject } from 'web-test-helpers/src/mocks'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { ClientService, eventBus, useMessages } from '@ownclouders/web-pkg'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, mount } from 'web-test-helpers'
 import { Group } from '@ownclouders/web-client/src/generated'
 
 const selectors = { batchActionsStub: 'batch-actions-stub' }
@@ -125,13 +119,11 @@ describe('Groups view', () => {
 
 function getWrapper({ clientService = getClientServiceMock() } = {}) {
   const mocks = { ...defaultComponentMocks(), $clientService: clientService }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
+
   return {
-    storeOptions,
     wrapper: mount(Groups, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks,
         provide: mocks,
         stubs: {
diff --git a/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
index 8884a4afaeb..8eb82af3215 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Spaces.spec.ts
@@ -2,13 +2,7 @@ import { mockAxiosResolve } from 'web-test-helpers/src/mocks'
 import { Graph } from '@ownclouders/web-client'
 import { mockDeep } from 'jest-mock-extended'
 import { ClientService, useAppDefaults } from '@ownclouders/web-pkg'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, mount } from 'web-test-helpers'
 import Spaces from '../../../src/views/Spaces.vue'
 import { useAppDefaultsMock } from 'web-test-helpers/src/mocks/useAppDefaultsMock'
 
@@ -122,13 +116,10 @@ function getWrapper({ spaces = [{ name: 'Some Space' }] } = {}) {
     $clientService
   }
 
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
-
   return {
     wrapper: mount(Spaces, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks,
         provide: mocks,
         stubs: {
diff --git a/packages/web-app-external/tests/unit/app.spec.ts b/packages/web-app-external/tests/unit/app.spec.ts
index 17da59a7489..323d2cc7b68 100644
--- a/packages/web-app-external/tests/unit/app.spec.ts
+++ b/packages/web-app-external/tests/unit/app.spec.ts
@@ -1,10 +1,5 @@
 import { mock } from 'jest-mock-extended'
-import {
-  createStore,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  shallowMount
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount } from 'web-test-helpers'
 import { useRequest, useRouteQuery } from '@ownclouders/web-pkg'
 import { ref } from 'vue'
 
@@ -83,9 +78,6 @@ function createShallowMountWrapper(makeRequest = jest.fn().mockResolvedValue({ s
 
   jest.mocked(useRouteQuery).mockImplementation(() => ref('example-app'))
 
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
-
   const capabilities = {
     files: {
       app_providers: [{ apps_url: '/app/list', enabled: true, open_url: '/app/open' }]
@@ -104,8 +96,7 @@ function createShallowMountWrapper(makeRequest = jest.fn().mockResolvedValue({ s
               capabilityState: { capabilities },
               configState: { options: { editor: { openAsPreview: true } } }
             }
-          }),
-          store
+          })
         ]
       }
     })
diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
index ea76f7018d7..0b9758d1700 100644
--- a/packages/web-app-files/src/App.vue
+++ b/packages/web-app-files/src/App.vue
@@ -6,15 +6,15 @@
 </template>
 <script lang="ts">
 import { defineComponent, onBeforeUnmount, watch, ref } from 'vue'
-import { useRoute, useStore } from '@ownclouders/web-pkg'
-import { eventBus } from '@ownclouders/web-pkg'
+import { useRoute, eventBus, useResourcesStore } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   setup() {
-    const store = useStore<any>()
     const dragareaEnabled = ref(false)
+    const { resetSelection } = useResourcesStore()
+
     watch(useRoute(), () => {
-      store.dispatch('Files/resetFileSelection')
+      resetSelection()
     })
 
     const hideDropzone = () => {
diff --git a/packages/web-app-files/src/HandleUpload.ts b/packages/web-app-files/src/HandleUpload.ts
index 3c0fe514127..91af5cea8b1 100644
--- a/packages/web-app-files/src/HandleUpload.ts
+++ b/packages/web-app-files/src/HandleUpload.ts
@@ -5,12 +5,17 @@ import { basename, dirname, join } from 'path'
 import * as uuid from 'uuid'
 import { Language } from 'vue3-gettext'
 import { Ref, unref } from 'vue'
-import { Store } from 'vuex'
 import { RouteLocationNormalizedLoaded } from 'vue-router'
-import { Resource, SpaceResource } from '@ownclouders/web-client/src'
+import { SpaceResource } from '@ownclouders/web-client/src'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { ResourceConflict } from './helpers/resource'
-import { MessageStore, SpacesStore, UserStore, locationPublicLink } from '@ownclouders/web-pkg'
+import {
+  MessageStore,
+  ResourcesStore,
+  SpacesStore,
+  UserStore,
+  locationPublicLink
+} from '@ownclouders/web-pkg'
 import { locationSpacesGeneric, UppyService, UppyResource } from '@ownclouders/web-pkg'
 import { isPersonalSpaceResource, isShareSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { ClientService, queryItemAsString } from '@ownclouders/web-pkg'
@@ -20,10 +25,10 @@ export interface HandleUploadOptions {
   hasSpaces: Ref<boolean>
   language: Language
   route: Ref<RouteLocationNormalizedLoaded>
-  store: Store<any>
   userStore: UserStore
   messageStore: MessageStore
   spacesStore: SpacesStore
+  resourcesStore: ResourcesStore
   uppyService: UppyService
   id?: string
   space?: SpaceResource
@@ -51,10 +56,10 @@ export class HandleUpload extends BasePlugin {
   language: Language
   route: Ref<RouteLocationNormalizedLoaded>
   space: SpaceResource
-  store: Store<any>
   userStore: UserStore
   messageStore: MessageStore
   spacesStore: SpacesStore
+  resourcesStore: ResourcesStore
   uppyService: UppyService
   quotaCheckEnabled: boolean
   directoryTreeCreateEnabled: boolean
@@ -71,10 +76,10 @@ export class HandleUpload extends BasePlugin {
     this.language = opts.language
     this.route = opts.route
     this.space = opts.space
-    this.store = opts.store
     this.userStore = opts.userStore
     this.messageStore = opts.messageStore
     this.spacesStore = opts.spacesStore
+    this.resourcesStore = opts.resourcesStore
     this.uppyService = opts.uppyService
 
     this.quotaCheckEnabled = opts.quotaCheckEnabled ?? true
@@ -84,14 +89,6 @@ export class HandleUpload extends BasePlugin {
     this.handleUpload = this.handleUpload.bind(this)
   }
 
-  get currentFolder(): Resource {
-    return this.store.getters['Files/currentFolder']
-  }
-
-  get files(): Resource[] {
-    return this.store.getters['Files/files']
-  }
-
   removeFilesFromUpload(filesToUpload: UppyResource[]) {
     for (const file of filesToUpload) {
       this.uppy.removeFile(file.id)
@@ -108,7 +105,7 @@ export class HandleUpload extends BasePlugin {
   prepareFiles(files: UppyFile[]): UppyResource[] {
     const filesToUpload: Record<string, UppyResource> = {}
 
-    if (!this.currentFolder && unref(this.route)?.params?.token) {
+    if (!this.resourcesStore.currentFolder && unref(this.route)?.params?.token) {
       // public file drop
       const publicLinkToken = queryItemAsString(unref(this.route).params.token)
       let endpoint = urlJoin(
@@ -133,7 +130,7 @@ export class HandleUpload extends BasePlugin {
       this.uppy.setState({ files: { ...this.uppy.getState().files, ...filesToUpload } })
       return Object.values(filesToUpload)
     }
-    const { id: currentFolderId, path: currentFolderPath } = this.currentFolder
+    const { id: currentFolderId, path: currentFolderPath } = this.resourcesStore.currentFolder
 
     const { name, params, query } = unref(this.route)
     const topLevelFolderIds: Record<string, string> = {}
@@ -219,7 +216,7 @@ export class HandleUpload extends BasePlugin {
         return acc
       }
 
-      const existingFile = this.files.find(
+      const existingFile = this.resourcesStore.resources.find(
         (c) => !uppyResource.meta.relativeFolder && c.name === uppyResource.name
       )
       const existingFileSize = existingFile ? Number(existingFile.size) : 0
@@ -274,7 +271,7 @@ export class HandleUpload extends BasePlugin {
   async createDirectoryTree(filesToUpload: UppyResource[]): Promise<UppyResource[]> {
     const { webdav } = this.clientService
     const space = this.space
-    const { id: currentFolderId, path: currentFolderPath } = this.currentFolder
+    const { id: currentFolderId, path: currentFolderPath } = this.resourcesStore.currentFolder
 
     const routeName = filesToUpload[0].meta.routeName
     const routeDriveAliasAndItem = filesToUpload[0].meta.routeDriveAliasAndItem
@@ -394,7 +391,7 @@ export class HandleUpload extends BasePlugin {
 
     // name conflict handling
     if (this.conflictHandlingEnabled) {
-      const conflictHandler = new ResourceConflict(this.store, this.language)
+      const conflictHandler = new ResourceConflict(this.resourcesStore, this.language)
       const conflicts = conflictHandler.getConflicts(filesToUpload)
       if (conflicts.length) {
         const dashboard = document.getElementsByClassName('uppy-Dashboard')
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index fcee20c8469..dc9347165f1 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -188,6 +188,7 @@ import {
   useFileActions,
   useFileActionsCreateNewShortcut,
   useMessages,
+  useResourcesStore,
   useSpacesStore,
   useUserStore
 } from '@ownclouders/web-pkg'
@@ -197,7 +198,6 @@ import {
   useFileActionsCreateNewFolder,
   useFileActionsPaste,
   useRequest,
-  useStore,
   useClientService
 } from '@ownclouders/web-pkg'
 
@@ -258,7 +258,6 @@ export default defineComponent({
   setup(props) {
     const uppyService = useService<UppyService>('$uppyService')
     const clientService = useClientService()
-    const store = useStore()
     const userStore = useUserStore()
     const spacesStore = useSpacesStore()
     const messageStore = useMessages()
@@ -271,7 +270,10 @@ export default defineComponent({
     const { clearClipboard } = clipboardStore
     const { resources: clipboardResources } = storeToRefs(clipboardStore)
 
-    const areFileExtensionsShown = computed(() => unref(store.state.Files.areFileExtensionsShown))
+    const resourcesStore = useResourcesStore()
+    const { currentFolder } = storeToRefs(resourcesStore)
+
+    const areFileExtensionsShown = computed(() => unref(resourcesStore.areFileExtensionsShown))
 
     useUpload({ uppyService })
 
@@ -282,21 +284,20 @@ export default defineComponent({
         language,
         route,
         space: props.space,
-        store,
         userStore,
         spacesStore,
         messageStore,
+        resourcesStore,
         uppyService
       })
     }
 
-    let uploadCompletedSub
+    let uploadCompletedSub: string
 
-    const { actions: pasteFileActions } = useFileActionsPaste({ store })
+    const { actions: pasteFileActions } = useFileActionsPaste()
     const pasteFileAction = unref(pasteFileActions)[0].handler
 
     const { actions: createNewFolder } = useFileActionsCreateNewFolder({
-      store,
       space: props.space
     })
     const createNewFolderAction = computed(() => unref(createNewFolder)[0].handler)
@@ -306,7 +307,6 @@ export default defineComponent({
     const createNewShortcutAction = computed(() => unref(createNewShortcut)[0].handler)
 
     const { actions: createNewFileActions } = useFileActionsCreateNewFile({
-      store,
       space: props.space
     })
 
@@ -327,9 +327,6 @@ export default defineComponent({
       ].filter((e) => e.isEnabled())
     })
 
-    const currentFolder = computed<Resource>(() => {
-      return store.getters['Files/currentFolder']
-    })
     const canUpload = computed(() => {
       return unref(currentFolder)?.canUpload({ user: userStore.user })
     })
@@ -420,7 +417,7 @@ export default defineComponent({
     )
 
     return {
-      ...useFileActions({ store }),
+      ...useFileActions(),
       ...useRequest(),
       clientService,
       isPublicLocation: useActiveLocation(isLocationPublicActive, 'files-public-link'),
diff --git a/packages/web-app-files/src/components/AppBar/CreateSpace.vue b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
index 3a1c8c50f3a..ff7c6bbb550 100644
--- a/packages/web-app-files/src/components/AppBar/CreateSpace.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
@@ -20,25 +20,25 @@ import {
   useModals,
   useCreateSpace,
   useSpaceHelpers,
-  useStore,
   useMessages,
-  useSpacesStore
+  useSpacesStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   setup() {
-    const store = useStore()
     const { showMessage, showErrorMessage } = useMessages()
     const { $gettext } = useGettext()
     const { createSpace } = useCreateSpace()
     const { checkSpaceNameModalInput } = useSpaceHelpers()
     const { dispatchModal } = useModals()
     const spacesStore = useSpacesStore()
+    const { upsertResource } = useResourcesStore()
 
     const addNewSpace = async (name: string) => {
       try {
         const createdSpace = await createSpace(name)
-        store.commit('Files/UPSERT_RESOURCE', createdSpace)
+        upsertResource(createdSpace)
         spacesStore.upsertSpace(createdSpace)
         showMessage({ title: $gettext('Space was created successfully') })
       } catch (error) {
diff --git a/packages/web-app-files/src/components/EmbedActions/EmbedActions.vue b/packages/web-app-files/src/components/EmbedActions/EmbedActions.vue
index 50b4d0cf0b2..e77498be425 100644
--- a/packages/web-app-files/src/components/EmbedActions/EmbedActions.vue
+++ b/packages/web-app-files/src/components/EmbedActions/EmbedActions.vue
@@ -33,8 +33,8 @@ import {
   useAbility,
   useEmbedMode,
   useFileActionsCreateLink,
-  useSpacesStore,
-  useStore
+  useResourcesStore,
+  useSpacesStore
 } from '@ownclouders/web-pkg'
 import { Resource } from '@ownclouders/web-client'
 import { useGettext } from 'vue3-gettext'
@@ -42,19 +42,21 @@ import { storeToRefs } from 'pinia'
 
 export default {
   setup() {
-    const store = useStore()
     const ability = useAbility()
     const language = useGettext()
     const { isLocationPicker, postMessage } = useEmbedMode()
     const spacesStore = useSpacesStore()
     const { currentSpace: space } = storeToRefs(spacesStore)
 
+    const resourcesStore = useResourcesStore()
+    const { currentFolder, selectedResources } = storeToRefs(resourcesStore)
+
     const selectedFiles = computed<Resource[]>(() => {
       if (isLocationPicker.value) {
-        return [store.getters['Files/currentFolder']]
+        return [unref(currentFolder)]
       }
 
-      return store.getters['Files/selectedFiles']
+      return unref(selectedResources)
     })
 
     const { actions: createLinkActions } = useFileActionsCreateLink({ enforceModal: true })
diff --git a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
index 2990ca41d9f..504a62dcecf 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
@@ -134,11 +134,11 @@ import {
   SortField,
   useMessages,
   useResourceRouteResolver,
-  useStore,
   useTileSize,
   ViewModeConstants,
   ResourceGhostElement,
-  ResourceTile
+  ResourceTile,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 
 export default defineComponent({
@@ -197,11 +197,11 @@ export default defineComponent({
   },
   emits: ['fileClick', 'fileDropped', 'rowMounted', 'sort', 'update:selectedIds'],
   setup(props, context) {
-    const store = useStore()
     const { showMessage } = useMessages()
     const { $gettext } = useGettext()
+    const resourcesStore = useResourcesStore()
 
-    const areFileExtensionsShown = computed(() => store.state.Files.areFileExtensionsShown)
+    const areFileExtensionsShown = computed(() => resourcesStore.areFileExtensionsShown)
 
     const dragItem = ref()
     const ghostElementRef = ref()
diff --git a/packages/web-app-files/src/components/Search/List.vue b/packages/web-app-files/src/components/Search/List.vue
index 15382c780cf..acba6dcb6c5 100644
--- a/packages/web-app-files/src/components/Search/List.vue
+++ b/packages/web-app-files/src/components/Search/List.vue
@@ -135,9 +135,9 @@
             <list-info
               v-else-if="paginatedResources.length > 0"
               class="oc-width-1-1 oc-my-s"
-              :files="totalFilesCount.files"
-              :folders="totalFilesCount.folders"
-              :size="totalFilesSize"
+              :files="totalResourcesCount.files"
+              :folders="totalResourcesCount.folders"
+              :size="totalResourcesSize"
             />
           </template>
         </resource-table>
@@ -153,14 +153,18 @@
 
 <script lang="ts">
 import { useResourcesViewDefaults } from '../../composables'
-import { AppLoadingSpinner, useCapabilityStore, useConfigStore } from '@ownclouders/web-pkg'
+import {
+  AppLoadingSpinner,
+  useCapabilityStore,
+  useConfigStore,
+  useResourcesStore
+} from '@ownclouders/web-pkg'
 import { VisibilityObserver } from '@ownclouders/web-pkg'
-import { ImageType, ImageDimension } from '@ownclouders/web-pkg'
+import { ImageDimension } from '@ownclouders/web-pkg'
 import { NoContentMessage } from '@ownclouders/web-pkg'
 import { ResourceTable } from '@ownclouders/web-pkg'
 import { ContextActions, FileSideBar } from '@ownclouders/web-pkg'
 import { debounce } from 'lodash-es'
-import { mapMutations, mapGetters, mapActions } from 'vuex'
 import { useGettext } from 'vue3-gettext'
 import { AppBar } from '@ownclouders/web-pkg'
 import {
@@ -187,8 +191,7 @@ import {
   useGetMatchingSpace,
   useRoute,
   useRouteQuery,
-  useRouter,
-  useStore
+  useRouter
 } from '@ownclouders/web-pkg'
 import { onBeforeRouteLeave } from 'vue-router'
 import { useTask } from 'vue-concurrency'
@@ -245,7 +248,6 @@ export default defineComponent({
   },
   emits: ['search'],
   setup(props, { emit }) {
-    const store = useStore()
     const capabilityStore = useCapabilityStore()
     const router = useRouter()
     const route = useRoute()
@@ -254,6 +256,10 @@ export default defineComponent({
     const clientService = useClientService()
     const { getMatchingSpace } = useGetMatchingSpace()
 
+    const resourcesStore = useResourcesStore()
+    const { initResourceList, clearResourceList, updateResourceField } = resourcesStore
+    const { totalResourcesCount, totalResourcesSize } = storeToRefs(resourcesStore)
+
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
 
@@ -439,7 +445,7 @@ export default defineComponent({
       // Store resources are shared across table views, therefore
       // the store state needs a reset to prevent the old list of resources
       // from being rendered while the request retrieves the new resources from the server.
-      store.commit('Files/CLEAR_CURRENT_FILES_LIST', null)
+      clearResourceList()
 
       if (capabilityStore.filesTags) {
         await loadAvailableTagsTask.perform()
@@ -479,7 +485,7 @@ export default defineComponent({
     )
 
     return {
-      ...useFileActions({ store }),
+      ...useFileActions(),
       ...resourcesView,
       configOptions,
       loadAvailableTagsTask,
@@ -495,16 +501,20 @@ export default defineComponent({
       mediaTypeFilter,
       availableMediaTypeValues,
       getFakeResourceForIcon,
-      resourceDomSelector
+      resourceDomSelector,
+      initResourceList,
+      clearResourceList,
+      updateResourceField,
+      totalResourcesCount,
+      totalResourcesSize
     }
   },
   computed: {
-    ...mapGetters('Files', ['totalFilesCount', 'totalFilesSize']),
     displayThumbnails() {
       return !this.configOptions.disablePreviews
     },
     itemCount() {
-      return this.totalFilesCount.files + this.totalFilesCount.folders
+      return this.totalResourcesCount.files + this.totalResourcesCount.folders
     },
     rangeSupported() {
       return this.searchResult.totalResults
@@ -525,7 +535,7 @@ export default defineComponent({
       return this.$gettext(
         'Found %{totalResults}, showing the %{itemCount} best matching results',
         {
-          itemCount: this.itemCount,
+          itemCount: this.itemCount.toString(),
           totalResults: this.searchResult.totalResults
         }
       )
@@ -538,10 +548,10 @@ export default defineComponent({
           return
         }
 
-        this.CLEAR_CURRENT_FILES_LIST()
-        this.LOAD_FILES({
+        this.clearResourceList()
+        this.initResourceList({
           currentFolder: null,
-          files: this.searchResult.values.length
+          resources: this.searchResult.values.length
             ? this.searchResult.values.map((searchResult) => searchResult.data)
             : []
         })
@@ -554,22 +564,28 @@ export default defineComponent({
     visibilityObserver.disconnect()
   },
   methods: {
-    ...mapMutations('Files', ['CLEAR_CURRENT_FILES_LIST', 'LOAD_FILES']),
-    ...mapActions('Files', ['loadPreview']),
-    rowMounted(resource, component) {
+    rowMounted(resource: Resource, component) {
       if (!this.displayThumbnails) {
         return
       }
 
+      const loadPreview = async () => {
+        const preview = await this.$previewService.loadPreview(
+          {
+            space: this.getMatchingSpace(resource),
+            resource,
+            dimensions: ImageDimension.Thumbnail
+          },
+          true
+        )
+        if (preview) {
+          this.updateResourceField({ id: resource.id, field: 'thumbnail', value: preview })
+        }
+      }
+
       const debounced = debounce(({ unobserve }) => {
         unobserve()
-        this.loadPreview({
-          previewService: this.$previewService,
-          space: this.getMatchingSpace(resource),
-          resource,
-          dimensions: ImageDimension.Thumbnail,
-          type: ImageType.Thumbnail
-        })
+        loadPreview()
       }, 250)
 
       visibilityObserver.observe(component.$el, { onEnter: debounced, onExit: debounced.cancel })
diff --git a/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue b/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue
index c6c2a9383bc..64729ccfb8d 100644
--- a/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue
+++ b/packages/web-app-files/src/components/Shares/SharedWithMeSection.vue
@@ -95,14 +95,14 @@ import {
   useCapabilityStore,
   useConfigStore,
   useFileActions,
-  useFileActionsToggleHideShare
+  useFileActionsToggleHideShare,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { computed, defineComponent, PropType, unref } from 'vue'
 import { debounce } from 'lodash-es'
-import { ImageDimension, ImageType } from '@ownclouders/web-pkg'
+import { ImageDimension } from '@ownclouders/web-pkg'
 import { VisibilityObserver } from '@ownclouders/web-pkg'
-import { mapActions } from 'vuex'
-import { SortDir, useStore, useGetMatchingSpace } from '@ownclouders/web-pkg'
+import { SortDir, useGetMatchingSpace } from '@ownclouders/web-pkg'
 import { createLocationSpaces } from '@ownclouders/web-pkg'
 import ListInfo from '../../components/FilesList/ListInfo.vue'
 import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
@@ -195,15 +195,16 @@ export default defineComponent({
     }
   },
   setup() {
-    const store = useStore()
     const capabilityStore = useCapabilityStore()
     const configStore = useConfigStore()
     const { getMatchingSpace } = useGetMatchingSpace()
 
     const { triggerDefaultAction } = useFileActions()
-    const { actions: hideShareActions } = useFileActionsToggleHideShare({ store })
+    const { actions: hideShareActions } = useFileActionsToggleHideShare()
     const hideShareAction = computed(() => unref(hideShareActions)[0])
 
+    const { updateResourceField } = useResourcesStore()
+
     const resourceTargetRouteCallback = ({
       path,
       fileId,
@@ -221,8 +222,9 @@ export default defineComponent({
       triggerDefaultAction,
       hideShareAction,
       resourceTargetRouteCallback,
-      ...useSelectedResources({ store }),
-      getMatchingSpace
+      ...useSelectedResources(),
+      getMatchingSpace,
+      updateResourceField
     }
   },
 
@@ -258,29 +260,24 @@ export default defineComponent({
     visibilityObserver.disconnect()
   },
   methods: {
-    ...mapActions('Files', ['loadPreview', 'loadAvatars']),
+    rowMounted(resource: Resource, component) {
+      const loadPreview = async () => {
+        const preview = await this.$previewService.loadPreview(
+          {
+            space: this.getMatchingSpace(resource),
+            resource,
+            dimensions: ImageDimension.Thumbnail
+          },
+          true
+        )
+        if (preview) {
+          this.updateResourceField({ id: resource.id, field: 'thumbnail', value: preview })
+        }
+      }
 
-    rowMounted(resource, component) {
       const debounced = debounce(({ unobserve }) => {
         unobserve()
-        this.loadAvatars({
-          resource,
-          clientService: this.$clientService,
-          capabilityStore: this.capabilityStore,
-          configStore: this.configStore
-        })
-
-        if (!this.displayThumbnails) {
-          return
-        }
-
-        this.loadPreview({
-          previewService: this.$previewService,
-          space: this.getMatchingSpace(resource),
-          resource,
-          dimensions: ImageDimension.Thumbnail,
-          type: ImageType.Thumbnail
-        })
+        loadPreview()
       }, 250)
 
       visibilityObserver.observe(component.$el, {
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 5915a3036db..443ccd71546 100644
--- a/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue
+++ b/packages/web-app-files/src/components/SideBar/Actions/SpaceActions.vue
@@ -25,7 +25,7 @@
 import { computed, defineComponent, inject, Ref, ref, unref, VNodeRef } from 'vue'
 import { SpaceResource } from '@ownclouders/web-client'
 import { ActionMenuItem } from '@ownclouders/web-pkg'
-import { useStore, usePreviewService } from '@ownclouders/web-pkg'
+import { usePreviewService } from '@ownclouders/web-pkg'
 import {
   useSpaceActionsDelete,
   useSpaceActionsDisable,
@@ -43,7 +43,6 @@ export default defineComponent({
   name: 'SpaceActions',
   components: { ActionMenuItem },
   setup() {
-    const store = useStore()
     const previewService = usePreviewService()
     const resource = inject<Ref<SpaceResource>>('resource')
     const actionOptions = computed(() => ({
@@ -55,9 +54,9 @@ export default defineComponent({
       return previewService.getSupportedMimeTypes('image/').join(',')
     })
 
-    const { actions: deleteActions } = useSpaceActionsDelete({ store })
+    const { actions: deleteActions } = useSpaceActionsDelete()
     const { actions: disableActions } = useSpaceActionsDisable()
-    const { actions: duplicateActions } = useSpaceActionsDuplicate({ store })
+    const { actions: duplicateActions } = useSpaceActionsDuplicate()
     const { actions: editDescriptionActions } = useSpaceActionsEditDescription()
     const { actions: editQuotaActions } = useSpaceActionsEditQuota()
     const { actions: editReadmeContentActions } = useSpaceActionsEditReadmeContent()
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 f05d9080c19..526f4fc7ef2 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -130,11 +130,12 @@ import {
   useUserStore,
   useCapabilityStore,
   useConfigStore,
-  useClientService
+  useClientService,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import upperFirst from 'lodash-es/upperFirst'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
-import { useStore, usePreviewService, useGetMatchingSpace } from '@ownclouders/web-pkg'
+import { usePreviewService, useGetMatchingSpace } from '@ownclouders/web-pkg'
 import { getIndicators } from '@ownclouders/web-pkg'
 import {
   formatDateFromHTTP,
@@ -147,7 +148,7 @@ import { Resource, SpaceResource } from '@ownclouders/web-client'
 import { useTask } from 'vue-concurrency'
 import { useGettext } from 'vue3-gettext'
 import { getSharedAncestorRoute } from '@ownclouders/web-pkg'
-import { AncestorMetaData, ResourceIcon } from '@ownclouders/web-pkg'
+import { ResourceIcon } from '@ownclouders/web-pkg'
 import { tagsHelper } from '../../../helpers/contextualHelpers'
 import { ContextualHelper } from '@ownclouders/design-system/src/helpers'
 import TagsSelect from './TagsSelect.vue'
@@ -170,13 +171,15 @@ export default defineComponent({
   },
   setup(props) {
     const configStore = useConfigStore()
-    const store = useStore()
     const userStore = useUserStore()
     const capabilityStore = useCapabilityStore()
     const clientService = useClientService()
     const { getMatchingSpace } = useGetMatchingSpace()
     const language = useGettext()
 
+    const resourcesStore = useResourcesStore()
+    const { ancestorMetaData } = storeToRefs(resourcesStore)
+
     const { user } = storeToRefs(userStore)
 
     const resource = inject<Ref<Resource>>('resource')
@@ -220,9 +223,6 @@ export default defineComponent({
       return loadPreviewTask.isRunning || !loadPreviewTask.last
     })
 
-    const ancestorMetaData: Ref<AncestorMetaData> = computed(
-      () => store.getters['runtime/ancestorMetaData/ancestorMetaData']
-    )
     const sharedAncestor = computed(() => {
       return Object.values(unref(ancestorMetaData)).find(
         (a) =>
@@ -241,7 +241,7 @@ export default defineComponent({
        * webDavPath might not be set when user is navigating on public link,
        * even if the user is authenticated and the file owner.
        */
-      return store.getters['Files/areWebDavDetailsShown'] && unref(resource).webDavPath
+      return resourcesStore.areWebDavDetailsShown && unref(resource).webDavPath
     })
     const formatDateRelative = (date) => {
       return formatRelativeDateFromJSDate(new Date(date), language.current)
diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetailsMultiple.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetailsMultiple.vue
index cbeb341c016..1636d62c20f 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetailsMultiple.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetailsMultiple.vue
@@ -29,19 +29,24 @@
   </div>
 </template>
 <script lang="ts">
-import { mapGetters } from 'vuex'
 import { defineComponent } from 'vue'
-import { formatFileSize } from '@ownclouders/web-pkg'
+import { storeToRefs } from 'pinia'
+import { formatFileSize, useResourcesStore } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'FileDetailsMultiple',
   props: {
     showSpaceCount: { type: Boolean, default: false }
   },
+  setup() {
+    const resourcesStore = useResourcesStore()
+    const { selectedResources } = storeToRefs(resourcesStore)
+
+    return { selectedResources }
+  },
   computed: {
-    ...mapGetters('Files', ['selectedFiles']),
     selectedFilesCount() {
-      return this.selectedFiles.length
+      return this.selectedResources.length
     },
     selectedFilesString() {
       return this.$ngettext(
@@ -49,32 +54,32 @@ export default defineComponent({
         '%{ itemCount } items selected',
         this.selectedFilesCount,
         {
-          itemCount: this.selectedFilesCount
+          itemCount: this.selectedFilesCount.toString()
         }
       )
     },
     sizeValue() {
       let size = 0
-      this.selectedFiles.forEach((i) => (size += parseInt(i.size)))
+      this.selectedResources.forEach((i) => (size += parseInt(i.size.toString())))
       return formatFileSize(size, this.$language.current)
     },
     sizeText() {
       return this.$gettext('Size')
     },
     filesCount() {
-      return this.selectedFiles.filter((i) => i.type === 'file').length
+      return this.selectedResources.filter((i) => i.type === 'file').length
     },
     filesText() {
       return this.$gettext('Files')
     },
     foldersCount() {
-      return this.selectedFiles.filter((i) => i.type === 'folder').length
+      return this.selectedResources.filter((i) => i.type === 'folder').length
     },
     foldersText() {
       return this.$gettext('Folders')
     },
     spacesCount() {
-      return this.selectedFiles.filter((i) => i.type === 'space').length
+      return this.selectedResources.filter((i) => i.type === 'space').length
     },
     spacesText() {
       return this.$gettext('Spaces')
diff --git a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
index 035b44a74ad..bec4676c4c1 100644
--- a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
@@ -77,8 +77,8 @@ import {
   SideBarEventTopics,
   useClientService,
   useMessages,
-  useRouter,
-  useStore
+  useResourcesStore,
+  useRouter
 } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 import { useTask } from 'vue-concurrency'
@@ -112,10 +112,10 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const store = useStore()
     const { showErrorMessage } = useMessages()
     const clientService = useClientService()
     const router = useRouter()
+    const { updateResourceField } = useResourcesStore()
 
     const isPublicLocation = isLocationPublicActive(router, 'files-public-link')
     const type = unref(isPublicLocation) ? 'span' : 'router-link'
@@ -204,11 +204,7 @@ export default defineComponent({
           })
         }
 
-        store.commit('Files/UPDATE_RESOURCE_FIELD', {
-          id: id,
-          field: 'tags',
-          value: [...selectedTagLabels]
-        })
+        updateResourceField({ id: id, field: 'tags', value: [...selectedTagLabels] })
 
         eventBus.publish('sidebar.entity.saved')
         if (unref(tagSelect) !== null) {
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
index 2b7efd71412..da903b2f125 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -151,8 +151,7 @@ import {
   useMessages,
   useSpacesStore,
   useConfigStore,
-  useSharesStore,
-  useStore
+  useSharesStore
 } from '@ownclouders/web-pkg'
 
 import { computed, defineComponent, inject, ref, unref, watch, onMounted } from 'vue'
@@ -192,7 +191,6 @@ export default defineComponent({
   },
 
   setup() {
-    const store = useStore()
     const userStore = useUserStore()
     const clientService = useClientService()
     const spacesStore = useSpacesStore()
@@ -265,7 +263,6 @@ export default defineComponent({
     })
 
     return {
-      store,
       resource: inject<Resource>('resource'),
       hasResharing: capabilityRefs.sharingResharing,
       resharingDefault: capabilityRefs.sharingResharingDefault,
@@ -533,7 +530,6 @@ export default defineComponent({
               } else {
                 await this.addShare({
                   clientService: this.$clientService,
-                  vuexStore: this.store,
                   resource: this.resource,
                   path,
                   shareWith: collaborator.value.shareWith,
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index 059a2691197..d1f079dbe44 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -112,9 +112,7 @@
 <script lang="ts">
 import { computed, defineComponent, inject, ref, Ref, unref } from 'vue'
 import { DateTime } from 'luxon'
-import { mapMutations } from 'vuex'
 import {
-  useStore,
   useAbility,
   useExpirationRules,
   useDefaultLinkPermissions,
@@ -125,7 +123,8 @@ import {
   useUserStore,
   useMessages,
   useCapabilityStore,
-  useConfigStore
+  useConfigStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { shareViaLinkHelp, shareViaIndirectLinkHelp } from '../../../helpers/contextualHelpers'
 import {
@@ -160,7 +159,6 @@ export default defineComponent({
     NameAndCopy
   },
   setup() {
-    const store = useStore()
     const { showMessage, showErrorMessage } = useMessages()
     const userStore = useUserStore()
     const { $gettext } = useGettext()
@@ -172,9 +170,10 @@ export default defineComponent({
     const capabilityRefs = storeToRefs(capabilityStore)
     const { defaultLinkPermissions } = useDefaultLinkPermissions()
     const { dispatchModal } = useModals()
+    const { removeResources } = useResourcesStore()
 
     const sharesStore = useSharesStore()
-    const { updateLink, deleteLink, shares } = sharesStore
+    const { updateLink, deleteLink } = sharesStore
     const { outgoingLinks } = storeToRefs(sharesStore)
 
     const configStore = useConfigStore()
@@ -270,7 +269,6 @@ export default defineComponent({
     }
 
     return {
-      store,
       ability,
       space,
       resource,
@@ -300,7 +298,8 @@ export default defineComponent({
       addNewLink,
       dispatchModal,
       showMessage,
-      showErrorMessage
+      showErrorMessage,
+      removeResources
     }
   },
   computed: {
@@ -379,8 +378,6 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapMutations('Files', ['REMOVE_FILES']),
-
     toggleLinkListCollapsed() {
       this.linkListCollapsed = !this.linkListCollapsed
     },
@@ -526,8 +523,7 @@ export default defineComponent({
           clientService,
           share,
           path,
-          loadIndicators,
-          vuexStore: this.store
+          loadIndicators
         })
         this.showMessage({
           title: this.$gettext('Link was deleted successfully')
@@ -538,7 +534,7 @@ export default defineComponent({
             // spaces need their actual id instead of their share id to be removed from the file list
             lastLinkId = this.resource.id.toString()
           }
-          this.REMOVE_FILES([{ id: lastLinkId }])
+          this.removeResources([{ id: lastLinkId }] as Resource[])
         }
       } catch (e) {
         console.error(e)
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index 75986336199..6e8a4a832fb 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -87,10 +87,8 @@
 
 <script lang="ts">
 import { storeToRefs } from 'pinia'
-import { mapMutations } from 'vuex'
 import {
   useAbility,
-  useStore,
   useGetMatchingSpace,
   useModals,
   useUserStore,
@@ -98,7 +96,8 @@ import {
   useSpacesStore,
   useCapabilityStore,
   useConfigStore,
-  useSharesStore
+  useSharesStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { isLocationSharesActive } from '@ownclouders/web-pkg'
 import { textUtils } from '../../../helpers/textUtils'
@@ -117,7 +116,6 @@ import {
   User
 } from '@ownclouders/web-client/src/helpers'
 import { getSharedAncestorRoute } from '@ownclouders/web-pkg'
-import { AncestorMetaData } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'FileShares',
@@ -126,13 +124,17 @@ export default defineComponent({
     CollaboratorListItem
   },
   setup() {
-    const store = useStore()
     const userStore = useUserStore()
     const capabilityStore = useCapabilityStore()
     const capabilityRefs = storeToRefs(capabilityStore)
     const ability = useAbility()
     const { getMatchingSpace } = useGetMatchingSpace()
     const { dispatchModal } = useModals()
+
+    const resourcesStore = useResourcesStore()
+    const { removeResources } = resourcesStore
+    const { ancestorMetaData } = storeToRefs(resourcesStore)
+
     const spacesStore = useSpacesStore()
     const { spaceMembers } = storeToRefs(spacesStore)
 
@@ -163,10 +165,7 @@ export default defineComponent({
       return unref(spaceMembers).some((member) => member.collaborator?.name === username)
     })
 
-    const ancestorMetaData: Ref<AncestorMetaData> = computed(
-      () => store.getters['runtime/ancestorMetaData/ancestorMetaData']
-    )
-    const getSharedAncestor = (fileId) => {
+    const getSharedAncestor = (fileId: string) => {
       return Object.values(unref(ancestorMetaData)).find((a) => a.id === fileId)
     }
 
@@ -175,7 +174,6 @@ export default defineComponent({
     })
 
     return {
-      store,
       addShare,
       deleteShare,
       outgoingCollaborators,
@@ -198,6 +196,7 @@ export default defineComponent({
       configOptions,
       dispatchModal,
       spaceMembers,
+      removeResources,
       ...useMessages()
     }
   },
@@ -309,8 +308,6 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapMutations('Files', ['REMOVE_FILES']),
-
     getDeniedShare(collaborator: Share) {
       return this.collaborators.find(
         (c) =>
@@ -399,7 +396,6 @@ export default defineComponent({
         try {
           await this.addShare({
             clientService: this.$clientService,
-            vuexStore: this.store,
             resource: this.resource,
             shareWith: share.collaborator.name,
             shareType: share.shareType,
@@ -422,7 +418,6 @@ export default defineComponent({
         try {
           await this.deleteShare({
             clientService: this.$clientService,
-            vuexStore: this.store,
             share:
               share.shareType === ShareTypes.spaceUser.value ||
               share.shareType === ShareTypes.spaceGroup.value
@@ -469,7 +464,6 @@ export default defineComponent({
       try {
         await this.deleteShare({
           clientService: this.$clientService,
-          vuexStore: this.store,
           share: share,
           path,
           loadIndicators
@@ -479,7 +473,7 @@ export default defineComponent({
           title: this.$gettext('Share was removed successfully')
         })
         if (lastShareId && isLocationSharesActive(this.$router, 'files-shares-with-others')) {
-          this.REMOVE_FILES([{ id: lastShareId }])
+          this.removeResources([{ id: lastShareId }] as Resource[])
         }
       } catch (error) {
         console.error(error)
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 bcba4b17ea6..dfd6d8d6520 100644
--- a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
+++ b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
@@ -61,7 +61,7 @@ import {
   formatFileSize,
   useClientService,
   useDownloadFile,
-  useStore
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { computed, defineComponent, inject, Ref, ref, unref, watch } from 'vue'
 import { isShareSpaceResource, Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
@@ -79,10 +79,10 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const store = useStore()
     const clientService = useClientService()
     const { current: currentLanguage } = useGettext()
     const { downloadFile } = useDownloadFile({ clientService })
+    const { updateResourceField } = useResourcesStore()
 
     const space = inject<Ref<SpaceResource>>('space')
     const resource = inject<Ref<Resource>>('resource')
@@ -135,9 +135,9 @@ export default defineComponent({
       const fieldsToUpdate = ['size', 'mdate']
       for (const field of fieldsToUpdate) {
         if (Object.prototype.hasOwnProperty.call(unref(resource), field)) {
-          store.commit('Files/UPDATE_RESOURCE_FIELD', {
+          updateResourceField({
             id: unref(resource).id,
-            field,
+            field: field as any,
             value: restoredResource[field]
           })
         }
diff --git a/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue b/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
index f38dcc037c6..3daaa707484 100644
--- a/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
+++ b/packages/web-app-files/src/components/Spaces/SpaceContextActions.vue
@@ -31,7 +31,7 @@ import {
 } from '@ownclouders/web-pkg'
 import { isLocationSpacesActive } from '@ownclouders/web-pkg'
 import { computed, defineComponent, PropType, Ref, ref, toRef, unref, VNodeRef } from 'vue'
-import { useRouter, useStore, usePreviewService } from '@ownclouders/web-pkg'
+import { useRouter, usePreviewService } from '@ownclouders/web-pkg'
 import { FileActionOptions, SpaceActionOptions } from '@ownclouders/web-pkg'
 import { useFileActionsDownloadArchive } from '@ownclouders/web-pkg'
 
@@ -46,7 +46,6 @@ export default defineComponent({
   },
   setup(props) {
     const router = useRouter()
-    const store = useStore()
     const previewService = usePreviewService()
 
     const actionOptions = toRef(props, 'actionOptions') as Ref<SpaceActionOptions>
@@ -55,16 +54,16 @@ export default defineComponent({
       return previewService.getSupportedMimeTypes('image/').join(',')
     })
 
-    const { actions: deleteActions } = useSpaceActionsDelete({ store })
+    const { actions: deleteActions } = useSpaceActionsDelete()
     const { actions: disableActions } = useSpaceActionsDisable()
-    const { actions: duplicateActions } = useSpaceActionsDuplicate({ store })
+    const { actions: duplicateActions } = useSpaceActionsDuplicate()
     const { actions: editQuotaActions } = useSpaceActionsEditQuota()
     const { actions: editReadmeContentActions } = useSpaceActionsEditReadmeContent()
     const { actions: editDescriptionActions } = useSpaceActionsEditDescription()
     const { actions: renameActions } = useSpaceActionsRename()
     const { actions: restoreActions } = useSpaceActionsRestore()
-    const { actions: showDetailsActions } = useFileActionsShowDetails({ store })
-    const { actions: showMembersActions } = useSpaceActionsShowMembers({ store })
+    const { actions: showDetailsActions } = useFileActionsShowDetails()
+    const { actions: showMembersActions } = useSpaceActionsShowMembers()
     const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: navigateToTrashActions } = useSpaceActionsNavigateToTrash()
 
diff --git a/packages/web-app-files/src/components/Spaces/SpaceHeader.vue b/packages/web-app-files/src/components/Spaces/SpaceHeader.vue
index 9a4b18f502b..e0767aea609 100644
--- a/packages/web-app-files/src/components/Spaces/SpaceHeader.vue
+++ b/packages/web-app-files/src/components/Spaces/SpaceHeader.vue
@@ -85,10 +85,10 @@ import {
 import { SpaceResource } from '@ownclouders/web-client/src/helpers'
 import {
   useClientService,
-  useStore,
   usePreviewService,
   ProcessorType,
-  useSpacesStore
+  useSpacesStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { ImageDimension } from '@ownclouders/web-pkg'
 import { VisibilityObserver } from '@ownclouders/web-pkg'
@@ -120,9 +120,9 @@ export default defineComponent({
     const { $gettext, $ngettext } = language
     const clientService = useClientService()
     const { getFileContents, getFileInfo } = clientService.webdav
-    const store = useStore()
     const previewService = usePreviewService()
     const spacesStore = useSpacesStore()
+    const resourcesStore = useResourcesStore()
 
     const markdownContainerRef = ref(null)
     const markdownContent = ref('')
@@ -236,7 +236,7 @@ export default defineComponent({
     })
 
     const openSideBarSharePanel = () => {
-      store.commit('Files/SET_SELECTED_IDS', [])
+      resourcesStore.setSelection([])
       eventBus.publish(SideBarEventTopics.openWithPanel, 'space-share')
     }
 
diff --git a/packages/web-app-files/src/components/Spaces/WhitespaceContextMenu.vue b/packages/web-app-files/src/components/Spaces/WhitespaceContextMenu.vue
index 1579a442917..b3d6fe868c7 100644
--- a/packages/web-app-files/src/components/Spaces/WhitespaceContextMenu.vue
+++ b/packages/web-app-files/src/components/Spaces/WhitespaceContextMenu.vue
@@ -26,11 +26,15 @@
 <script lang="ts">
 import { computed, defineComponent, PropType, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
-import { useFileActionsPaste, useFileActionsShowDetails } from '@ownclouders/web-pkg'
+import {
+  useFileActionsPaste,
+  useFileActionsShowDetails,
+  useResourcesStore
+} from '@ownclouders/web-pkg'
 import { useFileActionsCreateNewFolder } from '@ownclouders/web-pkg'
 import { SpaceResource } from '@ownclouders/web-client/src'
-import { useStore } from '@ownclouders/web-pkg'
 import { ActionMenuItem } from '@ownclouders/web-pkg'
+import { storeToRefs } from 'pinia'
 
 export default defineComponent({
   name: 'WhitespaceContextMenu',
@@ -44,19 +48,19 @@ export default defineComponent({
   },
   setup(props) {
     const { $gettext } = useGettext()
-    const store = useStore()
+    const resourcesStore = useResourcesStore()
+    const { currentFolder } = storeToRefs(resourcesStore)
+
     const contextMenuLabel = computed(() => $gettext('Show context menu'))
-    const currentFolder = computed(() => store.getters['Files/currentFolder'])
     const actionOptions = computed(() => ({
       space: props.space,
       resources: [currentFolder.value]
     }))
     const { actions: createNewFolderAction } = useFileActionsCreateNewFolder({
-      store,
       space: props.space
     })
-    const { actions: showDetailsAction } = useFileActionsShowDetails({ store })
-    const { actions: pasteAction } = useFileActionsPaste({ store })
+    const { actions: showDetailsAction } = useFileActionsShowDetails()
+    const { actions: pasteAction } = useFileActionsPaste()
 
     const menuItemsActions = computed(() => {
       return [
diff --git a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
index 916314bc9b3..055718de843 100644
--- a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
+++ b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
@@ -1,11 +1,16 @@
-import { Key, KeyboardActions, ModifierKey, useClipboardStore } from '@ownclouders/web-pkg'
-import { useStore } from '@ownclouders/web-pkg'
+import {
+  Key,
+  KeyboardActions,
+  ModifierKey,
+  useClipboardStore,
+  useResourcesStore
+} from '@ownclouders/web-pkg'
 
 export const useKeyboardTableActions = (keyActions: KeyboardActions) => {
-  const store = useStore()
+  const resourcesStore = useResourcesStore()
   const { copyResources } = useClipboardStore()
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.C }, () => {
-    copyResources(store.getters['Files/selectedFiles'])
+    copyResources(resourcesStore.selectedResources)
   })
 }
diff --git a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableMouseActions.ts b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableMouseActions.ts
index 7753a20df13..311f61f735f 100644
--- a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableMouseActions.ts
+++ b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableMouseActions.ts
@@ -1,23 +1,24 @@
-import { onBeforeUnmount, onMounted, unref, computed, Ref, watchEffect } from 'vue'
-import { QueryValue, useStore, ViewModeConstants } from '@ownclouders/web-pkg'
+import { onBeforeUnmount, onMounted, unref, Ref, watchEffect } from 'vue'
+import { QueryValue, useResourcesStore, ViewModeConstants } from '@ownclouders/web-pkg'
 import { eventBus } from '@ownclouders/web-pkg'
 import { KeyboardActions } from '@ownclouders/web-pkg'
 import { Resource } from '@ownclouders/web-client'
 import { findIndex } from 'lodash-es'
+import { storeToRefs } from 'pinia'
 
 export const useKeyboardTableMouseActions = (
   keyActions: KeyboardActions,
   viewMode: Ref<string | QueryValue>
 ) => {
-  const store = useStore()
-  const latestSelectedId = computed(() => store.state.Files.latestSelectedId)
+  const resourcesStore = useResourcesStore()
+  const { latestSelectedId } = storeToRefs(resourcesStore)
 
-  let fileListClickedEvent
-  let fileListClickedMetaEvent
-  let fileListClickedShiftEvent
+  let fileListClickedEvent: string
+  let fileListClickedMetaEvent: string
+  let fileListClickedShiftEvent: string
 
   const handleCtrlClickAction = (resource: Resource) => {
-    store.dispatch('Files/toggleFileSelection', { id: resource.id })
+    resourcesStore.toggleSelection(resource.id)
   }
 
   const handleShiftClickAction = ({ resource, skipTargetSelection }) => {
@@ -41,9 +42,9 @@ export const useKeyboardTableMouseActions = (
       if ((skipTargetSelection && nodeId === resource.id) || isDisabled) {
         continue
       }
-      store.commit('Files/ADD_FILE_SELECTION', { id: nodeId })
+      resourcesStore.addSelection(nodeId)
     }
-    store.commit('Files/SET_LATEST_SELECTED_FILE_ID', resource.id)
+    resourcesStore.setLastSelectedId(resource.id)
   }
 
   const handleTilesShiftClickAction = ({ resource, skipTargetSelection }) => {
@@ -66,9 +67,9 @@ export const useKeyboardTableMouseActions = (
       if ((skipTargetSelection && nodeId === resource.id) || isDisabled) {
         continue
       }
-      store.commit('Files/ADD_FILE_SELECTION', { id: nodeId })
+      resourcesStore.addSelection(nodeId)
     }
-    store.commit('Files/SET_LATEST_SELECTED_FILE_ID', resource.id)
+    resourcesStore.setLastSelectedId(resource.id)
   }
 
   onMounted(() => {
diff --git a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableNavigation.ts b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableNavigation.ts
index efc964ae28f..ebda6f6814e 100644
--- a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableNavigation.ts
+++ b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableNavigation.ts
@@ -1,9 +1,10 @@
-import { QueryValue, useStore, ViewModeConstants } from '@ownclouders/web-pkg'
+import { QueryValue, useResourcesStore, ViewModeConstants } from '@ownclouders/web-pkg'
 import { useScrollTo } from '@ownclouders/web-pkg'
-import { computed, Ref, ref, unref, nextTick, watchEffect } from 'vue'
+import { Ref, ref, unref, nextTick, watchEffect } from 'vue'
 import { Key, KeyboardActions, ModifierKey } from '@ownclouders/web-pkg'
 import { Resource } from '@ownclouders/web-client'
 import { findIndex } from 'lodash-es'
+import { storeToRefs } from 'pinia'
 
 const enum Direction {
   LEFT = 'left',
@@ -14,9 +15,10 @@ export const useKeyboardTableNavigation = (
   paginatedResources: Ref<Resource[]>,
   viewMode: Ref<string | QueryValue>
 ) => {
-  const store = useStore()
   const { scrollToResource } = useScrollTo()
-  const latestSelectedId = computed(() => store.state.Files.latestSelectedId)
+  const resourcesStore = useResourcesStore()
+  const { latestSelectedId } = storeToRefs(resourcesStore)
+
   const bindKeyActionsIds = ref([])
   const tileViewStart = ref(null)
   const tileViewDirection = ref(null)
@@ -25,14 +27,14 @@ export const useKeyboardTableNavigation = (
     handleSelectAllAction()
   )
 
-  keyActions.bindKeyAction({ primary: Key.Space }, async () => {
-    await store.dispatch('Files/toggleFileSelection', { id: unref(latestSelectedId) })
+  keyActions.bindKeyAction({ primary: Key.Space }, () => {
+    resourcesStore.toggleSelection(unref(latestSelectedId))
   })
 
-  keyActions.bindKeyAction({ primary: Key.Esc }, async () => {
+  keyActions.bindKeyAction({ primary: Key.Esc }, () => {
     keyActions.resetSelectionCursor()
     tileViewStart.value = null
-    await store.dispatch('Files/resetFileSelection')
+    resourcesStore.resetSelection()
   })
 
   const bindTilesViewKeyActions = () => {
@@ -117,9 +119,9 @@ export const useKeyboardTableNavigation = (
     }
     keyActions.resetSelectionCursor()
     tileViewStart.value = null
-    await store.dispatch('Files/resetFileSelection')
+    resourcesStore.resetSelection()
     await nextTick()
-    store.commit('Files/ADD_FILE_SELECTION', { id: nextId })
+    resourcesStore.addSelection(nextId)
     await nextTick()
     scrollToResource(nextId, { topbarElement: 'files-app-bar' })
   }
@@ -172,9 +174,10 @@ export const useKeyboardTableNavigation = (
 
   const handleSelectAllAction = () => {
     keyActions.resetSelectionCursor()
-    store.commit(
-      'Files/SET_FILE_SELECTION',
-      unref(paginatedResources).filter((resource) => resource.processing !== true)
+    resourcesStore.setSelection(
+      unref(paginatedResources)
+        .filter((resource) => resource.processing !== true)
+        .map(({ id }) => id)
     )
   }
 
@@ -231,10 +234,10 @@ export const useKeyboardTableNavigation = (
       }
       const id = vp.tilesListCard[i].getAttribute('data-item-id')
       i < vp.tileViewStartIndex
-        ? store.commit('Files/ADD_FILE_SELECTION', { id })
-        : store.commit('Files/REMOVE_FILE_SELECTION', { id })
+        ? resourcesStore.addSelection(id)
+        : resourcesStore.removeSelection(id)
     }
-    store.commit('Files/SET_LATEST_SELECTED_FILE_ID', vp.lastSelectedFileId)
+    resourcesStore.setLastSelectedId(vp.lastSelectedFileId)
   }
   const handleTilesShiftDownAction = () => {
     const vp = getVerticalProperties(Direction.RIGHT)
@@ -248,13 +251,13 @@ export const useKeyboardTableNavigation = (
       }
       const id = vp.tilesListCard[i].getAttribute('data-item-id')
       i > vp.tileViewStartIndex
-        ? store.commit('Files/ADD_FILE_SELECTION', { id })
-        : store.commit('Files/REMOVE_FILE_SELECTION', { id })
+        ? resourcesStore.addSelection(id)
+        : resourcesStore.removeSelection(id)
     }
-    store.commit('Files/SET_LATEST_SELECTED_FILE_ID', vp.lastSelectedFileId)
+    resourcesStore.setLastSelectedId(vp.lastSelectedFileId)
   }
 
-  const handleTilesShiftHorizontalAction = async (direction: Direction) => {
+  const handleTilesShiftHorizontalAction = (direction: Direction) => {
     const nextResourceId = !unref(latestSelectedId)
       ? getFirstResourceId()
       : getNextResourceId(direction === Direction.LEFT, 1)
@@ -272,38 +275,38 @@ export const useKeyboardTableNavigation = (
       tileViewDirection.value = direction
     }
     if (tileViewDirection.value !== direction && tileViewDirection.value !== null) {
-      await store.dispatch('Files/toggleFileSelection', { id: unref(latestSelectedId) })
-      store.commit('Files/SET_LATEST_SELECTED_FILE_ID', nextResourceId)
+      resourcesStore.toggleSelection(unref(latestSelectedId))
+      resourcesStore.setLastSelectedId(nextResourceId)
     }
     if (tileViewDirection.value === direction) {
-      store.commit('Files/ADD_FILE_SELECTION', { id: nextResourceId })
+      resourcesStore.addSelection(nextResourceId)
     }
   }
 
-  const handleShiftUpAction = async (movedBy = 1) => {
+  const handleShiftUpAction = (movedBy = 1) => {
     const nextResourceId = getNextResourceId(true, movedBy)
     if (nextResourceId === -1) {
       return
     }
     if (unref(keyActions.selectionCursor) > 0) {
-      await store.dispatch('Files/toggleFileSelection', { id: unref(latestSelectedId) })
-      store.commit('Files/SET_LATEST_SELECTED_FILE_ID', nextResourceId)
+      resourcesStore.toggleSelection(unref(latestSelectedId))
+      resourcesStore.setLastSelectedId(nextResourceId)
     } else {
-      store.commit('Files/ADD_FILE_SELECTION', { id: nextResourceId })
+      resourcesStore.addSelection(nextResourceId)
     }
     scrollToResource(nextResourceId, { topbarElement: 'files-app-bar' })
     keyActions.selectionCursor.value = unref(keyActions.selectionCursor) - 1
   }
-  const handleShiftDownAction = async (movedBy = 1) => {
+  const handleShiftDownAction = (movedBy = 1) => {
     const nextResourceId = getNextResourceId(false, movedBy)
     if (nextResourceId === -1) {
       return
     }
     if (unref(keyActions.selectionCursor) < 0) {
-      await store.dispatch('Files/toggleFileSelection', { id: unref(latestSelectedId) })
-      store.commit('Files/SET_LATEST_SELECTED_FILE_ID', nextResourceId)
+      resourcesStore.toggleSelection(unref(latestSelectedId))
+      resourcesStore.setLastSelectedId(nextResourceId)
     } else {
-      store.commit('Files/ADD_FILE_SELECTION', { id: nextResourceId })
+      resourcesStore.addSelection(nextResourceId)
     }
     scrollToResource(nextResourceId, { topbarElement: 'files-app-bar' })
     keyActions.selectionCursor.value = unref(keyActions.selectionCursor) + 1
diff --git a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
index 81d0fa83fd9..bec1a4fb053 100644
--- a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
+++ b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
@@ -1,18 +1,23 @@
-import { Key, KeyboardActions, ModifierKey, useClipboardStore } from '@ownclouders/web-pkg'
+import {
+  Key,
+  KeyboardActions,
+  ModifierKey,
+  useClipboardStore,
+  useResourcesStore
+} from '@ownclouders/web-pkg'
 import { SpaceResource } from '@ownclouders/web-client'
-import { useStore } from '@ownclouders/web-pkg'
 import { unref } from 'vue'
 import { useFileActionsPaste } from '@ownclouders/web-pkg'
 
 export const useKeyboardTableSpaceActions = (keyActions: KeyboardActions, space: SpaceResource) => {
-  const store = useStore()
   const { copyResources, cutResources } = useClipboardStore()
+  const resourcesStore = useResourcesStore()
 
-  const { actions: pasteFileActions } = useFileActionsPaste({ store })
+  const { actions: pasteFileActions } = useFileActionsPaste()
   const pasteFileAction = unref(pasteFileActions)[0].handler
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.C }, () => {
-    copyResources(store.getters['Files/selectedFiles'])
+    copyResources(resourcesStore.selectedResources)
   })
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.V }, () => {
@@ -20,6 +25,6 @@ export const useKeyboardTableSpaceActions = (keyActions: KeyboardActions, space:
   })
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.X }, () => {
-    cutResources(store.getters['Files/selectedFiles'])
+    cutResources(resourcesStore.selectedResources)
   })
 }
diff --git a/packages/web-app-files/src/composables/parentShare/useIncomingParentShare.ts b/packages/web-app-files/src/composables/parentShare/useIncomingParentShare.ts
index d768c9607f4..8eee790c481 100644
--- a/packages/web-app-files/src/composables/parentShare/useIncomingParentShare.ts
+++ b/packages/web-app-files/src/composables/parentShare/useIncomingParentShare.ts
@@ -2,8 +2,8 @@ import { buildShare } from '@ownclouders/web-client/src/helpers/share'
 import {
   useClientService,
   useSpacesStore,
-  useStore,
-  useCapabilityStore
+  useCapabilityStore,
+  useSharesStore
 } from '@ownclouders/web-pkg'
 import { computed, ref, unref } from 'vue'
 import { useTask } from 'vue-concurrency'
@@ -18,12 +18,13 @@ import {
 import { DavProperty } from '@ownclouders/web-client/src/webdav/constants'
 
 export function useIncomingParentShare() {
-  const store = useStore()
   const spacesStore = useSpacesStore()
   const capabilityStore = useCapabilityStore()
   const clientService = useClientService()
+  const sharesStore = useSharesStore()
+
   const incomingParentShare = ref(null)
-  const incomingCollaborators = computed(() => store.getters['Files/incomingCollaborators'])
+  const incomingCollaborators = computed(() => sharesStore.incomingCollaborators)
 
   const loadIncomingParentShare = useTask(function* (signal, resource) {
     let parentShare
diff --git a/packages/web-app-files/src/composables/resourcesViewDefaults/useResourcesViewDefaults.ts b/packages/web-app-files/src/composables/resourcesViewDefaults/useResourcesViewDefaults.ts
index b778399f0c0..26abb6bafa8 100644
--- a/packages/web-app-files/src/composables/resourcesViewDefaults/useResourcesViewDefaults.ts
+++ b/packages/web-app-files/src/composables/resourcesViewDefaults/useResourcesViewDefaults.ts
@@ -1,15 +1,17 @@
 import { nextTick, computed, unref, Ref } from 'vue'
 import { folderService } from '../../services/folder'
 import { fileList } from '../../helpers/ui'
-import { usePagination, useSort, SortDir, SortField, useRouteName } from '@ownclouders/web-pkg'
-import { useSideBar } from '@ownclouders/web-pkg'
-
 import {
-  queryItemAsString,
-  useMutationSubscription,
-  useRouteQuery,
-  useStore
+  usePagination,
+  useSort,
+  SortDir,
+  SortField,
+  useRouteName,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
+import { useSideBar } from '@ownclouders/web-pkg'
+
+import { queryItemAsString, useRouteQuery } from '@ownclouders/web-pkg'
 import { determineSortFields as determineResourceTableSortFields } from '@ownclouders/web-pkg'
 import { determineSortFields as determineResourceTilesSortFields } from '../../helpers/ui/resourceTiles'
 import { Task } from 'vue-concurrency'
@@ -24,6 +26,7 @@ import {
 } from '@ownclouders/web-pkg'
 
 import { ScrollToResult, useScrollTo } from '@ownclouders/web-pkg'
+import { storeToRefs } from 'pinia'
 
 interface ResourcesViewDefaultsOptions<T, U extends any[]> {
   loadResourcesTask?: Task<T, U>
@@ -34,9 +37,9 @@ type ResourcesViewDefaultsResult<T, TT, TU extends any[]> = {
   refreshFileListHeaderPosition(): void
   loadResourcesTask: Task<TT, TU>
   areResourcesLoading: ReadOnlyRef<boolean>
-  storeItems: ReadOnlyRef<T[]>
+  storeItems: ReadOnlyRef<Resource[]>
   sortFields: ReadOnlyRef<SortField[]>
-  paginatedResources: Ref<T[]>
+  paginatedResources: Ref<Resource[]>
   paginationPages: ReadOnlyRef<number>
   paginationPage: ReadOnlyRef<number>
   handleSort({ sortBy, sortDir }: { sortBy: string; sortDir: SortDir }): void
@@ -45,7 +48,7 @@ type ResourcesViewDefaultsResult<T, TT, TU extends any[]> = {
   viewMode: ReadOnlyRef<string>
   viewSize: ReadOnlyRef<number>
   selectedResources: Ref<Resource[]>
-  selectedResourcesIds: Ref<(string | number)[]>
+  selectedResourcesIds: Ref<string[]>
   isResourceInSelection(resource: Resource): boolean
 
   isSideBarOpen: Ref<boolean>
@@ -61,10 +64,10 @@ export const useResourcesViewDefaults = <T, TT, TU extends any[]>(
     return loadResourcesTask.isRunning || !loadResourcesTask.last
   })
 
-  const store = useStore()
-  const { refresh: refreshFileListHeaderPosition, y: fileListHeaderY } = useFileListHeaderPosition()
+  const resourcesStore = useResourcesStore()
+  const { activeResources: storeItems } = storeToRefs(resourcesStore)
 
-  const storeItems = computed((): T[] => store.getters['Files/activeFiles'] || [])
+  const { refresh: refreshFileListHeaderPosition, y: fileListHeaderY } = useFileListHeaderPosition()
 
   const currentRoute = useRouteName()
   const currentViewModeQuery = useRouteQuery(
@@ -92,9 +95,14 @@ export const useResourcesViewDefaults = <T, TT, TU extends any[]>(
     page: paginationPage
   } = usePagination({ items, perPageStoragePrefix: 'files' })
 
-  useMutationSubscription(['Files/UPSERT_RESOURCE'], async ({ payload }) => {
+  const accentuateItem = async (id: string) => {
     await nextTick()
-    fileList.accentuateItem(payload.id)
+    fileList.accentuateItem(id)
+  }
+  resourcesStore.$onAction((action) => {
+    if (action.name === 'upsertResource') {
+      accentuateItem(action.args[0].id)
+    }
   })
 
   return {
@@ -112,7 +120,7 @@ export const useResourcesViewDefaults = <T, TT, TU extends any[]>(
     handleSort,
     sortBy,
     sortDir,
-    ...useSelectedResources({ store }),
+    ...useSelectedResources(),
     ...useSideBar(),
     ...useScrollTo()
   }
diff --git a/packages/web-app-files/src/helpers/resource/actions/upload.ts b/packages/web-app-files/src/helpers/resource/actions/upload.ts
index d1ec1fd02a8..fa670fbe8ea 100644
--- a/packages/web-app-files/src/helpers/resource/actions/upload.ts
+++ b/packages/web-app-files/src/helpers/resource/actions/upload.ts
@@ -1,5 +1,4 @@
 import { Language } from 'vue3-gettext'
-import { Store } from 'vuex'
 import { Resource } from '@ownclouders/web-client'
 import { extractExtensionFromFile } from '@ownclouders/web-client/src/helpers'
 import {
@@ -7,6 +6,7 @@ import {
   ResolveConflict,
   resolveFileNameDuplicate,
   ResolveStrategy,
+  ResourcesStore,
   UppyResource
 } from '@ownclouders/web-pkg'
 
@@ -16,17 +16,13 @@ interface ConflictedResource {
 }
 
 export class ResourceConflict extends ConflictDialog {
-  store: Store<any>
+  resourcesStore: ResourcesStore
 
-  constructor(store: Store<any>, language: Language) {
+  constructor(resourcesStore: ResourcesStore, language: Language) {
     const { $gettext, $ngettext } = language
     super($gettext, $ngettext)
 
-    this.store = store
-  }
-
-  get files(): Resource[] {
-    return this.store.getters['Files/files']
+    this.resourcesStore = resourcesStore
   }
 
   getConflicts(files: UppyResource[]): ConflictedResource[] {
@@ -36,7 +32,7 @@ export class ResourceConflict extends ConflictDialog {
       if (relativeFilePath) {
         // Logic for folders, applies to all files inside folder and subfolders
         const rootFolder = relativeFilePath.replace(/^\/+/, '').split('/')[0]
-        const exists = this.files.find((f) => f.name === rootFolder)
+        const exists = this.resourcesStore.resources.find((f) => f.name === rootFolder)
         if (exists) {
           if (conflicts.some((conflict) => conflict.name === rootFolder)) {
             continue
@@ -46,7 +42,9 @@ export class ResourceConflict extends ConflictDialog {
         }
       }
       // Logic for files
-      const exists = this.files.find((f) => f.name === file.name && !file.meta.relativeFolder)
+      const exists = this.resourcesStore.resources.find(
+        (f) => f.name === file.name && !file.meta.relativeFolder
+      )
       if (exists) {
         conflicts.push({ name: file.name, type: 'file' })
       }
@@ -135,7 +133,7 @@ export class ResourceConflict extends ConflictDialog {
     for (const fileName of filesToKeepBoth) {
       const file = files.find((e) => e.name === fileName && !e.meta.relativeFolder)
       const extension = extractExtensionFromFile({ name: fileName } as Resource)
-      file.name = resolveFileNameDuplicate(fileName, extension, this.files)
+      file.name = resolveFileNameDuplicate(fileName, extension, this.resourcesStore.resources)
       file.meta.name = file.name
       if (file.xhrUpload?.endpoint) {
         file.xhrUpload.endpoint = file.xhrUpload.endpoint.replace(
@@ -147,7 +145,7 @@ export class ResourceConflict extends ConflictDialog {
     for (const folder of foldersToKeepBoth) {
       const filesInFolder = files.filter((e) => e.meta.relativeFolder.split('/')[1] === folder)
       for (const file of filesInFolder) {
-        const newFolderName = resolveFileNameDuplicate(folder, '', this.files)
+        const newFolderName = resolveFileNameDuplicate(folder, '', this.resourcesStore.resources)
         file.meta.relativeFolder = file.meta.relativeFolder.replace(
           new RegExp(`/${folder}`),
           `/${newFolderName}`
diff --git a/packages/web-app-files/src/index.ts b/packages/web-app-files/src/index.ts
index 4f679303646..1afc5402b13 100644
--- a/packages/web-app-files/src/index.ts
+++ b/packages/web-app-files/src/index.ts
@@ -14,7 +14,6 @@ import {
   useSpacesStore,
   useUserStore
 } from '@ownclouders/web-pkg'
-import store from './store'
 import { extensions } from './extensions'
 import { buildRoutes } from '@ownclouders/web-pkg'
 import { AppNavigationItem } from '@ownclouders/web-pkg'
@@ -136,7 +135,6 @@ export default defineWebApplication({
           priority: 10
         }
       },
-      store,
       routes: buildRoutes({
         App,
         Favorites,
diff --git a/packages/web-app-files/src/services/folder.ts b/packages/web-app-files/src/services/folder.ts
index ec7a6e7cce1..27f69b07fa2 100644
--- a/packages/web-app-files/src/services/folder.ts
+++ b/packages/web-app-files/src/services/folder.ts
@@ -3,7 +3,6 @@ import { useTask } from 'vue-concurrency'
 import {
   useRouter,
   useClientService,
-  useStore,
   useUserStore,
   UserStore,
   SpacesStore,
@@ -11,10 +10,11 @@ import {
   CapabilityStore,
   useCapabilityStore,
   useConfigStore,
-  ConfigStore
+  ConfigStore,
+  ResourcesStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { unref } from 'vue'
-import { Store } from 'vuex'
 import { ClientService } from '@ownclouders/web-pkg'
 
 import {
@@ -33,15 +33,15 @@ export type FolderLoaderTask = any
 export type TaskContext = {
   clientService: ClientService
   configStore: ConfigStore
-  store: Store<any>
   userStore: UserStore
   spacesStore: SpacesStore
   router: Router
   capabilityStore: CapabilityStore
+  resourcesStore: ResourcesStore
 }
 
 export interface FolderLoader {
-  isEnabled(store: Store<any>): boolean
+  isEnabled(): boolean
   isActive(router: Router): boolean
   getTask(options: TaskContext): FolderLoaderTask
 }
@@ -61,14 +61,15 @@ export class FolderService {
   }
 
   public getTask(): FolderLoaderTask {
-    const store = useStore()
     const userStore = useUserStore()
     const spacesStore = useSpacesStore()
     const capabilityStore = useCapabilityStore()
     const router = useRouter()
     const clientService = useClientService()
     const configStore = useConfigStore()
-    const loader = this.loaders.find((l) => l.isEnabled(unref(store)) && l.isActive(unref(router)))
+    const resourcesStore = useResourcesStore()
+
+    const loader = this.loaders.find((l) => l.isEnabled() && l.isActive(unref(router)))
     if (!loader) {
       console.error('No folder loader found for route')
       return
@@ -78,10 +79,10 @@ export class FolderService {
       const context = {
         clientService,
         configStore,
-        store,
         userStore,
         spacesStore,
         capabilityStore,
+        resourcesStore,
         router
       }
       try {
diff --git a/packages/web-app-files/src/services/folder/loaderFavorites.ts b/packages/web-app-files/src/services/folder/loaderFavorites.ts
index 2ff2753035c..38e010f3318 100644
--- a/packages/web-app-files/src/services/folder/loaderFavorites.ts
+++ b/packages/web-app-files/src/services/folder/loaderFavorites.ts
@@ -16,15 +16,15 @@ export class FolderLoaderFavorites implements FolderLoader {
 
   public getTask(context: TaskContext): FolderLoaderTask {
     const {
-      store,
       userStore,
+      resourcesStore,
       clientService: { owncloudSdk: client }
     } = context
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return useTask(function* (signal1, signal2) {
-      store.commit('Files/CLEAR_CURRENT_FILES_LIST')
-      store.commit('runtime/ancestorMetaData/SET_ANCESTOR_META_DATA', {})
+      resourcesStore.clearResourceList()
+      resourcesStore.setAncestorMetaData({})
 
       // favorite implementation is going to change soon, so we are not implementing it
       // as a proper factory in our new WebDAV client for now
@@ -45,14 +45,8 @@ export class FolderLoaderFavorites implements FolderLoader {
         }
         return resource
       })
-      store.commit('Files/LOAD_FILES', {
-        currentFolder: null,
-        files: resources
-      })
-      store.dispatch('Files/loadIndicators', {
-        client: client,
-        currentFolder: '/'
-      })
+      resourcesStore.initResourceList({ currentFolder: null, resources })
+      resourcesStore.loadIndicators('/')
     })
   }
 }
diff --git a/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts b/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
index 9dd19790189..84f08f139ce 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
@@ -4,11 +4,9 @@ import { useTask } from 'vue-concurrency'
 import { isLocationSharesActive } from '@ownclouders/web-pkg'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
 import { aggregateResourceShares } from '@ownclouders/web-client/src/helpers/share'
-import { Store } from 'vuex'
 
 export class FolderLoaderSharedViaLink implements FolderLoader {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public isEnabled(store: Store<any>): boolean {
+  public isEnabled(): boolean {
     return true
   }
 
@@ -17,13 +15,14 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
   }
 
   public getTask(context: TaskContext): FolderLoaderTask {
-    const { store, userStore, spacesStore, clientService, configStore, capabilityStore } = context
+    const { userStore, spacesStore, clientService, configStore, capabilityStore, resourcesStore } =
+      context
     const { owncloudSdk: client } = clientService
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return useTask(function* (signal1, signal2) {
-      store.commit('Files/CLEAR_CURRENT_FILES_LIST')
-      store.commit('runtime/ancestorMetaData/SET_ANCESTOR_META_DATA', {})
+      resourcesStore.clearResourceList()
+      resourcesStore.setAncestorMetaData({})
 
       if (configStore.options.routing.fullShareOwnerPaths) {
         yield spacesStore.loadMountPoints({ graphClient: clientService.graphAuthenticated })
@@ -52,10 +51,7 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
         })
       }
 
-      store.commit('Files/LOAD_FILES', {
-        currentFolder: null,
-        files: resources
-      })
+      resourcesStore.initResourceList({ currentFolder: null, resources })
     })
   }
 }
diff --git a/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts b/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
index ba86defe9a8..8ee2231cf07 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
@@ -3,11 +3,9 @@ import { Router } from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { aggregateResourceShares } from '@ownclouders/web-client/src/helpers/share'
 import { isLocationSharesActive } from '@ownclouders/web-pkg'
-import { Store } from 'vuex'
 
 export class FolderLoaderSharedWithMe implements FolderLoader {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public isEnabled(store: Store<any>): boolean {
+  public isEnabled(): boolean {
     return true
   }
 
@@ -16,12 +14,13 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
   }
 
   public getTask(context: TaskContext): FolderLoaderTask {
-    const { store, userStore, spacesStore, clientService, configStore, capabilityStore } = context
+    const { userStore, spacesStore, clientService, configStore, capabilityStore, resourcesStore } =
+      context
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return useTask(function* (signal1, signal2) {
-      store.commit('Files/CLEAR_CURRENT_FILES_LIST')
-      store.commit('runtime/ancestorMetaData/SET_ANCESTOR_META_DATA', {})
+      resourcesStore.clearResourceList()
+      resourcesStore.setAncestorMetaData({})
 
       if (configStore.options.routing.fullShareOwnerPaths) {
         yield spacesStore.loadMountPoints({ graphClient: clientService.graphAuthenticated })
@@ -53,10 +52,7 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
         })
       }
 
-      store.commit('Files/LOAD_FILES', {
-        currentFolder: null,
-        files: resources
-      })
+      resourcesStore.initResourceList({ currentFolder: null, resources })
     })
   }
 }
diff --git a/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts b/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
index d9c5a633694..13493a9fc10 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
@@ -3,12 +3,10 @@ import { Router } from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { isLocationSharesActive } from '@ownclouders/web-pkg'
 import { aggregateResourceShares } from '@ownclouders/web-client/src/helpers/share'
-import { Store } from 'vuex'
 import { peopleRoleDenyFolder, ShareTypes } from '@ownclouders/web-client/src/helpers/share'
 
 export class FolderLoaderSharedWithOthers implements FolderLoader {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public isEnabled(store: Store<any>): boolean {
+  public isEnabled(): boolean {
     return true
   }
 
@@ -17,13 +15,14 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
   }
 
   public getTask(context: TaskContext): FolderLoaderTask {
-    const { store, userStore, spacesStore, clientService, configStore, capabilityStore } = context
+    const { userStore, spacesStore, clientService, configStore, capabilityStore, resourcesStore } =
+      context
     const { owncloudSdk: client } = clientService
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return useTask(function* (signal1, signal2) {
-      store.commit('Files/CLEAR_CURRENT_FILES_LIST')
-      store.commit('runtime/ancestorMetaData/SET_ANCESTOR_META_DATA', {})
+      resourcesStore.clearResourceList()
+      resourcesStore.setAncestorMetaData({})
 
       if (configStore.options.routing.fullShareOwnerPaths) {
         yield spacesStore.loadMountPoints({ graphClient: clientService.graphAuthenticated })
@@ -61,7 +60,7 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
         })
       }
 
-      store.commit('Files/LOAD_FILES', { currentFolder: null, files: resources })
+      resourcesStore.initResourceList({ currentFolder: null, resources })
     })
   }
 }
diff --git a/packages/web-app-files/src/services/folder/loaderSpace.ts b/packages/web-app-files/src/services/folder/loaderSpace.ts
index 06f2cbb850b..994628b67bb 100644
--- a/packages/web-app-files/src/services/folder/loaderSpace.ts
+++ b/packages/web-app-files/src/services/folder/loaderSpace.ts
@@ -32,7 +32,7 @@ export class FolderLoaderSpace implements FolderLoader {
   }
 
   public getTask(context: TaskContext): FolderLoaderTask {
-    const { store, userStore, spacesStore, router, clientService, configStore, capabilityStore } =
+    const { spacesStore, router, clientService, configStore, capabilityStore, resourcesStore } =
       context
     const { owncloudSdk: client, webdav } = clientService
     const { replaceInvalidFileRoute } = useFileRouteReplace({ router })
@@ -46,7 +46,7 @@ export class FolderLoaderSpace implements FolderLoader {
       options: FolderLoaderOptions = {}
     ) {
       try {
-        store.commit('Files/CLEAR_CURRENT_FILES_LIST')
+        resourcesStore.clearResourceList()
 
         // eslint-disable-next-line prefer-const
         let { resource: currentFolder, children: resources } = yield webdav.listFiles(space, {
@@ -76,17 +76,10 @@ export class FolderLoaderSpace implements FolderLoader {
           }
         }
 
-        yield store.dispatch('runtime/ancestorMetaData/loadAncestorMetaData', {
-          folder: currentFolder,
-          space,
-          client: webdav,
-          userStore,
-          spacesStore,
-          configStore
-        })
+        yield resourcesStore.loadAncestorMetaData({ folder: currentFolder, space, client: webdav })
 
         if (options.loadShares) {
-          const ancestorMetaData = store.getters['runtime/ancestorMetaData/ancestorMetaData']
+          const ancestorMetaData = resourcesStore.ancestorMetaData
           for (const file of resources) {
             file.indicators = getIndicators({ resource: file, ancestorMetaData })
           }
@@ -97,12 +90,9 @@ export class FolderLoaderSpace implements FolderLoader {
           resources.forEach((r) => (r.shareId = space.shareId))
         }
 
-        store.commit('Files/LOAD_FILES', {
-          currentFolder,
-          files: resources
-        })
+        resourcesStore.initResourceList({ currentFolder, resources })
       } catch (error) {
-        store.commit('Files/SET_CURRENT_FOLDER', null)
+        resourcesStore.setCurrentFolder(null)
         console.error(error)
 
         if (error.statusCode === 401) {
diff --git a/packages/web-app-files/src/services/folder/loaderTrashbin.ts b/packages/web-app-files/src/services/folder/loaderTrashbin.ts
index adfa28fe589..3c8294d933f 100644
--- a/packages/web-app-files/src/services/folder/loaderTrashbin.ts
+++ b/packages/web-app-files/src/services/folder/loaderTrashbin.ts
@@ -4,11 +4,9 @@ import { useTask } from 'vue-concurrency'
 import { DavProperties } from '@ownclouders/web-client/src/webdav/constants'
 import { isLocationTrashActive } from '@ownclouders/web-pkg'
 import { SpaceResource } from '@ownclouders/web-client/src/helpers'
-import { Store } from 'vuex'
 
 export class FolderLoaderTrashbin implements FolderLoader {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public isEnabled(store: Store<any>): boolean {
+  public isEnabled(): boolean {
     return true
   }
 
@@ -18,12 +16,12 @@ export class FolderLoaderTrashbin implements FolderLoader {
 
   public getTask(context: TaskContext): FolderLoaderTask {
     const {
-      store,
+      resourcesStore,
       clientService: { webdav }
     } = context
     return useTask(function* (signal1, signal2, space: SpaceResource) {
-      store.commit('Files/CLEAR_CURRENT_FILES_LIST')
-      store.commit('runtime/ancestorMetaData/SET_ANCESTOR_META_DATA', {})
+      resourcesStore.clearResourceList()
+      resourcesStore.setAncestorMetaData({})
 
       const { resource, children } = yield webdav.listFiles(
         space,
@@ -31,10 +29,7 @@ export class FolderLoaderTrashbin implements FolderLoader {
         { depth: 1, davProperties: DavProperties.Trashbin, isTrash: true }
       )
 
-      store.commit('Files/LOAD_FILES', {
-        currentFolder: resource,
-        files: children
-      })
+      resourcesStore.initResourceList({ currentFolder: resource, resources: children })
     })
   }
 }
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
deleted file mode 100644
index e422230443b..00000000000
--- a/packages/web-app-files/src/store/actions.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import { MessageStore, CapabilityStore, ConfigStore } from '@ownclouders/web-pkg'
-import { avatarUrl } from '../helpers/user'
-import { has } from 'lodash-es'
-import {
-  buildResource,
-  isProjectSpaceResource,
-  Resource,
-  SpaceResource
-} from '@ownclouders/web-client/src/helpers'
-import { ClientService, LoadingTaskCallbackArguments } from '@ownclouders/web-pkg'
-import { Language } from 'vue3-gettext'
-import { eventBus } from '@ownclouders/web-pkg'
-import { AncestorMetaData, SharesStore } from '@ownclouders/web-pkg'
-
-export default {
-  loadFiles(context, { currentFolder, files }) {
-    if (currentFolder) {
-      currentFolder = buildResource(currentFolder)
-    }
-    files = files.map(buildResource)
-    context.commit('LOAD_FILES', { currentFolder, files })
-  },
-  toggleFileSelection(context, file) {
-    if (context.state.selectedIds.includes(file.id)) {
-      context.commit('REMOVE_FILE_SELECTION', file)
-    } else {
-      context.commit('ADD_FILE_SELECTION', file)
-    }
-  },
-  resetFileSelection(context) {
-    context.commit('RESET_SELECTION')
-  },
-  markFavorite(context, payload) {
-    const file = payload.file
-    const client = payload.client
-    const newValue = !file.starred
-
-    return client.files
-      .favorite(file.webDavPath, newValue)
-      .then(() => {
-        context.commit('UPDATE_RESOURCE_FIELD', {
-          id: file.id,
-          field: 'starred',
-          value: newValue
-        })
-        if (!newValue) {
-          eventBus.publish('app.files.list.removeFromFavorites', file.id)
-        }
-      })
-      .catch((error) => {
-        throw new Error(error)
-      })
-  },
-  deleteFiles(
-    context,
-    options: {
-      space: SpaceResource
-      files: Resource[]
-      clientService: ClientService
-      loadingCallbackArgs: LoadingTaskCallbackArguments
-      firstRun: boolean
-      messageStore: MessageStore
-      sharesStore: SharesStore
-    } & Language
-  ) {
-    const {
-      $gettext,
-      $ngettext,
-      space,
-      files,
-      clientService,
-      loadingCallbackArgs,
-      sharesStore,
-      firstRun = true
-    } = options
-    const { setProgress } = loadingCallbackArgs
-    const promises = []
-    const removedFiles = []
-    for (const [i, file] of files.entries()) {
-      const promise = clientService.webdav
-        .deleteFile(space, file)
-        .then(() => {
-          removedFiles.push(file)
-        })
-        .catch((error) => {
-          let title = $gettext('Failed to delete "%{file}"', { file: file.name })
-          if (error.statusCode === 423) {
-            if (firstRun) {
-              return context.dispatch('deleteFiles', {
-                ...options,
-                space,
-                files: [file],
-                clientService,
-                sharesStore,
-                firstRun: false
-              })
-            }
-
-            title = $gettext('Failed to delete "%{file}" - the file is locked', { file: file.name })
-          }
-          options.messageStore.showErrorMessage({ title, errors: [error] })
-        })
-        .finally(() => {
-          setProgress({ total: files.length, current: i + 1 })
-        })
-      promises.push(promise)
-    }
-    return Promise.all(promises).then(() => {
-      context.commit('REMOVE_FILES', removedFiles)
-      context.commit('RESET_SELECTION')
-      sharesStore.pruneShares()
-
-      if (removedFiles.length) {
-        const title =
-          removedFiles.length === 1 && files.length === 1
-            ? $gettext('"%{item}" was moved to trash bin', { item: removedFiles[0].name })
-            : $ngettext(
-                '%{itemCount} item was moved to trash bin',
-                '%{itemCount} items were moved to trash bin',
-                removedFiles.length,
-                { itemCount: removedFiles.length.toString() },
-                true
-              )
-        options.messageStore.showMessage({ title })
-      }
-    })
-  },
-  clearTrashBin(context) {
-    context.commit('CLEAR_FILES')
-    context.commit('RESET_SELECTION')
-  },
-  removeFilesFromTrashbin(context, files) {
-    context.commit('REMOVE_FILES', files)
-    context.commit('RESET_SELECTION')
-  },
-  updateFileShareTypes({ getters, commit, rootState }, { path, outgoingShares }) {
-    const file = [...getters.files, getters.currentFolder].find((f) => f?.path === path)
-    if (!file || isProjectSpaceResource(file)) {
-      return
-    }
-
-    commit('UPDATE_RESOURCE_FIELD', {
-      id: file.id,
-      field: 'shareTypes',
-      value: computeShareTypes(outgoingShares.filter((s) => !s.indirect))
-    })
-
-    const ancestorEntry =
-      (rootState.runtime.ancestorMetaData.ancestorMetaData as AncestorMetaData)[file.path] ?? null
-    if (ancestorEntry) {
-      commit(
-        'runtime/ancestorMetaData/UPDATE_ANCESTOR_FIELD',
-        {
-          path: ancestorEntry.path,
-          field: 'shareTypes',
-          value: computeShareTypes(outgoingShares.filter((s) => !s.indirect))
-        },
-        { root: true }
-      )
-    }
-  },
-  loadAvatars(
-    { commit },
-    {
-      resource,
-      clientService,
-      capabilityStore,
-      configStore
-    }: {
-      resource: Resource
-      clientService: ClientService
-      capabilityStore: CapabilityStore
-      configStore: ConfigStore
-    }
-  ) {
-    if (!capabilityStore.sharingUserProfilePicture) {
-      return
-    }
-
-    ;['sharedWith', 'owner'].forEach((k) => {
-      ;(resource[k] || []).forEach((obj, i) => {
-        if (!has(obj, 'avatar')) {
-          return
-        }
-        avatarUrl(
-          {
-            clientService,
-            username: obj.username,
-            server: configStore.serverUrl
-          },
-          true
-        ).then((url) =>
-          commit('UPDATE_RESOURCE_FIELD', {
-            id: resource.id,
-            field: `${k}.[${i}].avatar`,
-            value: url
-          })
-        )
-      })
-    })
-  },
-
-  async loadPreview({ commit }, { previewService, space, resource, dimensions, type, processor }) {
-    const preview = await previewService.loadPreview(
-      { space, resource, dimensions, processor },
-      true
-    )
-    if (preview) {
-      commit('UPDATE_RESOURCE_FIELD', { id: resource.id, field: type, value: preview })
-    }
-  }
-}
-
-/**
- * @param {Array.<Object>} shares array of shares
- * @return {Array.<Integer>} array of share types
- */
-function computeShareTypes(shares) {
-  const shareTypes = new Set()
-  shares.forEach((share) => {
-    shareTypes.add(share.shareType)
-  })
-  return Array.from(shareTypes)
-}
diff --git a/packages/web-app-files/src/store/getters.ts b/packages/web-app-files/src/store/getters.ts
deleted file mode 100644
index dbeb23e1fdf..00000000000
--- a/packages/web-app-files/src/store/getters.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-
-export default {
-  selectedFiles: (state, getters) => {
-    return getters.files.filter((f) => state.selectedIds.includes(f.id))
-  },
-  files: (state) => {
-    return state.files
-  },
-  currentFolder: (state) => {
-    return state.currentFolder
-  },
-  activeFiles: (state, getters) => {
-    let files = [].concat(getters.files)
-
-    if (!state.areHiddenFilesShown) {
-      files = files.filter((file) => !file.name.startsWith('.'))
-    }
-
-    return files
-  },
-  totalFilesSize: (state, getters) => {
-    return getters.files.map((file) => parseInt(file.size)).reduce((x, y) => x + y, 0)
-  },
-  totalFilesCount: (state, getters) => {
-    const fileCount = getters.files.filter((file) => file.type === 'file').length
-    const folderCount = getters.files.filter((file) => file.type === 'folder').length
-    const spaceCount = getters.files.filter((file) => isProjectSpaceResource(file)).length
-    return {
-      files: fileCount,
-      folders: folderCount,
-      spaces: spaceCount
-    }
-  },
-  areHiddenFilesShown: (state) => {
-    return state.areHiddenFilesShown
-  },
-  areFileExtensionsShown: (state) => {
-    return state.areFileExtensionsShown
-  },
-  areWebDavDetailsShown: (state) => {
-    return state.areWebDavDetailsShown
-  }
-}
diff --git a/packages/web-app-files/src/store/index.ts b/packages/web-app-files/src/store/index.ts
deleted file mode 100644
index 6e4307cc734..00000000000
--- a/packages/web-app-files/src/store/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import state from './state'
-import actions from './actions'
-import mutations from './mutations'
-import getters from './getters'
-const namespaced = true
-
-export default {
-  namespaced,
-  state,
-  getters,
-  actions,
-  mutations
-}
diff --git a/packages/web-app-files/src/store/mutations.ts b/packages/web-app-files/src/store/mutations.ts
deleted file mode 100644
index 7578f75e971..00000000000
--- a/packages/web-app-files/src/store/mutations.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { set, has } from 'lodash-es'
-import { getIndicators } from '@ownclouders/web-pkg'
-
-export default {
-  LOAD_FILES(state, { currentFolder, files }) {
-    state.currentFolder = currentFolder
-    state.files = files
-  },
-  SET_CURRENT_FOLDER(state, currentFolder) {
-    state.currentFolder = currentFolder
-  },
-  CLEAR_FILES(state) {
-    state.files = []
-  },
-  SET_LATEST_SELECTED_FILE_ID(state, fileId) {
-    state.latestSelectedId = fileId
-  },
-  SET_FILE_SELECTION(state, selectedFiles) {
-    const latestSelected = selectedFiles.find((i) => !state.selectedIds.includes(i.id))
-    if (latestSelected) {
-      state.latestSelectedId = latestSelected.id
-    }
-    state.selectedIds = selectedFiles.map((f) => f.id)
-  },
-  SET_SELECTED_IDS(state, selectedIds) {
-    const latestSelectedId = selectedIds.find((id) => !state.selectedIds.includes(id))
-    if (latestSelectedId) {
-      state.latestSelectedId = latestSelectedId
-    }
-    state.selectedIds = selectedIds
-  },
-  ADD_FILE_SELECTION(state, file) {
-    const selected = [...state.selectedIds]
-    const fileIndex = selected.findIndex((id) => {
-      return id === file.id
-    })
-    state.latestSelectedId = file.id
-    if (fileIndex === -1) {
-      selected.push(file.id)
-      state.selectedIds = selected
-    }
-  },
-  REMOVE_FILE_SELECTION(state, file) {
-    const selected = [...state.selectedIds]
-    state.latestSelectedId = file.id
-    if (selected.length > 1) {
-      state.selectedIds = selected.filter((id) => file.id !== id)
-      return
-    }
-    state.selectedIds = []
-  },
-  RESET_SELECTION(state) {
-    state.selectedIds = []
-  },
-  REMOVE_FILES(state, removedFiles) {
-    state.files = [...state.files].filter((file) => !removedFiles.find((r) => r.id === file.id))
-  },
-  CLEAR_CURRENT_FILES_LIST(state) {
-    state.currentFolder = null
-    state.selectedIds = []
-    // release blob urls
-    state.files.forEach((item) => {
-      if (item.previewUrl && item.previewUrl.startsWith('blob:')) {
-        window.URL.revokeObjectURL(item.previewUrl)
-      }
-    })
-    state.files = []
-  },
-
-  SET_VERSIONS(state, versions) {
-    state.versions = versions
-  },
-
-  LOAD_INDICATORS(state, path) {
-    const files = state.files.filter((f) => f.path.startsWith(path))
-    for (const resource of files) {
-      const indicators = getIndicators({
-        resource,
-        ancestorMetaData: (this as any).getters['runtime/ancestorMetaData/ancestorMetaData']
-      })
-      if (!indicators.length && !resource.indicators.length) {
-        continue
-      }
-
-      ;(this as any).commit('Files/UPDATE_RESOURCE_FIELD', {
-        id: resource.id,
-        field: 'indicators',
-        value: indicators
-      })
-    }
-  },
-
-  /**
-   * Inserts or updates the given resource, depending on whether or not the resource is already loaded.
-   * Updating the resource always takes precedence, so that we don't duplicate resources in the store
-   * accidentally.
-   *
-   * @param state Current state of this store module
-   * @param resource A new or updated resource
-   */
-  UPSERT_RESOURCE(state, resource) {
-    $_upsertResource(state, resource, true)
-  },
-
-  UPSERT_RESOURCES(state, resources) {
-    const otherFiles = state.files.filter((f) => !resources.some((r) => r.path === f.path))
-    state.files = [...otherFiles, ...resources]
-  },
-
-  /**
-   * Updates the given resource in the store. If the resource doesn't exist in the store, the update
-   * will be ignored. If you also want to allow inserts, use UPSERT_RESOURCE instead.
-   *
-   * @param state Current state of this store module
-   * @param resource An updated resource
-   */
-  UPDATE_RESOURCE(state, resource) {
-    $_upsertResource(state, resource, false)
-  },
-
-  /**
-   * Updates a single resource field. If the resource with given id doesn't exist nothing will happen.
-   *
-   * @param state Current state of this store module
-   * @param params.id Id of the resource to be updated
-   * @param params.field the resource field that the value should be applied to
-   * @param params.value the value that will be attached to the key
-   */
-  UPDATE_RESOURCE_FIELD(state, params) {
-    let fileSource = state.files
-    let index = fileSource.findIndex((r) => r.id === params.id)
-    if (index < 0) {
-      if (state.currentFolder?.id === params.id) {
-        fileSource = [state.currentFolder]
-        index = 0
-      } else {
-        return
-      }
-    }
-
-    const resource = fileSource[index]
-    const isReactive = has(resource, params.field)
-    const newResource = set(resource, params.field, params.value)
-
-    if (isReactive) {
-      return
-    }
-
-    fileSource[index] = newResource
-  },
-
-  SET_HIDDEN_FILES_VISIBILITY(state, value) {
-    state.areHiddenFilesShown = value
-
-    window.localStorage.setItem('oc_hiddenFilesShown', value)
-  },
-
-  SET_FILE_EXTENSIONS_VISIBILITY(state, value) {
-    state.areFileExtensionsShown = value
-
-    window.localStorage.setItem('oc_fileExtensionsShown', value)
-  },
-
-  SET_FILE_WEB_DAV_DETAILS_VISIBILITY(state, value) {
-    state.areWebDavDetailsShown = value
-
-    window.localStorage.setItem('oc_webDavDetailsShown', value)
-  }
-}
-
-// eslint-disable-next-line camelcase
-function $_upsertResource(state, resource, allowInsert) {
-  const files = [...state.files]
-  let index = files.findIndex((r) => r.id === resource.id)
-  if (resource.webDavPath && resource.webDavPath.length && index === -1) {
-    index = files.findIndex((r) => r.webDavPath === resource.webDavPath)
-  }
-  const found = index > -1
-
-  if (!found && !allowInsert) {
-    return
-  }
-
-  if (found) {
-    Object.assign(files[index], resource)
-  } else {
-    files.push(resource)
-  }
-  state.files = files
-}
diff --git a/packages/web-app-files/src/store/state.ts b/packages/web-app-files/src/store/state.ts
deleted file mode 100644
index 0efdab4e366..00000000000
--- a/packages/web-app-files/src/store/state.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export default {
-  currentFolder: null,
-  files: [],
-  selectedIds: [],
-  latestSelectedId: null,
-
-  /**
-   * View settings
-   */
-  areHiddenFilesShown: true,
-  areFileExtensionsShown: true,
-  areWebDavDetailsShown: false
-}
diff --git a/packages/web-app-files/src/views/Favorites.vue b/packages/web-app-files/src/views/Favorites.vue
index 7fade0c3f3e..f501d14eefb 100644
--- a/packages/web-app-files/src/views/Favorites.vue
+++ b/packages/web-app-files/src/views/Favorites.vue
@@ -44,9 +44,9 @@
             <list-info
               v-if="paginatedResources.length > 0"
               class="oc-width-1-1 oc-my-s"
-              :files="totalFilesCount.files"
-              :folders="totalFilesCount.folders"
-              :size="totalFilesSize"
+              :files="totalResourcesCount.files"
+              :folders="totalResourcesCount.folders"
+              :size="totalResourcesSize"
             />
           </template>
         </resource-table>
@@ -62,17 +62,16 @@
 
 <script lang="ts">
 import { computed, defineComponent, onBeforeUnmount, onMounted, ref } from 'vue'
-import { mapGetters, mapActions } from 'vuex'
 import { debounce } from 'lodash-es'
 
 import { Resource } from '@ownclouders/web-client'
-import { VisibilityObserver, useConfigStore } from '@ownclouders/web-pkg'
-import { ImageDimension, ImageType } from '@ownclouders/web-pkg'
+import { VisibilityObserver, useConfigStore, useResourcesStore } from '@ownclouders/web-pkg'
+import { ImageDimension } from '@ownclouders/web-pkg'
 import { AppLoadingSpinner } from '@ownclouders/web-pkg'
 import { FileSideBar, NoContentMessage } from '@ownclouders/web-pkg'
 import { Pagination } from '@ownclouders/web-pkg'
 import { eventBus } from '@ownclouders/web-pkg'
-import { useGetMatchingSpace, useStore, ViewModeConstants } from '@ownclouders/web-pkg'
+import { useGetMatchingSpace, ViewModeConstants } from '@ownclouders/web-pkg'
 
 import { AppBar } from '@ownclouders/web-pkg'
 import QuickActions from '../components/FilesList/QuickActions.vue'
@@ -101,11 +100,14 @@ export default defineComponent({
   },
 
   setup() {
-    const store = useStore()
     const { getMatchingSpace } = useGetMatchingSpace()
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
 
+    const resourcesStore = useResourcesStore()
+    const { updateResourceField } = resourcesStore
+    const { totalResourcesCount, totalResourcesSize } = storeToRefs(resourcesStore)
+
     const viewModes = computed(() => [
       ViewModeConstants.condensedTable,
       ViewModeConstants.default,
@@ -118,7 +120,7 @@ export default defineComponent({
       loadResourcesEventToken.value = eventBus.subscribe(
         'app.files.list.removeFromFavorites',
         (resourceId: string) => {
-          store.commit('Files/REMOVE_FILES', [{ id: resourceId }])
+          resourcesStore.removeResources([{ id: resourceId }] as Resource[])
         }
       )
     })
@@ -133,13 +135,14 @@ export default defineComponent({
       ...useResourcesViewDefaults<Resource, any, any[]>(),
       configOptions,
       getMatchingSpace,
-      viewModes
+      viewModes,
+      updateResourceField,
+      totalResourcesCount,
+      totalResourcesSize
     }
   },
 
   computed: {
-    ...mapGetters('Files', ['totalFilesCount', 'totalFilesSize']),
-
     isEmpty() {
       return this.paginatedResources.length < 1
     },
@@ -155,22 +158,28 @@ export default defineComponent({
   },
 
   methods: {
-    ...mapActions('Files', ['loadPreview']),
-
-    rowMounted(resource, component) {
+    rowMounted(resource: Resource, component) {
       if (!this.displayThumbnails) {
         return
       }
 
+      const loadPreview = async () => {
+        const preview = await this.$previewService.loadPreview(
+          {
+            space: this.getMatchingSpace(resource),
+            resource,
+            dimensions: ImageDimension.Thumbnail
+          },
+          true
+        )
+        if (preview) {
+          this.updateResourceField({ id: resource.id, field: 'thumbnail', value: preview })
+        }
+      }
+
       const debounced = debounce(({ unobserve }) => {
         unobserve()
-        this.loadPreview({
-          previewService: this.$previewService,
-          space: this.getMatchingSpace(resource),
-          resource,
-          dimensions: ImageDimension.Thumbnail,
-          type: ImageType.Thumbnail
-        })
+        loadPreview()
       }, 250)
 
       visibilityObserver.observe(component.$el, { onEnter: debounced, onExit: debounced.cancel })
diff --git a/packages/web-app-files/src/views/FilesDrop.vue b/packages/web-app-files/src/views/FilesDrop.vue
index e33bc2245db..bb0419efccc 100644
--- a/packages/web-app-files/src/views/FilesDrop.vue
+++ b/packages/web-app-files/src/views/FilesDrop.vue
@@ -44,7 +44,8 @@ import {
   useSpacesStore,
   useThemeStore,
   useUserStore,
-  useCapabilityStore
+  useCapabilityStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import ResourceUpload from '../components/AppBar/Upload/ResourceUpload.vue'
 import {
@@ -60,7 +61,6 @@ import {
 import { useGettext } from 'vue3-gettext'
 import {
   useClientService,
-  useStore,
   useRouter,
   useRoute,
   useGetMatchingSpace,
@@ -82,7 +82,6 @@ export default defineComponent({
   },
   setup() {
     const uppyService = useService<UppyService>('$uppyService')
-    const store = useStore()
     const userStore = useUserStore()
     const messageStore = useMessages()
     const themeStore = useThemeStore()
@@ -97,6 +96,8 @@ export default defineComponent({
     const { getInternalSpace } = useGetMatchingSpace()
     useUpload({ uppyService })
 
+    const resourcesStore = useResourcesStore()
+
     const { currentTheme } = storeToRefs(themeStore)
     const themeSlogan = computed(() => currentTheme.value.common.slogan)
 
@@ -111,10 +112,10 @@ export default defineComponent({
         hasSpaces: capabilityStore.spacesEnabled,
         language,
         route,
-        store,
         userStore,
         spacesStore,
         messageStore,
+        resourcesStore,
         uppyService,
         quotaCheckEnabled: false,
         directoryTreeCreateEnabled: false,
diff --git a/packages/web-app-files/src/views/shares/SharedViaLink.vue b/packages/web-app-files/src/views/shares/SharedViaLink.vue
index 47c27458790..109290c01fa 100644
--- a/packages/web-app-files/src/views/shares/SharedViaLink.vue
+++ b/packages/web-app-files/src/views/shares/SharedViaLink.vue
@@ -46,9 +46,9 @@
             <list-info
               v-if="paginatedResources.length > 0"
               class="oc-width-1-1 oc-my-s"
-              :files="totalFilesCount.files"
-              :folders="totalFilesCount.folders"
-              :spaces="totalFilesCount.spaces"
+              :files="totalResourcesCount.files"
+              :folders="totalResourcesCount.folders"
+              :spaces="totalResourcesCount.spaces"
               :show-spaces="hasProjectSpaces"
             />
           </template>
@@ -64,16 +64,15 @@
 </template>
 
 <script lang="ts">
-import { mapGetters, mapActions } from 'vuex'
-
 import {
   FileSideBar,
   useCapabilityStore,
   useConfigStore,
-  useFileActions
+  useFileActions,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { VisibilityObserver } from '@ownclouders/web-pkg'
-import { ImageDimension, ImageType } from '@ownclouders/web-pkg'
+import { ImageDimension } from '@ownclouders/web-pkg'
 import { debounce } from 'lodash-es'
 
 import { AppLoadingSpinner } from '@ownclouders/web-pkg'
@@ -88,7 +87,7 @@ import { Pagination } from '@ownclouders/web-pkg'
 import { useResourcesViewDefaults } from '../../composables'
 import { defineComponent, unref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
-import { useGetMatchingSpace, useMutationSubscription } from '@ownclouders/web-pkg'
+import { useGetMatchingSpace } from '@ownclouders/web-pkg'
 import SharesNavigation from 'web-app-files/src/components/AppBar/SharesNavigation.vue'
 import { storeToRefs } from 'pinia'
 
@@ -115,26 +114,32 @@ export default defineComponent({
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
 
+    const resourcesStore = useResourcesStore()
+    const { updateResourceField } = resourcesStore
+    const { totalResourcesCount } = storeToRefs(resourcesStore)
+
     const { loadResourcesTask, selectedResourcesIds, paginatedResources } =
       useResourcesViewDefaults<Resource, any, any[]>()
 
-    useMutationSubscription(['Files/UPDATE_RESOURCE_FIELD'], async (mutation) => {
-      if (mutation.payload.field === 'shareTypes') {
-        if (selectedResourcesIds.value.length !== 1) return
-        const id = selectedResourcesIds.value[0]
+    resourcesStore.$onAction((action) => {
+      if (action.name !== 'updateResourceField') {
+        return
+      }
 
-        const match = unref(paginatedResources).find((r) => {
-          return r.id === id
-        })
-        if (!match) return
+      if (selectedResourcesIds.value.length !== 1) return
+      const id = selectedResourcesIds.value[0]
 
-        await loadResourcesTask.perform()
+      const match = unref(paginatedResources).find((r) => {
+        return r.id === id
+      })
+      if (!match) return
 
-        const matchedNewResource = unref(paginatedResources).find((r) => r.fileId === match.fileId)
-        if (!matchedNewResource) return
+      loadResourcesTask.perform()
 
-        selectedResourcesIds.value = [matchedNewResource.id]
-      }
+      const matchedNewResource = unref(paginatedResources).find((r) => r.fileId === match.fileId)
+      if (!matchedNewResource) return
+
+      selectedResourcesIds.value = [matchedNewResource.id]
     })
 
     return {
@@ -142,13 +147,13 @@ export default defineComponent({
       ...useResourcesViewDefaults<Resource, any, any[]>(),
       configOptions,
       getMatchingSpace,
+      totalResourcesCount,
+      updateResourceField,
       hasProjectSpaces: capabilityRefs.spacesProjects
     }
   },
 
   computed: {
-    ...mapGetters('Files', ['totalFilesCount']),
-
     helpersEnabled() {
       return this.configOptions.contextHelpers
     },
@@ -172,22 +177,28 @@ export default defineComponent({
   },
 
   methods: {
-    ...mapActions('Files', ['loadPreview']),
-
-    rowMounted(resource, component) {
+    rowMounted(resource: Resource, component) {
       if (!this.displayThumbnails) {
         return
       }
 
+      const loadPreview = async () => {
+        const preview = await this.$previewService.loadPreview(
+          {
+            space: this.getMatchingSpace(resource),
+            resource,
+            dimensions: ImageDimension.Thumbnail
+          },
+          true
+        )
+        if (preview) {
+          this.updateResourceField({ id: resource.id, field: 'thumbnail', value: preview })
+        }
+      }
+
       const debounced = debounce(({ unobserve }) => {
         unobserve()
-        this.loadPreview({
-          previewService: this.$previewService,
-          space: this.getMatchingSpace(resource),
-          resource,
-          dimensions: ImageDimension.Thumbnail,
-          type: ImageType.Thumbnail
-        })
+        loadPreview()
       }, 250)
 
       visibilityObserver.observe(component.$el, { onEnter: debounced, onExit: debounced.cancel })
diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue
index d82b7af5312..4cf16c774f0 100644
--- a/packages/web-app-files/src/views/shares/SharedWithMe.vue
+++ b/packages/web-app-files/src/views/shares/SharedWithMe.vue
@@ -102,7 +102,8 @@ import {
   FileSideBar,
   InlineFilterOption,
   ItemFilter,
-  useConfigStore
+  useConfigStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { AppBar, ItemFilterInline } from '@ownclouders/web-pkg'
 import { queryItemAsString, useRouteQuery } from '@ownclouders/web-pkg'
@@ -114,7 +115,7 @@ import { useGetMatchingSpace, useSort } from '@ownclouders/web-pkg'
 import { useGroupingSettings } from '@ownclouders/web-pkg'
 import SharesNavigation from 'web-app-files/src/components/AppBar/SharesNavigation.vue'
 import { useGettext } from 'vue3-gettext'
-import { useStore, useOpenWithDefaultApp, defaultFuseOptions } from '@ownclouders/web-pkg'
+import { useOpenWithDefaultApp, defaultFuseOptions } from '@ownclouders/web-pkg'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers'
 import { uniq } from 'lodash-es'
 
@@ -133,6 +134,7 @@ export default defineComponent({
   setup() {
     const { openWithDefaultApp } = useOpenWithDefaultApp()
     const configStore = useConfigStore()
+    const resourcesStore = useResourcesStore()
 
     const {
       areResourcesLoading,
@@ -164,7 +166,7 @@ export default defineComponent({
 
     const setAreHiddenFilesShown = (value: InlineFilterOption) => {
       areHiddenFilesShown.value = value.name === 'hidden'
-      store.dispatch('Files/resetFileSelection')
+      resourcesStore.resetSelection()
     }
 
     const visibleShares = computed(() => unref(storeItems).filter((r) => !r.hidden))
@@ -221,7 +223,6 @@ export default defineComponent({
     })
 
     const { getMatchingSpace } = useGetMatchingSpace()
-    const store = useStore()
 
     const displayThumbnails = computed(() => configStore.options.disablePreviews)
 
diff --git a/packages/web-app-files/src/views/shares/SharedWithOthers.vue b/packages/web-app-files/src/views/shares/SharedWithOthers.vue
index a2e39541ca8..926a8373311 100644
--- a/packages/web-app-files/src/views/shares/SharedWithOthers.vue
+++ b/packages/web-app-files/src/views/shares/SharedWithOthers.vue
@@ -69,8 +69,8 @@
             <list-info
               v-if="filteredItems.length > 0"
               class="oc-width-1-1 oc-my-s"
-              :files="totalFilesCount.files"
-              :folders="totalFilesCount.folders"
+              :files="totalResourcesCount.files"
+              :folders="totalResourcesCount.folders"
             />
           </template>
         </resource-table>
@@ -85,17 +85,16 @@
 </template>
 
 <script lang="ts">
-import { mapGetters, mapActions } from 'vuex'
-
 import {
   queryItemAsString,
   useCapabilityStore,
   useConfigStore,
   useFileActions,
+  useResourcesStore,
   useRouteQuery
 } from '@ownclouders/web-pkg'
 import { VisibilityObserver, ItemFilter } from '@ownclouders/web-pkg'
-import { ImageDimension, ImageType } from '@ownclouders/web-pkg'
+import { ImageDimension } from '@ownclouders/web-pkg'
 import { debounce, uniq } from 'lodash-es'
 
 import { FileSideBar, ResourceTable } from '@ownclouders/web-pkg'
@@ -111,7 +110,7 @@ import { useResourcesViewDefaults } from '../../composables'
 import { defineComponent, computed, unref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
 import { useGroupingSettings } from '@ownclouders/web-pkg'
-import { useGetMatchingSpace, useMutationSubscription } from '@ownclouders/web-pkg'
+import { useGetMatchingSpace } from '@ownclouders/web-pkg'
 import SharesNavigation from 'web-app-files/src/components/AppBar/SharesNavigation.vue'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers'
 import { storeToRefs } from 'pinia'
@@ -139,6 +138,10 @@ export default defineComponent({
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
 
+    const resourcesStore = useResourcesStore()
+    const { updateResourceField } = resourcesStore
+    const { totalResourcesCount } = storeToRefs(resourcesStore)
+
     const resourcesViewDefaults = useResourcesViewDefaults<Resource, any, any[]>()
     const { sortBy, sortDir, loadResourcesTask, selectedResourcesIds, paginatedResources } =
       resourcesViewDefaults
@@ -158,23 +161,25 @@ export default defineComponent({
       })
     })
 
-    useMutationSubscription(['Files/UPDATE_RESOURCE_FIELD'], async (mutation) => {
-      if (mutation.payload.field === 'shareTypes') {
-        if (selectedResourcesIds.value.length !== 1) return
-        const id = selectedResourcesIds.value[0]
+    resourcesStore.$onAction((action) => {
+      if (action.name !== 'updateResourceField') {
+        return
+      }
+
+      if (selectedResourcesIds.value.length !== 1) return
+      const id = selectedResourcesIds.value[0]
 
-        const match = unref(paginatedResources).find((r) => {
-          return r.id === id
-        })
-        if (!match) return
+      const match = unref(paginatedResources).find((r) => {
+        return r.id === id
+      })
+      if (!match) return
 
-        await loadResourcesTask.perform()
+      loadResourcesTask.perform()
 
-        const matchedNewResource = unref(paginatedResources).find((r) => r.fileId === match.fileId)
-        if (!matchedNewResource) return
+      const matchedNewResource = unref(paginatedResources).find((r) => r.fileId === match.fileId)
+      if (!matchedNewResource) return
 
-        selectedResourcesIds.value = [matchedNewResource.id]
-      }
+      selectedResourcesIds.value = [matchedNewResource.id]
     })
 
     return {
@@ -186,6 +191,8 @@ export default defineComponent({
       filteredItems,
       shareTypes,
       getMatchingSpace,
+      totalResourcesCount,
+      updateResourceField,
 
       // CERN
       ...useGroupingSettings({ sortBy, sortDir })
@@ -193,8 +200,6 @@ export default defineComponent({
   },
 
   computed: {
-    ...mapGetters('Files', ['totalFilesCount']),
-
     isEmpty() {
       return this.paginatedResources.length < 1
     },
@@ -214,29 +219,24 @@ export default defineComponent({
   },
 
   methods: {
-    ...mapActions('Files', ['loadPreview', 'loadAvatars']),
+    rowMounted(resource: Resource, component) {
+      const loadPreview = async () => {
+        const preview = await this.$previewService.loadPreview(
+          {
+            space: this.getMatchingSpace(resource),
+            resource,
+            dimensions: ImageDimension.Thumbnail
+          },
+          true
+        )
+        if (preview) {
+          this.updateResourceField({ id: resource.id, field: 'thumbnail', value: preview })
+        }
+      }
 
-    rowMounted(resource, component) {
       const debounced = debounce(({ unobserve }) => {
         unobserve()
-        this.loadAvatars({
-          resource,
-          clientService: this.$clientService,
-          capabilityStore: this.capabilityStore,
-          configStore: this.configStore
-        })
-
-        if (!this.displayThumbnails) {
-          return
-        }
-
-        this.loadPreview({
-          previewService: this.$previewService,
-          space: this.getMatchingSpace(resource),
-          resource,
-          dimensions: ImageDimension.Thumbnail,
-          type: ImageType.Thumbnail
-        })
+        loadPreview()
       }, 250)
 
       visibilityObserver.observe(component.$el, { onEnter: debounced, onExit: debounced.cancel })
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index 827531a8b47..75da4aee139 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -88,9 +88,9 @@
               <list-info
                 v-if="paginatedResources.length > 0"
                 class="oc-width-1-1 oc-my-s"
-                :files="totalFilesCount.files"
-                :folders="totalFilesCount.folders"
-                :size="totalFilesSize"
+                :files="totalResourcesCount.files"
+                :folders="totalResourcesCount.folders"
+                :size="totalResourcesSize"
               />
             </template>
           </resource-tiles>
@@ -138,9 +138,9 @@
               <list-info
                 v-if="paginatedResources.length > 0"
                 class="oc-width-1-1 oc-my-s"
-                :files="totalFilesCount.files"
-                :folders="totalFilesCount.folders"
-                :size="totalFilesSize"
+                :files="totalResourcesCount.files"
+                :folders="totalResourcesCount.folders"
+                :size="totalResourcesSize"
               />
             </template>
           </resource-table>
@@ -156,7 +156,6 @@ import { debounce, omit, last } from 'lodash-es'
 import { basename } from 'path'
 import { computed, defineComponent, PropType, onBeforeUnmount, onMounted, unref, ref } from 'vue'
 import { RouteLocationNamedRaw } from 'vue-router'
-import { mapGetters, mapActions, mapMutations, useStore } from 'vuex'
 import { useGettext } from 'vue3-gettext'
 import { Resource } from '@ownclouders/web-client'
 import {
@@ -176,6 +175,7 @@ import {
   useEmbedMode,
   useFileActions,
   useFileActionsCreateNewFolder,
+  useResourcesStore,
   useUserStore
 } from '@ownclouders/web-pkg'
 
@@ -188,7 +188,6 @@ import {
   Pagination,
   ResourceTable,
   CreateTargetRouteOptions,
-  ImageType,
   ViewModeConstants,
   VisibilityObserver,
   createFileRouteOptions,
@@ -266,7 +265,6 @@ export default defineComponent({
   },
 
   setup(props) {
-    const store = useStore()
     const userStore = useUserStore()
     const capabilityStore = useCapabilityStore()
     const capabilityRefs = storeToRefs(capabilityStore)
@@ -275,19 +273,20 @@ export default defineComponent({
     const clientService = useClientService()
     const { breadcrumbsFromPath, concatBreadcrumbs } = useBreadcrumbsFromPath()
     const { openWithDefaultApp } = useOpenWithDefaultApp()
-    const { actions: createNewFolder } = useFileActionsCreateNewFolder({
-      store,
-      space: props.space
-    })
+    const { actions: createNewFolder } = useFileActionsCreateNewFolder({ space: props.space })
     const { isEnabled: isEmbedModeEnabled } = useEmbedMode()
 
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
 
+    const resourcesStore = useResourcesStore()
+    const { removeResources, resetSelection, updateResourceField } = resourcesStore
+    const { currentFolder, totalResourcesCount, totalResourcesSize } = storeToRefs(resourcesStore)
+
     let loadResourcesEventToken: string
 
     const canUpload = computed(() => {
-      return store.getters['Files/currentFolder']?.canUpload({ user: userStore.user })
+      return unref(currentFolder)?.canUpload({ user: userStore.user })
     })
 
     const viewModes = computed(() => [
@@ -312,7 +311,7 @@ export default defineComponent({
       return props.space.driveType === 'project' && props.item === '/'
     })
 
-    const folderNotFound = computed(() => store.getters['Files/currentFolder'] === null)
+    const folderNotFound = computed(() => unref(currentFolder) === null)
 
     const isCurrentFolderEmpty = computed(
       () => unref(resourcesViewDefaults.paginatedResources).length < 1
@@ -421,14 +420,14 @@ export default defineComponent({
         return
       }
 
-      const totalFilesCount = store.getters['Files/totalFilesCount']
+      const totalFilesCount = unref(totalResourcesCount)
       const itemCount = totalFilesCount.files + totalFilesCount.folders
 
       const announcement = $ngettext(
         'This folder contains %{ amount } item.',
         'This folder contains %{ amount } items.',
         itemCount,
-        { amount: itemCount }
+        { amount: itemCount.toString() }
       )
 
       const translatedHint = itemCount > 0 ? announcement : $gettext('This folder has no content.')
@@ -474,7 +473,7 @@ export default defineComponent({
       )
 
       resourcesViewDefaults.scrollToResourceFromRoute(
-        [store.getters['Files/currentFolder'], ...unref(resourcesViewDefaults.paginatedResources)],
+        [unref(currentFolder), ...unref(resourcesViewDefaults.paginatedResources)],
         'files-app-bar'
       )
       resourcesViewDefaults.refreshFileListHeaderPosition()
@@ -515,7 +514,7 @@ export default defineComponent({
 
     const whitespaceContextMenu = ref(null)
     const showContextMenu = (event) => {
-      store.commit('Files/RESET_SELECTION')
+      resourcesStore.resetSelection()
       displayPositionedDropdown(
         unref(whitespaceContextMenu).$el._tippy,
         event,
@@ -545,13 +544,17 @@ export default defineComponent({
       clientService,
       hasShareJail: capabilityRefs.spacesShareJail,
       createNewFolderAction,
-      isEmbedModeEnabled
+      isEmbedModeEnabled,
+      currentFolder,
+      totalResourcesCount,
+      totalResourcesSize,
+      removeResources,
+      resetSelection,
+      updateResourceField
     }
   },
 
   computed: {
-    ...mapGetters('Files', ['currentFolder', 'totalFilesCount', 'totalFilesSize']),
-
     displayFullAppBar() {
       return !this.displayResourceAsSingleResource
     },
@@ -608,9 +611,6 @@ export default defineComponent({
   },
 
   methods: {
-    ...mapActions('Files', ['loadPreview']),
-    ...mapMutations('Files', ['REMOVE_FILES', 'RESET_SELECTION']),
-
     async fileDropped(fileTarget) {
       const selected = [...this.selectedResources]
       let targetFolder = null
@@ -657,29 +657,38 @@ export default defineComponent({
         this.$ngettext
       )
       const movedResources = await copyMove.perform(TransferType.MOVE)
-      this.REMOVE_FILES(movedResources)
-      this.RESET_SELECTION()
+      this.removeResources(movedResources)
+      this.resetSelection()
     },
 
-    rowMounted(resource, component, dimensions) {
+    rowMounted(resource: Resource, component, dimensions) {
       if (!this.displayThumbnails) {
         return
       }
 
-      const debounced = debounce(({ unobserve }) => {
-        unobserve()
+      const loadPreview = async () => {
         const processor =
           this.viewMode === ViewModeConstants.tilesView.name
             ? ProcessorType.enum.fit
             : ProcessorType.enum.thumbnail
-        this.loadPreview({
-          previewService: this.$previewService,
-          space: this.space,
-          resource,
-          dimensions,
-          processor,
-          type: ImageType.Thumbnail
-        })
+
+        const preview = await this.$previewService.loadPreview(
+          {
+            space: this.space,
+            resource,
+            processor,
+            dimensions
+          },
+          true
+        )
+        if (preview) {
+          this.updateResourceField({ id: resource.id, field: 'thumbnail', value: preview })
+        }
+      }
+
+      const debounced = debounce(({ unobserve }) => {
+        unobserve()
+        loadPreview()
       }, 250)
 
       visibilityObserver.observe(component.$el, { onEnter: debounced, onExit: debounced.cancel })
diff --git a/packages/web-app-files/src/views/spaces/GenericTrash.vue b/packages/web-app-files/src/views/spaces/GenericTrash.vue
index ccaef215de5..76050c6c711 100644
--- a/packages/web-app-files/src/views/spaces/GenericTrash.vue
+++ b/packages/web-app-files/src/views/spaces/GenericTrash.vue
@@ -49,8 +49,8 @@
             <list-info
               v-if="paginatedResources.length > 0"
               class="oc-width-1-1 oc-my-s"
-              :files="totalFilesCount.files"
-              :folders="totalFilesCount.folders"
+              :files="totalResourcesCount.files"
+              :folders="totalResourcesCount.folders"
             />
           </template>
         </resource-table>
@@ -61,7 +61,6 @@
 </template>
 
 <script lang="ts">
-import { mapGetters } from 'vuex'
 import { storeToRefs } from 'pinia'
 
 import {
@@ -69,7 +68,8 @@ import {
   ContextActions,
   FileSideBar,
   useUserStore,
-  useCapabilityStore
+  useCapabilityStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import FilesViewWrapper from '../../components/FilesViewWrapper.vue'
 import ListInfo from '../../components/FilesList/ListInfo.vue'
@@ -122,6 +122,9 @@ export default defineComponent({
     const userStore = useUserStore()
     const { user } = storeToRefs(userStore)
 
+    const resourcesStore = useResourcesStore()
+    const { totalResourcesCount } = storeToRefs(resourcesStore)
+
     let loadResourcesEventToken: string
     const noContentMessage = computed(() => {
       return props.space.driveType === 'personal'
@@ -163,13 +166,12 @@ export default defineComponent({
       ...resourcesViewDefaults,
       hasShareJail: capabilityRefs.spacesShareJail,
       user,
-      noContentMessage
+      noContentMessage,
+      totalResourcesCount
     }
   },
 
   computed: {
-    ...mapGetters('Files', ['totalFilesCount']),
-
     isEmpty() {
       return this.paginatedResources.length < 1
     },
diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
index dcfa26feaaf..f97f06c97cb 100644
--- a/packages/web-app-files/src/views/spaces/Projects.vue
+++ b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -171,11 +171,15 @@ import {
   onBeforeUnmount
 } from 'vue'
 import { useTask } from 'vue-concurrency'
-import { mapMutations } from 'vuex'
 import Mark from 'mark.js'
 import Fuse from 'fuse.js'
 
-import { AppLoadingSpinner, useConfigStore, useSpacesStore } from '@ownclouders/web-pkg'
+import {
+  AppLoadingSpinner,
+  useConfigStore,
+  useResourcesStore,
+  useSpacesStore
+} from '@ownclouders/web-pkg'
 
 import { AppBar } from '@ownclouders/web-pkg'
 import CreateSpace from '../../components/AppBar/CreateSpace.vue'
@@ -185,7 +189,6 @@ import {
   ViewModeConstants,
   useRouteQueryPersisted,
   useSort,
-  useStore,
   useRouteName,
   usePagination,
   useRouter,
@@ -243,12 +246,11 @@ export default defineComponent({
     SpaceContextActions
   },
   setup() {
-    const store = useStore()
     const spacesStore = useSpacesStore()
     const router = useRouter()
     const route = useRoute()
     const clientService = useClientService()
-    const { selectedResourcesIds, selectedResources } = useSelectedResources({ store })
+    const { selectedResourcesIds, selectedResources } = useSelectedResources()
     const { can } = useAbility()
     const { current: currentLanguage, $gettext } = useGettext()
     const filterTerm = ref('')
@@ -257,6 +259,8 @@ export default defineComponent({
     const previewService = usePreviewService()
     const configStore = useConfigStore()
 
+    const { setSelection, initResourceList, clearResourceList } = useResourcesStore()
+
     let loadPreviewToken = null
 
     const runtimeSpaces = computed(() => {
@@ -329,9 +333,9 @@ export default defineComponent({
     const { scrollToResourceFromRoute } = useScrollTo()
 
     const loadResourcesTask = useTask(function* () {
-      store.commit('Files/CLEAR_CURRENT_FILES_LIST')
+      clearResourceList()
       yield spacesStore.reloadProjectSpaces({ graphClient: clientService.graphAuthenticated })
-      store.commit('Files/LOAD_FILES', { currentFolder: null, files: unref(spaces) })
+      initResourceList({ currentFolder: null, resources: unref(spaces) })
     })
 
     const areResourcesLoading = computed(() => {
@@ -488,7 +492,8 @@ export default defineComponent({
       footerTextFilter,
       items,
       imageContentObject,
-      rowMounted
+      rowMounted,
+      setSelection
     }
   },
   computed: {
@@ -506,9 +511,8 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapMutations('Files', ['SET_FILE_SELECTION']),
     openSidebarSharePanel(space: SpaceResource) {
-      this.SET_FILE_SELECTION([space])
+      this.setSelection([space.id])
       eventBus.publish(SideBarEventTopics.openWithPanel, 'space-share')
     }
   }
diff --git a/packages/web-app-files/src/views/trash/Overview.vue b/packages/web-app-files/src/views/trash/Overview.vue
index 7c49eabb1b9..24933aba0b8 100644
--- a/packages/web-app-files/src/views/trash/Overview.vue
+++ b/packages/web-app-files/src/views/trash/Overview.vue
@@ -73,9 +73,9 @@ import { useTask } from 'vue-concurrency'
 import {
   defaultFuseOptions,
   useClientService,
+  useResourcesStore,
   useRouter,
   useSpacesStore,
-  useStore,
   useUserStore
 } from '@ownclouders/web-pkg'
 import { createLocationTrash } from '@ownclouders/web-pkg'
@@ -96,13 +96,14 @@ export default defineComponent({
   name: 'TrashOverview',
   components: { FilesViewWrapper, AppBar, AppLoadingSpinner, NoContentMessage },
   setup() {
-    const store = useStore()
     const userStore = useUserStore()
     const spacesStore = useSpacesStore()
     const router = useRouter()
     const { $gettext } = useGettext()
     const clientService = useClientService()
     const { y: fileListHeaderY } = useFileListHeaderPosition()
+    const resourcesStore = useResourcesStore()
+
     const sortBy = ref('name')
     const sortDir = ref('asc')
     const filterTerm = ref('')
@@ -117,9 +118,9 @@ export default defineComponent({
     )
 
     const loadResourcesTask = useTask(function* () {
-      store.commit('Files/CLEAR_CURRENT_FILES_LIST')
+      resourcesStore.clearResourceList()
       yield spacesStore.reloadProjectSpaces({ graphClient: clientService.graphAuthenticated })
-      store.commit('Files/LOAD_FILES', { currentFolder: null, files: unref(spaces) })
+      resourcesStore.initResourceList({ currentFolder: null, resources: unref(spaces) })
     })
 
     const areResourcesLoading = computed(() => {
diff --git a/packages/web-app-files/tests/unit/HandleUpload.spec.ts b/packages/web-app-files/tests/unit/HandleUpload.spec.ts
index 5833c36d9a5..3106895398c 100644
--- a/packages/web-app-files/tests/unit/HandleUpload.spec.ts
+++ b/packages/web-app-files/tests/unit/HandleUpload.spec.ts
@@ -11,7 +11,8 @@ import {
   locationSpacesGeneric,
   useUserStore,
   useMessages,
-  useSpacesStore
+  useSpacesStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { Language } from 'vue3-gettext'
 import { ResourceConflict } from 'web-app-files/src/helpers/resource/actions'
@@ -42,7 +43,8 @@ describe('HandleUpload', () => {
     const fileToUpload = mock<UppyFile>({ name: 'name' })
     const processedFiles = instance.prepareFiles([fileToUpload])
 
-    const currentFolder = mocks.opts.store.getters['Files/currentFolder']
+    const resourcesStore = useResourcesStore()
+    const currentFolder = resourcesStore.currentFolder
     const route = unref(mocks.opts.route)
 
     expect(processedFiles[0].tus.endpoint).toEqual('/')
@@ -69,7 +71,8 @@ describe('HandleUpload', () => {
       mocks.opts.clientService.webdav.createFolder.mockResolvedValue(createdFolder)
 
       const result = await instance.createDirectoryTree([fileToUpload])
-      const currentFolder = mocks.opts.store.getters['Files/currentFolder']
+      const resourcesStore = useResourcesStore()
+      const currentFolder = resourcesStore.currentFolder
 
       expect(mocks.opts.uppyService.publish).toHaveBeenCalledWith(
         'uploadSuccess',
@@ -263,13 +266,6 @@ const getWrapper = ({
   resourceConflict.displayOverwriteDialog.mockResolvedValue(conflictHandlerResult)
   jest.mocked(ResourceConflict).mockImplementation(() => resourceConflict)
 
-  const store = {
-    getters: {
-      'Files/currentFolder': mock<Resource>({ path: '/' }),
-      'Files/files': [mock<Resource>()]
-    },
-    dispatch: jest.fn()
-  } as any
   const route = mock<RouteLocationNormalizedLoaded>()
   route.params.driveAliasAndItem = '1'
   route.query.shareId = '1'
@@ -277,15 +273,22 @@ const getWrapper = ({
   const uppy = mockDeep<Uppy>()
   uppy.getState.mockReturnValue(mock<State>({ files: {} }))
 
+  createTestingPinia({
+    initialState: {
+      spaces: { spaces },
+      resources: { currentFolder: mock<Resource>({ path: '/' }), resources: [mock<Resource>()] }
+    }
+  })
+
   const opts = {
     clientService: mockDeep<ClientService>(),
     hasSpaces: ref(true),
     language: mock<Language>(),
     route: ref(route),
-    store,
-    userStore: useUserStore(createTestingPinia()),
-    messageStore: useMessages(createTestingPinia()),
-    spacesStore: useSpacesStore(createTestingPinia({ initialState: { spaces: { spaces } } })),
+    userStore: useUserStore(),
+    messageStore: useMessages(),
+    spacesStore: useSpacesStore(),
+    resourcesStore: useResourcesStore(),
     space: mock<SpaceResource>(),
     uppyService: mock<UppyService>(),
     conflictHandlingEnabled,
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 28d618348b6..d029a7ba467 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
@@ -12,13 +12,7 @@ import {
   useFileActionsPaste
 } from '@ownclouders/web-pkg'
 import { eventBus, UppyResource } from '@ownclouders/web-pkg'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount, defaultComponentMocks } from 'web-test-helpers'
 import { RouteLocation } from 'vue-router'
 import { useExtensionRegistry } from '@ownclouders/web-pkg'
 import { useExtensionRegistryMock } from 'web-test-helpers/src/mocks/useExtensionRegistryMock'
@@ -183,11 +177,6 @@ function getWrapper({
     })
   )
 
-  const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.modules.Files.state.areFileExtensionsShown = areFileExtensionsShown
-  storeOptions.modules.Files.getters.currentFolder.mockImplementation(() => currentFolder)
-  storeOptions.modules.Files.getters.files.mockImplementation(() => files)
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: currentRouteName }) }),
     pasteActionHandler
@@ -198,7 +187,6 @@ function getWrapper({
   } satisfies Partial<CapabilityStore['capabilities']>
 
   return {
-    storeOptions,
     mocks,
     wrapper: shallowMount(CreateAndUpload as any, {
       data: () => ({ newFileAction }),
@@ -213,10 +201,10 @@ function getWrapper({
             piniaOptions: {
               spacesState: { spaces: spaces as any },
               capabilityState: { capabilities },
-              clipboardState: { resources: clipboardResources }
+              clipboardState: { resources: clipboardResources },
+              resourcesStore: { areFileExtensionsShown, currentFolder, resources: files }
             }
-          }),
-          store
+          })
         ]
       }
     })
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
index 31d82b6c52d..bff6fa785aa 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
@@ -2,13 +2,7 @@ import CreateSpace from '../../../../src/components/AppBar/CreateSpace.vue'
 import { mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 import { Drive } from '@ownclouders/web-client/src/generated'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, mount, defaultComponentMocks } from 'web-test-helpers'
 import { useMessages, useModals, useSpacesStore } from '@ownclouders/web-pkg'
 import { unref } from 'vue'
 
@@ -61,17 +55,14 @@ describe('CreateSpace component', () => {
 })
 
 function getWrapper() {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks()
   return {
-    storeOptions,
     mocks,
     wrapper: mount(CreateSpace, {
       global: {
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins({ piniaOptions: { stubActions: false } }), store]
+        plugins: [...defaultPlugins({ piniaOptions: { stubActions: false } })]
       }
     })
   }
diff --git a/packages/web-app-files/tests/unit/components/AppBar/SharesNavigation.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/SharesNavigation.spec.ts
index f25e7c357d3..d68acc76ae4 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/SharesNavigation.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/SharesNavigation.spec.ts
@@ -3,11 +3,9 @@ import { locationSharesWithMe } from '@ownclouders/web-pkg'
 import { mock } from 'jest-mock-extended'
 import { RouteRecordNormalized } from 'vue-router'
 import {
-  createStore,
   defaultPlugins,
   defaultStubs,
   shallowMount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   RouteLocation
 } from 'web-test-helpers'
@@ -35,14 +33,11 @@ describe('SharesNavigation component', () => {
 })
 
 function getWrapper({ currentRouteName = locationSharesWithMe.name } = {}) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: currentRouteName })
   })
   mocks.$router.getRoutes.mockImplementation(() => routes)
   return {
-    storeOptions,
     mocks,
     wrapper: shallowMount(SharesNavigation, {
       global: {
@@ -50,7 +45,7 @@ function getWrapper({ currentRouteName = locationSharesWithMe.name } = {}) {
         renderStubDefaultSlot: true,
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-app-files/tests/unit/components/AppBar/Upload/ResourceUpload.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/Upload/ResourceUpload.spec.ts
index df689e1fd61..1c402f164ff 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/Upload/ResourceUpload.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/Upload/ResourceUpload.spec.ts
@@ -1,13 +1,6 @@
 import { mockDeep } from 'jest-mock-extended'
 import ResourceUpload from 'web-app-files/src/components/AppBar/Upload/ResourceUpload.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  defaultStubs,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, defaultStubs, mount } from 'web-test-helpers'
 import { UppyService } from '@ownclouders/web-pkg'
 
 describe('Resource Upload Component', () => {
@@ -54,14 +47,11 @@ describe('Resource Upload Component', () => {
 })
 
 function getWrapper(props = {}, uppyService = mockDeep<UppyService>()) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks(),
     $uppyService: uppyService
   }
   return {
-    storeOptions,
     mocks,
     wrapper: mount(ResourceUpload, {
       props,
@@ -69,7 +59,7 @@ function getWrapper(props = {}, uppyService = mockDeep<UppyService>()) {
         mocks,
         stubs: defaultStubs,
         provide: mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-app-files/tests/unit/components/EmbedActions/EmbedActions.spec.ts b/packages/web-app-files/tests/unit/components/EmbedActions/EmbedActions.spec.ts
index e7181564f1b..2c40e5fe6d8 100644
--- a/packages/web-app-files/tests/unit/components/EmbedActions/EmbedActions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/EmbedActions/EmbedActions.spec.ts
@@ -1,13 +1,9 @@
-import {
-  createStore,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  shallowMount
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount } from 'web-test-helpers'
 import EmbedActions from 'web-app-files/src/components/EmbedActions/EmbedActions.vue'
 import { FileAction, useEmbedMode, useFileActionsCreateLink } from '@ownclouders/web-pkg'
 import { mock } from 'jest-mock-extended'
 import { ref } from 'vue'
+import { Resource } from '@ownclouders/web-client'
 
 jest.mock('@ownclouders/web-pkg', () => ({
   ...jest.requireActual('@ownclouders/web-pkg'),
@@ -30,17 +26,17 @@ describe('EmbedActions', () => {
     })
 
     it('should enable select action when at least one resource is selected', () => {
-      const { wrapper } = getWrapper({ selectedFiles: [{ id: 1 }] })
+      const { wrapper } = getWrapper({ selectedIds: ['1'] })
 
       expect(wrapper.find(selectors.btnSelect).attributes()).not.toHaveProperty('disabled')
     })
 
     it('should emit select event when the select action is triggered', async () => {
-      const { wrapper, mocks } = getWrapper({ selectedFiles: [{ id: 1 }] })
+      const { wrapper, mocks } = getWrapper({ selectedIds: ['1'] })
 
       await wrapper.find(selectors.btnSelect).trigger('click')
 
-      expect(mocks.postMessageMock).toHaveBeenCalledWith('owncloud-embed:select', [{ id: 1 }])
+      expect(mocks.postMessageMock).toHaveBeenCalledWith('owncloud-embed:select', [{ id: '1' }])
     })
 
     it('should enable select action when embedTarget is set to location', () => {
@@ -51,19 +47,19 @@ describe('EmbedActions', () => {
 
     it('should emit select event with currentFolder as selected resource when select action is triggered', async () => {
       const { wrapper, mocks } = getWrapper({
-        currentFolder: { id: 1 },
+        currentFolder: { id: '1' },
         isLocationPicker: true
       })
 
       await wrapper.find(selectors.btnSelect).trigger('click')
 
-      expect(mocks.postMessageMock).toHaveBeenCalledWith('owncloud-embed:select', [{ id: 1 }])
+      expect(mocks.postMessageMock).toHaveBeenCalledWith('owncloud-embed:select', [{ id: '1' }])
     })
   })
 
   describe('cancel action', () => {
     it('should emit cancel event when the cancel action is triggered', async () => {
-      const { wrapper, mocks } = getWrapper({ selectedFiles: [{ id: 1 }] })
+      const { wrapper, mocks } = getWrapper({ selectedIds: ['1'] })
 
       await wrapper.find(selectors.btnCancel).trigger('click')
 
@@ -80,14 +76,14 @@ describe('EmbedActions', () => {
 
     it('should disable share action when the "Create Link"-action is disabled', () => {
       const { wrapper } = getWrapper({
-        selectedFiles: [{ id: 1 }],
+        selectedIds: ['1'],
         createLinksActionEnabled: false
       })
       expect(wrapper.find(selectors.btnShare).attributes()).toHaveProperty('disabled')
     })
 
     it('should enable share action when at least one resource is selected and link creation is enabled', () => {
-      const { wrapper } = getWrapper({ selectedFiles: [{ id: 1 }] })
+      const { wrapper } = getWrapper({ selectedIds: ['1'] })
       expect(wrapper.find(selectors.btnShare).attributes()).not.toHaveProperty('disabled')
     })
 
@@ -98,7 +94,7 @@ describe('EmbedActions', () => {
     })
 
     it('should call the handler of the "Create Link"-action', async () => {
-      const { wrapper, mocks } = getWrapper({ selectedFiles: [{ id: 1 }] })
+      const { wrapper, mocks } = getWrapper({ selectedIds: ['1'] })
       await wrapper.find(selectors.btnShare).trigger('click')
       expect(mocks.createLinkHandlerMock).toHaveBeenCalledTimes(1)
     })
@@ -107,12 +103,12 @@ describe('EmbedActions', () => {
 
 function getWrapper(
   {
-    selectedFiles = [],
-    currentFolder = {},
+    selectedIds = [],
+    currentFolder = undefined,
     createLinksActionEnabled = true,
     isLocationPicker = false
   } = {
-    selectedFiles: []
+    selectedIds: []
   }
 ) {
   const postMessageMock = jest.fn()
@@ -135,27 +131,18 @@ function getWrapper(
     })
   )
 
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: {
-      ...defaultStoreMockOptions.modules,
-      Files: {
-        ...defaultStoreMockOptions.modules.Files,
-        getters: {
-          ...defaultStoreMockOptions.modules.Files.getters,
-          selectedFiles: jest.fn().mockReturnValue(selectedFiles),
-          currentFolder: jest.fn().mockReturnValue(currentFolder)
-        }
-      }
-    }
-  }
+  const resources = selectedIds.map((id) => ({ id })) as Resource[]
 
   return {
     mocks: { createLinkHandlerMock, postMessageMock },
     wrapper: shallowMount(EmbedActions, {
       global: {
         stubs: { OcButton: false },
-        plugins: [...defaultPlugins(), createStore(storeOptions)]
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: { resourcesStore: { currentFolder, selectedIds, resources } }
+          })
+        ]
       }
     })
   }
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 be31538e314..3befed2ab77 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
@@ -1,11 +1,4 @@
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  mount,
-  RouteLocation
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, mount, RouteLocation } from 'web-test-helpers'
 import ResourceDetails from '../../../../src/components/FilesList/ResourceDetails.vue'
 import { mock } from 'jest-mock-extended'
 import { useFileActions } from '@ownclouders/web-pkg'
@@ -54,8 +47,6 @@ describe('ResourceDetails component', () => {
       })
     }
     mocks.$clientService.webdav.listFileVersions.mockResolvedValue([])
-    const storeOptions = { ...defaultStoreMockOptions }
-    const store = createStore(storeOptions)
 
     const file = {
       id: 0,
@@ -81,7 +72,7 @@ describe('ResourceDetails component', () => {
         },
         global: {
           mocks,
-          plugins: [...defaultPlugins(), store],
+          plugins: [...defaultPlugins()],
           provide: {
             ...mocks,
             space,
diff --git a/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts b/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts
index 6d8524c2ae8..c73e32168d5 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts
+++ b/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts
@@ -1,4 +1,4 @@
-import { createStore, defaultPlugins, defaultStoreMockOptions, mount } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 import ResourceTiles from 'web-app-files/src/components/FilesList/ResourceTiles.vue'
 import { sortFields } from 'web-app-files/src/helpers/ui/resourceTiles'
 import { Resource } from '@ownclouders/web-client'
@@ -136,9 +136,6 @@ describe('ResourceTiles component', () => {
   })
 
   function getWrapper(props = {}, slots = {}) {
-    const storeOptions = defaultStoreMockOptions
-    const store = createStore(storeOptions)
-
     return {
       wrapper: mount(ResourceTiles, {
         props: {
@@ -148,7 +145,7 @@ describe('ResourceTiles component', () => {
           ...slots
         },
         global: {
-          plugins: [...defaultPlugins({ designSystem: false }), store],
+          plugins: [...defaultPlugins({ designSystem: false })],
           stubs: { ResourceTile: true }
         }
       })
diff --git a/packages/web-app-files/tests/unit/components/Modals/SetLinkPasswordModal.spec.ts b/packages/web-app-files/tests/unit/components/Modals/SetLinkPasswordModal.spec.ts
index 57b335571a6..08a00be2955 100644
--- a/packages/web-app-files/tests/unit/components/Modals/SetLinkPasswordModal.spec.ts
+++ b/packages/web-app-files/tests/unit/components/Modals/SetLinkPasswordModal.spec.ts
@@ -1,12 +1,6 @@
 import { mock } from 'jest-mock-extended'
 import SetLinkPasswordModal from '../../../../src/components/Modals/SetLinkPasswordModal.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  shallowMount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, shallowMount } from 'web-test-helpers'
 import { Modal, useMessages, useSharesStore } from '@ownclouders/web-pkg'
 
 describe('SetLinkPasswordModal', () => {
@@ -17,7 +11,7 @@ describe('SetLinkPasswordModal', () => {
   })
   describe('method "onConfirm"', () => {
     it('updates the link', async () => {
-      const { wrapper, storeOptions } = getWrapper()
+      const { wrapper } = getWrapper()
       await wrapper.vm.onConfirm()
 
       const sharesStore = useSharesStore()
@@ -26,7 +20,7 @@ describe('SetLinkPasswordModal', () => {
       expect(showMessage).toHaveBeenCalled()
     })
     it('shows an error message on error', async () => {
-      const { wrapper, storeOptions } = getWrapper()
+      const { wrapper } = getWrapper()
       const sharesStore = useSharesStore()
       ;(sharesStore.updateLink as any).mockRejectedValue(new Error(''))
       await wrapper.vm.onConfirm()
@@ -40,19 +34,15 @@ describe('SetLinkPasswordModal', () => {
 function getWrapper({ link = {} } = {}) {
   const mocks = { ...defaultComponentMocks() }
 
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
-
   return {
     mocks,
-    storeOptions,
     wrapper: shallowMount(SetLinkPasswordModal, {
       props: {
         modal: mock<Modal>(),
         link
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks,
         provide: mocks
       }
diff --git a/packages/web-app-files/tests/unit/components/Search/List.spec.ts b/packages/web-app-files/tests/unit/components/Search/List.spec.ts
index ae875b41def..5d4d00d2b89 100644
--- a/packages/web-app-files/tests/unit/components/Search/List.spec.ts
+++ b/packages/web-app-files/tests/unit/components/Search/List.spec.ts
@@ -6,14 +6,8 @@ import { useResourcesViewDefaults } from 'web-app-files/src/composables'
 import { useResourcesViewDefaultsMock } from 'web-app-files/tests/mocks/useResourcesViewDefaultsMock'
 import { createRouter, createMemoryHistory } from 'vue-router'
 
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  mockAxiosResolve
-} from 'web-test-helpers/src'
-import { queryItemAsString } from '@ownclouders/web-pkg'
+import { defaultComponentMocks, defaultPlugins, mockAxiosResolve } from 'web-test-helpers/src'
+import { queryItemAsString, useResourcesStore } from '@ownclouders/web-pkg'
 import { ref } from 'vue'
 import { Resource } from '@ownclouders/web-client/src'
 import { mock } from 'jest-mock-extended'
@@ -46,8 +40,10 @@ describe('List component', () => {
     expect(wrapper.find(selectors.resourceTableStub).exists()).toBeTruthy()
   })
   it('resets the initial store file state', () => {
-    const { storeOptions } = getWrapper({ resources: [mock<Resource>()] })
-    expect(storeOptions.modules.Files.mutations.CLEAR_CURRENT_FILES_LIST).toHaveBeenCalled()
+    getWrapper({ resources: [mock<Resource>()] })
+
+    const { clearResourceList } = useResourcesStore()
+    expect(clearResourceList).toHaveBeenCalled()
   })
   it('should emit search event on mount', async () => {
     const { wrapper } = getWrapper()
@@ -233,8 +229,6 @@ function getWrapper({
   localMocks.$clientService.graphAuthenticated.tags.getTags.mockReturnValue(
     mockAxiosResolve({ value: availableTags })
   )
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   const capabilities = {
     files: { tags: true },
@@ -248,7 +242,6 @@ function getWrapper({
   } satisfies Partial<Capabilities['capabilities']>
 
   return {
-    storeOptions,
     mocks: localMocks,
     wrapper: shallowMount(List, {
       global: {
@@ -257,7 +250,7 @@ function getWrapper({
         stubs: {
           FilesViewWrapper: false
         },
-        plugins: [...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } }), store]
+        plugins: [...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } })]
       }
     })
   }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Actions/FileActions.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Actions/FileActions.spec.ts
index 80e656612a4..96f641a402c 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Actions/FileActions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Actions/FileActions.spec.ts
@@ -2,11 +2,9 @@ import FileActions from 'web-app-files/src/components/SideBar/Actions/FileAction
 import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { mock } from 'jest-mock-extended'
 import {
-  createStore,
   defaultPlugins,
   defaultStubs,
   mount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   RouteLocation
 } from 'web-test-helpers'
@@ -86,13 +84,10 @@ describe('FileActions', () => {
 })
 
 function getWrapper() {
-  const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.modules.Files.state.currentFolder = { path: '' }
-  const store = createStore(storeOptions)
   return {
     wrapper: mount(FileActions, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks: defaultComponentMocks({
           currentRoute: mock<RouteLocation>({
             name: 'files-spaces-generic',
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 563caed9b37..86331a08e09 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
@@ -1,12 +1,6 @@
 import FileDetails from '../../../../../src/components/SideBar/Details/FileDetails.vue'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  RouteLocation
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, RouteLocation } from 'web-test-helpers'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { createLocationSpaces, createLocationPublic } from '@ownclouders/web-pkg/'
@@ -203,12 +197,6 @@ function createWrapper({
   versions = [],
   tagsEnabled = true
 } = {}) {
-  const storeOptions = defaultStoreMockOptions
-  storeOptions.modules.runtime.modules.ancestorMetaData.getters.ancestorMetaData.mockReturnValue(
-    ancestorMetaData
-  )
-  const store = createStore(storeOptions)
-
   const spacesLocation = createLocationSpaces('files-spaces-generic')
   const publicLocation = createLocationPublic('files-public-link')
   const currentRoute = isPublicLinkContext ? publicLocation : spacesLocation
@@ -229,10 +217,10 @@ function createWrapper({
             piniaOptions: {
               userState: { user },
               authState: { publicLinkContextReady: isPublicLinkContext },
-              capabilityState: { capabilities }
+              capabilityState: { capabilities },
+              resourcesStore: { ancestorMetaData }
             }
-          }),
-          store
+          })
         ],
         mocks
       }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Details/FileDetailsMultiple.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Details/FileDetailsMultiple.spec.ts
index e0192fcbeed..09cbf851580 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Details/FileDetailsMultiple.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Details/FileDetailsMultiple.spec.ts
@@ -1,10 +1,5 @@
 import FileDetailsMultiple from '../../../../../src/components/SideBar/Details/FileDetailsMultiple.vue'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount } from 'web-test-helpers'
 
 const selectors = {
   selectedFilesText: '[data-testid="selectedFilesText"]',
@@ -14,6 +9,7 @@ const selectors = {
 }
 
 const folderA = {
+  id: '1',
   type: 'folder',
   ownerId: 'marie',
   ownerDisplayName: 'Marie',
@@ -21,6 +17,7 @@ const folderA = {
   size: '740'
 }
 const folderB = {
+  id: '2',
   type: 'folder',
   ownerId: 'marie',
   ownerDisplayName: 'Marie',
@@ -28,6 +25,7 @@ const folderB = {
   size: '740'
 }
 const fileA = {
+  id: '3',
   type: 'file',
   ownerId: 'marie',
   ownerDisplayName: 'Marie',
@@ -35,6 +33,7 @@ const fileA = {
   size: '740'
 }
 const fileB = {
+  id: '4',
   type: 'file',
   ownerId: 'marie',
   ownerDisplayName: 'Marie',
@@ -66,14 +65,17 @@ describe('Details Multiple Selection SideBar Item', () => {
   })
 })
 
-function createWrapper(testResources) {
-  const storeOptions = defaultStoreMockOptions
-  storeOptions.modules.Files.getters.selectedFiles.mockImplementation(() => testResources)
-  const store = createStore(storeOptions)
+function createWrapper(resources) {
   return {
     wrapper: shallowMount(FileDetailsMultiple, {
       global: {
-        plugins: [...defaultPlugins(), store]
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: {
+              resourcesStore: { resources, selectedIds: resources.map(({ id }) => id) }
+            }
+          })
+        ]
       }
     })
   }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.spec.ts
index b52c0b272d0..bbd390a9849 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.spec.ts
@@ -2,7 +2,7 @@ import ExpirationDatepicker from 'web-app-files/src/components/SideBar/Shares/Co
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
 import merge from 'lodash-es/merge'
 import { DateTime } from 'luxon'
-import { createStore, defaultPlugins, mount, defaultStoreMockOptions } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 import { nextTick } from 'vue'
 import { useCapabilityStore } from '@ownclouders/web-pkg'
 
@@ -190,17 +190,13 @@ describe('InviteCollaborator ExpirationDatepicker', () => {
 })
 
 const createWrapper = ({ sharingCapabilities = {}, stubOcDatepicker = false } = {}) => {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const capabilities = { files_sharing: sharingCapabilities }
 
   return {
-    store,
-    storeOptions,
     wrapper: mount(ExpirationDatepicker, {
       global: {
         stubs: { OcDatepicker: stubOcDatepicker },
-        plugins: [...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } }), store]
+        plugins: [...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } })]
       }
     })
   }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.ts
index d20087071f7..bc64add994e 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.ts
@@ -2,10 +2,8 @@ import { mock } from 'jest-mock-extended'
 import InviteCollaboratorForm from 'web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   RouteLocation,
   shallowMount
 } from 'web-test-helpers'
@@ -79,8 +77,6 @@ function getWrapper({
   storageId = 'fake-storage-id',
   resource = folderMock
 } = {}) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ params: { storageId } })
   })
@@ -100,8 +96,7 @@ function getWrapper({
               capabilityState: { capabilities },
               configState: { options: { concurrentRequests: { shares: { create: 1 } } } }
             }
-          }),
-          store
+          })
         ],
         provide: { ...mocks, resource },
         mocks
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.spec.ts
index 9ecb381c4db..59108d520b6 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.spec.ts
@@ -1,6 +1,6 @@
 import RecipientContainer from 'web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.vue'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
-import { createStore, defaultPlugins, mount, defaultStoreMockOptions } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 import { CapabilityStore } from '@ownclouders/web-pkg'
 
 jest.mock('web-app-files/src/helpers/user/avatarUrl', () => ({
@@ -41,8 +41,6 @@ describe('InviteCollaborator RecipientContainer', () => {
 })
 
 function getMountedWrapper(recipient, avatarsEnabled = false) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const capabilities = {
     files_sharing: {
       user: {
@@ -59,10 +57,7 @@ function getMountedWrapper(recipient, avatarsEnabled = false) {
         deselect: jest.fn()
       },
       global: {
-        plugins: [
-          ...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } }),
-          store
-        ],
+        plugins: [...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } })],
         stubs: {
           OcIcon: true
         }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.ts
index d67f2db63da..e52b1eb931f 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.ts
@@ -5,14 +5,7 @@ import {
   SharePermissions,
   ShareTypes
 } from '@ownclouders/web-client/src/helpers/share'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  defaultStubs,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, mount, defaultStubs, defaultComponentMocks } from 'web-test-helpers'
 import { useMessages, useSharesStore, useSpacesStore } from '@ownclouders/web-pkg'
 
 jest.mock('uuid', () => ({
@@ -191,8 +184,6 @@ function createWrapper({
   expires = undefined,
   sharedParentRoute = null
 } = {}) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks()
   return {
     wrapper: mount(ListItem, {
@@ -209,7 +200,7 @@ function createWrapper({
         sharedParentRoute
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks,
         provide: mocks,
         renderStubDefaultSlot: true,
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/RoleDropdown.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/RoleDropdown.spec.ts
index 1d22fdafad0..45ffef2f656 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/RoleDropdown.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/RoleDropdown.spec.ts
@@ -1,12 +1,6 @@
 import RoleDropdown from 'web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue'
 import { PeopleShareRoles, SharePermissions } from '@ownclouders/web-client/src/helpers/share'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultPlugins, mount, shallowMount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 
@@ -128,8 +122,6 @@ function getWrapper({
   canShare = false,
   incomingParentShare = null
 } = {}) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   return {
     wrapper: mountType(RoleDropdown, {
       props: {
@@ -140,8 +132,7 @@ function getWrapper({
         plugins: [
           ...defaultPlugins({
             piniaOptions: { userState: { user: { onPremisesSamAccountName: 'name' } } }
-          }),
-          store
+          })
         ],
         renderStubDefaultSlot: true,
         provide: {
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.ts
index b22b583f0f0..c5f24438ad0 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.ts
@@ -1,11 +1,5 @@
 import FileLinks from 'web-app-files/src/components/SideBar/Shares/FileLinks.vue'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount, defaultComponentMocks } from 'web-test-helpers'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 import { Share, SharePermissions, ShareTypes } from '@ownclouders/web-client/src/helpers/share'
@@ -185,8 +179,6 @@ function getWrapper({
     actions: computed(() => [mock<FileAction>({ name: 'create-links', handler: createLinkMock })])
   })
 
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks()
   const capabilities = {
     files_sharing: {
@@ -202,7 +194,6 @@ function getWrapper({
 
   return {
     mocks: { ...mocks, createLinkMock },
-    storeOptions,
     wrapper: shallowMount(FileLinks, {
       global: {
         plugins: [
@@ -213,8 +204,7 @@ function getWrapper({
               configState: { options: { sidebar: { shares: { showAllOnLoad: true } } } },
               sharesState: { shares: links as Share[] }
             }
-          }),
-          store
+          })
         ],
         renderStubDefaultSlot: true,
         stubs: { OcButton: false },
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts
index e62c0aed5c1..5a774448b36 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.ts
@@ -5,16 +5,14 @@ import { SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { v4 as uuidV4 } from 'uuid'
 import { Share } from '@ownclouders/web-client/src/helpers/share'
 import {
-  createStore,
   defaultPlugins,
   mount,
   shallowMount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   defaultStubs,
   RouteLocation
 } from 'web-test-helpers'
-import { CapabilityStore } from '@ownclouders/web-pkg'
+import { CapabilityStore, useResourcesStore, useSharesStore } from '@ownclouders/web-pkg'
 
 const getCollaborator = () => ({
   shareType: 0,
@@ -184,12 +182,14 @@ describe('FileShares', () => {
         collaborators: [getCollaborator()],
         currentRouteName: 'files-shares-with-others'
       })
-      const deleteShareSpy = jest.spyOn(wrapper.vm, 'deleteShare')
-      const removeFilesSpy = jest.spyOn(wrapper.vm, 'REMOVE_FILES')
       const share = mock<Share>()
       await wrapper.vm.$_ocCollaborators_deleteShare(share)
-      expect(deleteShareSpy).toHaveBeenCalled()
-      expect(removeFilesSpy).toHaveBeenCalled()
+
+      const { removeResources } = useResourcesStore()
+      expect(removeResources).toHaveBeenCalled()
+
+      const { deleteShare } = useSharesStore()
+      expect(deleteShare).toHaveBeenCalled()
     })
   })
 })
@@ -206,11 +206,6 @@ function getWrapper({
   currentRouteName = 'files-spaces-generic',
   ancestorMetaData = {}
 } = {}) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.modules.runtime.modules.ancestorMetaData.getters.ancestorMetaData.mockReturnValue(
-    ancestorMetaData
-  )
-  const store = createStore(storeOptions)
   const capabilities = {
     files_sharing: { resharing: hasReSharing, deny_access: false }
   } satisfies Partial<CapabilityStore['capabilities']>
@@ -227,10 +222,10 @@ function getWrapper({
               configState: {
                 options: { contextHelpers: true, sidebar: { shares: { showAllOnLoad } } }
               },
-              sharesState: { shares: collaborators }
+              sharesState: { shares: collaborators },
+              resourcesStore: { ancestorMetaData }
             }
-          }),
-          store
+          })
         ],
         mocks: defaultComponentMocks({
           currentRoute: mock<RouteLocation>({ name: currentRouteName })
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.ts
index c448d88f942..1d44b76568c 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.ts
@@ -1,12 +1,6 @@
 import DetailsAndEdit from 'web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue'
 import { LinkShareRoles } from '@ownclouders/web-client/src/helpers/share'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount, defaultComponentMocks } from 'web-test-helpers'
 import { mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 
@@ -54,9 +48,7 @@ describe('DetailsAndEdit component', () => {
 })
 
 function getShallowMountedWrapper(link, expireDateEnforced = false, isModifiable = false) {
-  const storeOptions = defaultStoreMockOptions
   const mocks = defaultComponentMocks()
-  const store = createStore(storeOptions)
   return {
     wrapper: shallowMount(DetailsAndEdit, {
       props: {
@@ -77,7 +69,7 @@ function getShallowMountedWrapper(link, expireDateEnforced = false, isModifiable
         mocks,
         renderStubDefaultSlot: true,
         stubs: { OcDatepicker: false, 'date-picker': true },
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         provide: mocks
       }
     })
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.ts
index 7c73fa1519f..4111e66bd75 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.ts
@@ -1,10 +1,5 @@
 import SharesPanel from 'web-app-files/src/components/SideBar/Shares/SharesPanel.vue'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount } from 'web-test-helpers'
 
 const ocLoaderStubSelector = 'oc-loader-stub'
 
@@ -27,14 +22,11 @@ describe('SharesPanel', () => {
   })
 
   function getWrapper({ sharesLoading = false } = {}) {
-    const storeOptions = defaultStoreMockOptions
-    const store = createStore(storeOptions)
     return {
       wrapper: shallowMount(SharesPanel, {
         global: {
           plugins: [
-            ...defaultPlugins({ piniaOptions: { sharesState: { loading: sharesLoading } } }),
-            store
+            ...defaultPlugins({ piniaOptions: { sharesState: { loading: sharesLoading } } })
           ],
           provide: {
             activePanel: null,
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts
index 28ec5489872..6fd07171703 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.ts
@@ -9,11 +9,9 @@ import {
 import { mock } from 'jest-mock-extended'
 import { ProjectSpaceResource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import {
-  createStore,
   defaultPlugins,
   mount,
   shallowMount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   RouteLocation
 } from 'web-test-helpers'
@@ -162,8 +160,6 @@ function getWrapper({
   user = mock<User>(),
   currentRouteName = 'files-spaces-generic'
 } = {}) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: currentRouteName })
   })
@@ -178,8 +174,7 @@ function getWrapper({
               options: { contextHelpers: true, sidebar: { shares: { showAllOnLoad: true } } }
             }
           }
-        }),
-        store
+        })
       ],
       mocks,
       provide: {
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 d943b0ccc95..facc6da2960 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
@@ -1,11 +1,4 @@
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  mount,
-  defaultPlugins,
-  mockAxiosResolve
-} from 'web-test-helpers'
+import { defaultComponentMocks, mount, defaultPlugins, mockAxiosResolve } from 'web-test-helpers'
 import TagsSelect from 'web-app-files/src/components/SideBar/Details/TagsSelect.vue'
 import { mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
@@ -134,14 +127,11 @@ describe('Tag Select', () => {
 })
 
 function createWrapper(resource, clientService = mockDeep<ClientService>(), stubVueSelect = true) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const mocks = { ...defaultComponentMocks(), $clientService: clientService }
   return {
-    storeOptions,
     wrapper: mount(TagsSelect, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks,
         provide: { ...mocks },
         stubs: { VueSelect: stubVueSelect, CompareSaveDialog: true }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.ts
index a352f636ec8..6bfd293f912 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.ts
@@ -5,14 +5,8 @@ import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 import { ShareSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { DavPermission } from '@ownclouders/web-client/src/webdav/constants'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
-import { useDownloadFile } from '@ownclouders/web-pkg'
+import { defaultPlugins, mount, shallowMount } from 'web-test-helpers'
+import { useDownloadFile, useResourcesStore } from '@ownclouders/web-pkg'
 import { computed } from 'vue'
 
 jest.mock('@ownclouders/web-pkg', () => ({
@@ -136,18 +130,17 @@ describe('FileVersions', () => {
               expect(revertVersionButton.length).toBe(0)
             })
             it('should call UPDATE_RESOURCE_FIELD mutation when revert button is clicked', async () => {
-              const { wrapper, storeOptions } = getMountedWrapper()
+              const { wrapper } = getMountedWrapper()
               await wrapper.vm.fetchVersionsTask.last
               const revertVersionButton = wrapper.findAll(selectors.revertVersionButton)
-              const updateResourceFieldMock =
-                storeOptions.modules.Files.mutations.UPDATE_RESOURCE_FIELD
+              const { updateResourceField } = useResourcesStore()
 
               expect(revertVersionButton.length).toBe(defaultVersions.length)
-              expect(updateResourceFieldMock).not.toHaveBeenCalled()
+              expect(updateResourceField).not.toHaveBeenCalled()
 
               await revertVersionButton.at(0).trigger('click')
 
-              expect(updateResourceFieldMock).toHaveBeenCalledTimes(2)
+              expect(updateResourceField).toHaveBeenCalledTimes(2)
             })
           })
 
@@ -176,8 +169,6 @@ function getMountedWrapper({
   resource = mock<Resource>({ id: '1', size: 0, mdate: '' }),
   loadingStateDelay = 0
 } = {}) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const downloadFile = jest.fn()
   jest.mocked(useDownloadFile).mockReturnValue({ downloadFile })
   const mocks = {
@@ -207,10 +198,9 @@ function getMountedWrapper({
           'oc-resource-icon': true,
           OcButton: false
         },
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     }),
-    mocks,
-    storeOptions
+    mocks
   }
 }
diff --git a/packages/web-app-files/tests/unit/components/Spaces/SpaceContextActions.spec.ts b/packages/web-app-files/tests/unit/components/Spaces/SpaceContextActions.spec.ts
index 315a2938882..b970882196d 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/SpaceContextActions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/Spaces/SpaceContextActions.spec.ts
@@ -1,13 +1,6 @@
 import SpaceContextActions from '../../../../src/components/Spaces/SpaceContextActions.vue'
 import { buildSpace } from '@ownclouders/web-client/src/helpers'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  RouteLocation
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, mount, RouteLocation } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Drive } from '@ownclouders/web-client/src/generated'
 
@@ -39,7 +32,6 @@ describe('SpaceContextActions', () => {
 function getWrapper(space) {
   const mocks = defaultComponentMocks({ currentRoute: mock<RouteLocation>({ path: '/files' }) })
   mocks.$previewService.getSupportedMimeTypes.mockReturnValue([])
-  const store = createStore(defaultStoreMockOptions)
   return {
     wrapper: mount(SpaceContextActions, {
       props: {
@@ -53,8 +45,7 @@ function getWrapper(space) {
         plugins: [
           ...defaultPlugins({
             abilities: [{ action: 'set-quota-all', subject: 'Drive' }]
-          }),
-          store
+          })
         ]
       }
     })
diff --git a/packages/web-app-files/tests/unit/components/Spaces/SpaceHeader.spec.ts b/packages/web-app-files/tests/unit/components/Spaces/SpaceHeader.spec.ts
index 191367991fb..a98290fea93 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/SpaceHeader.spec.ts
+++ b/packages/web-app-files/tests/unit/components/Spaces/SpaceHeader.spec.ts
@@ -2,13 +2,7 @@ import { ref } from 'vue'
 import SpaceHeader from 'web-app-files/src/components/Spaces/SpaceHeader.vue'
 import { Drive } from '@ownclouders/web-client/src/generated'
 import { buildSpace } from '@ownclouders/web-client/src/helpers'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, mount, defaultComponentMocks } from 'web-test-helpers'
 
 describe('SpaceHeader', () => {
   it('should add the "squashed"-class when the sidebar is opened', () => {
@@ -50,7 +44,6 @@ describe('SpaceHeader', () => {
 function getWrapper({ space = {}, isSideBarOpen = false, isMobileWidth = false }) {
   const mocks = defaultComponentMocks()
   mocks.$previewService.loadPreview.mockResolvedValue('blob:image')
-  const store = createStore(defaultStoreMockOptions)
   return mount(SpaceHeader, {
     props: {
       space,
@@ -58,7 +51,7 @@ function getWrapper({ space = {}, isSideBarOpen = false, isMobileWidth = false }
     },
     global: {
       mocks,
-      plugins: [...defaultPlugins(), store],
+      plugins: [...defaultPlugins()],
       provide: { ...mocks, isMobileWidth: ref(isMobileWidth) },
       stubs: {
         'quota-modal': true,
diff --git a/packages/web-app-files/tests/unit/helpers/resource/actions/upload.spec.ts b/packages/web-app-files/tests/unit/helpers/resource/actions/upload.spec.ts
index 725250c783a..078abd03d3d 100644
--- a/packages/web-app-files/tests/unit/helpers/resource/actions/upload.spec.ts
+++ b/packages/web-app-files/tests/unit/helpers/resource/actions/upload.spec.ts
@@ -1,19 +1,18 @@
 import { mock, mockDeep } from 'jest-mock-extended'
 import { Language } from 'vue3-gettext'
 import { ResourceConflict } from 'web-app-files/src/helpers/resource'
-import { ResolveStrategy, UppyResource } from '@ownclouders/web-pkg'
+import { ResolveStrategy, UppyResource, useResourcesStore } from '@ownclouders/web-pkg'
 import { Resource } from '@ownclouders/web-client/src/helpers'
-import { createStore, defaultStoreMockOptions } from 'web-test-helpers/src'
+import { createTestingPinia } from 'web-test-helpers/src'
 
 const getResourceConflictInstance = ({
   currentFiles = [mockDeep<Resource>()]
 }: {
   currentFiles?: Resource[]
 } = {}) => {
-  const storeOptions = defaultStoreMockOptions
-  storeOptions.modules.Files.getters.files.mockReturnValue(currentFiles)
-  const store = createStore(storeOptions)
-  return new ResourceConflict(store, mock<Language>())
+  createTestingPinia({ initialState: { resources: { resources: currentFiles } } })
+  const resourcesStore = useResourcesStore()
+  return new ResourceConflict(resourcesStore, mock<Language>())
 }
 
 describe('upload helper', () => {
diff --git a/packages/web-app-files/tests/unit/store/actions.spec.ts b/packages/web-app-files/tests/unit/store/actions.spec.ts
deleted file mode 100644
index b6a76c18ba4..00000000000
--- a/packages/web-app-files/tests/unit/store/actions.spec.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import actions from '../../../src/store/actions'
-import { SpaceResource, Resource } from '@ownclouders/web-client/src/helpers'
-import { mockDeep } from 'jest-mock-extended'
-import { createTestingPinia } from 'web-test-helpers'
-
-jest.mock('@ownclouders/web-client/src/helpers/share/functions', () => {
-  return {
-    buildShare: (share) => share,
-    buildCollaboratorShare: (share) => share
-  }
-})
-
-const stateMock = {
-  commit: jest.fn(),
-  dispatch: jest.fn(),
-  getters: {},
-  rootGetters: {},
-  state: {}
-}
-// we need to define $gettext explicitly to make it enumerable on the mock
-
-describe('vuex store actions', () => {
-  beforeEach(() => {
-    createTestingPinia({
-      initialState: { config: { options: { concurrentRequests: { shares: { list: 4 } } } } }
-    })
-  })
-
-  describe('updateFileShareTypes', () => {
-    const getRootStateMock = (file: Resource) => ({
-      runtime: {
-        ancestorMetaData: {
-          ancestorMetaData: file ? { [file.path]: {} } : {}
-        }
-      }
-    })
-    const commitSpy = jest.fn()
-
-    it('updates the resource if given', () => {
-      const file = mockDeep<Resource>({ path: '/foo' })
-      const getters = { files: [file] }
-      actions.updateFileShareTypes(
-        {
-          rootState: getRootStateMock(null),
-          getters,
-          commit: commitSpy
-        },
-        { path: file.path, outgoingShares: [] }
-      )
-      expect(commitSpy).toHaveBeenCalledTimes(1)
-    })
-    it('does not update the resource if not given', () => {
-      const file = undefined
-      const getters = { files: [file] }
-      actions.updateFileShareTypes(
-        {
-          rootState: getRootStateMock(file),
-          getters,
-          commit: commitSpy
-        },
-        { path: '/foo', outgoingShares: [] }
-      )
-      expect(commitSpy).toHaveBeenCalledTimes(0)
-    })
-    it('does not update project space resources', () => {
-      const file = mockDeep<SpaceResource>({ driveType: 'project' })
-      const getters = { files: [file] }
-      actions.updateFileShareTypes(
-        {
-          rootState: getRootStateMock(file),
-          getters,
-          commit: commitSpy
-        },
-        { path: file.path, outgoingShares: [] }
-      )
-      expect(commitSpy).toHaveBeenCalledTimes(0)
-    })
-    it('updates the ancestor if found', () => {
-      const file = mockDeep<Resource>({ path: '/path' })
-      const getters = { files: [file] }
-      actions.updateFileShareTypes(
-        {
-          rootState: getRootStateMock(file),
-          getters,
-          commit: commitSpy
-        },
-        { path: file.path, outgoingShares: [] }
-      )
-      expect(commitSpy).toHaveBeenCalledTimes(2)
-    })
-  })
-})
diff --git a/packages/web-app-files/tests/unit/store/getters.spec.ts b/packages/web-app-files/tests/unit/store/getters.spec.ts
deleted file mode 100644
index 1766e21bb1a..00000000000
--- a/packages/web-app-files/tests/unit/store/getters.spec.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import getters from 'web-app-files/src/store/getters'
-import { mockDeep } from 'jest-mock-extended'
-import { Resource } from '@ownclouders/web-client'
-
-let state
-const mockedFiles = [mockDeep<Resource>(), mockDeep<Resource>(), mockDeep<Resource>()]
-describe('Getters', () => {
-  beforeEach(() => {
-    state = {
-      files: mockedFiles,
-      searchTermGlobal: '',
-      areHiddenFilesShown: true
-    }
-  })
-
-  describe('activeFiles', () => {
-    const cases = [
-      ['contains', true],
-      ['hides', false]
-    ]
-
-    it.each(cases)('%s hidden files if areHiddenFilesShown is set to %s', (value) => {
-      state.areHiddenFilesShown = value
-
-      const { activeFiles, files } = getters
-      const result = activeFiles(state, { files: files(state) })
-
-      expect(result.length).toEqual(mockedFiles.length)
-    })
-  })
-})
diff --git a/packages/web-app-files/tests/unit/store/mutations.spec.ts b/packages/web-app-files/tests/unit/store/mutations.spec.ts
deleted file mode 100644
index f95937390a2..00000000000
--- a/packages/web-app-files/tests/unit/store/mutations.spec.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import mutations from '../../../src/store/mutations'
-import { cloneDeep } from 'lodash-es'
-
-const stateFixture = {
-  files: [
-    {
-      id: 1,
-      name: 'test1'
-    },
-    {
-      id: 2,
-      name: 'test2'
-    },
-    {
-      id: 5,
-      name: 'test5'
-    }
-  ]
-}
-let stateMock: typeof stateFixture
-const resetState = () => {
-  stateMock = cloneDeep(stateFixture)
-}
-
-describe('vuex store mutations', () => {
-  describe('update resources by id', () => {
-    beforeEach(resetState)
-    it.each([
-      [mutations.UPSERT_RESOURCE.name, mutations.UPSERT_RESOURCE],
-      [mutations.UPDATE_RESOURCE.name, mutations.UPDATE_RESOURCE]
-    ])('succeeds using mutation %s', (name, m) => {
-      expect(stateMock.files).toEqual(stateFixture.files)
-      expect(stateMock.files[1].name).toBe('test2')
-      m(stateMock, {
-        id: 2,
-        name: 'test2-updated'
-      })
-      expect(stateMock.files[1].name).toBe('test2-updated')
-      expect(stateMock.files.length).toBe(stateFixture.files.length)
-    })
-  })
-  describe('insert resources', () => {
-    beforeEach(resetState)
-    it('succeeds using mutation UPSERT_RESOURCE', () => {
-      expect(stateMock.files).toEqual(stateFixture.files)
-      mutations.UPSERT_RESOURCE(stateMock, {
-        id: 3,
-        name: 'test3-inserted'
-      })
-      expect(stateMock.files).toEqual([...stateFixture.files, { id: 3, name: 'test3-inserted' }])
-    })
-    it('is ignored using mutation UPDATE_RESOURCE', () => {
-      expect(stateMock.files).toEqual(stateFixture.files)
-      mutations.UPDATE_RESOURCE(stateMock, {
-        id: 3,
-        name: 'test3-inserted'
-      })
-      expect(stateMock.files).toEqual(stateFixture.files)
-    })
-  })
-
-  it('SET_HIDDEN_FILES_VISIBILITY', () => {
-    const state = { areHiddenFilesShown: true }
-    const { SET_HIDDEN_FILES_VISIBILITY } = mutations
-
-    SET_HIDDEN_FILES_VISIBILITY(state, false)
-
-    expect(state.areHiddenFilesShown).toEqual(false)
-  })
-
-  it('SET_FILE_EXTENSIONS_VISIBILITY', () => {
-    const state = { areFileExtensionsShown: true }
-    const { SET_FILE_EXTENSIONS_VISIBILITY } = mutations
-
-    SET_FILE_EXTENSIONS_VISIBILITY(state, false)
-
-    expect(state.areFileExtensionsShown).toEqual(false)
-  })
-})
diff --git a/packages/web-app-files/tests/unit/views/Favorites.spec.ts b/packages/web-app-files/tests/unit/views/Favorites.spec.ts
index 30bd0db6d00..ce075b6e937 100644
--- a/packages/web-app-files/tests/unit/views/Favorites.spec.ts
+++ b/packages/web-app-files/tests/unit/views/Favorites.spec.ts
@@ -4,14 +4,7 @@ import { useResourcesViewDefaultsMock } from 'web-app-files/tests/mocks/useResou
 import { ref } from 'vue'
 import { mockDeep, mock } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
-import {
-  createStore,
-  defaultPlugins,
-  defaultStubs,
-  mount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, defaultStubs, mount, defaultComponentMocks } from 'web-test-helpers'
 import { RouteLocation } from 'vue-router'
 
 jest.mock('web-app-files/src/composables')
@@ -60,13 +53,11 @@ function getMountedWrapper({ mocks = {}, files = [], loading = false } = {}) {
     }),
     ...(mocks && mocks)
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
+
   return {
-    storeOptions,
     wrapper: mount(Favorites, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks: defaultMocks,
         provide: defaultMocks,
         stubs: defaultStubs
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 1fb1ec6d4db..758d44b8992 100644
--- a/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
+++ b/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
@@ -1,9 +1,7 @@
 import FilesDrop from '../../../src/views/FilesDrop.vue'
 import {
-  createStore,
   defaultPlugins,
   mount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   defaultStubs,
   RouteLocation
@@ -38,14 +36,11 @@ function getMountedWrapper() {
     $clientService: $clientService
   }
 
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   return {
     mocks: defaultMocks,
-    storeOptions,
     wrapper: mount(FilesDrop, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks: defaultMocks,
         provide: defaultMocks,
         stubs: defaultStubs
diff --git a/packages/web-app-files/tests/unit/views/shares/SharedViaLink.spec.ts b/packages/web-app-files/tests/unit/views/shares/SharedViaLink.spec.ts
index 716293fdff7..ec415ca88a2 100644
--- a/packages/web-app-files/tests/unit/views/shares/SharedViaLink.spec.ts
+++ b/packages/web-app-files/tests/unit/views/shares/SharedViaLink.spec.ts
@@ -5,10 +5,8 @@ import { ref } from 'vue'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 import {
-  createStore,
   defaultPlugins,
   mount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   defaultStubs,
   RouteLocation
@@ -64,14 +62,12 @@ function getMountedWrapper({ mocks = {}, files = [], loading = false } = {}) {
     }),
     ...(mocks && mocks)
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
+
   return {
     mocks: defaultMocks,
-    storeOptions,
     wrapper: mount(SharedViaLink, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks: defaultMocks,
         provide: defaultMocks,
         stubs: defaultStubs
diff --git a/packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts b/packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts
index 2233966742d..b7c97a2ef8e 100644
--- a/packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts
+++ b/packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts
@@ -11,13 +11,7 @@ import { ref } from 'vue'
 import { defaultStubs, RouteLocation } from 'web-test-helpers'
 import { useSortMock } from 'web-app-files/tests/mocks/useSortMock'
 import { mock } from 'jest-mock-extended'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, mount, defaultComponentMocks } from 'web-test-helpers'
 import { Resource } from '@ownclouders/web-client'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers'
 
@@ -181,14 +175,12 @@ function getMountedWrapper({
     ...(mocks && mocks),
     openWithDefaultApp
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
+
   return {
     mocks: defaultMocks,
-    storeOptions,
     wrapper: mount(SharedWithMe, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks: defaultMocks,
         stubs: { ...defaultStubs, itemFilterInline: true, ItemFilter: true }
       }
diff --git a/packages/web-app-files/tests/unit/views/shares/SharedWithOthers.spec.ts b/packages/web-app-files/tests/unit/views/shares/SharedWithOthers.spec.ts
index 73cf8443e32..92640965258 100644
--- a/packages/web-app-files/tests/unit/views/shares/SharedWithOthers.spec.ts
+++ b/packages/web-app-files/tests/unit/views/shares/SharedWithOthers.spec.ts
@@ -5,13 +5,7 @@ import { ref } from 'vue'
 import { defaultStubs, RouteLocation } from 'web-test-helpers'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, mount, defaultComponentMocks } from 'web-test-helpers'
 import { ShareTypes } from '@ownclouders/web-client/src/helpers'
 import { useSortMock } from '../../../mocks/useSortMock'
 
@@ -87,14 +81,12 @@ function getMountedWrapper({ mocks = {}, files = [], loading = false } = {}) {
     }),
     ...(mocks && mocks)
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
+
   return {
     mocks: defaultMocks,
-    storeOptions,
     wrapper: mount(SharedWithOthers, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks: defaultMocks,
         provide: defaultMocks,
         stubs: { ...defaultStubs, ItemFilter: true }
diff --git a/packages/web-app-files/tests/unit/views/spaces/DriveRedirect.spec.ts b/packages/web-app-files/tests/unit/views/spaces/DriveRedirect.spec.ts
index 77b6af2e6f4..563065658cd 100644
--- a/packages/web-app-files/tests/unit/views/spaces/DriveRedirect.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/DriveRedirect.spec.ts
@@ -1,10 +1,8 @@
 import DriveRedirect from '../../../../src/views/spaces/DriveRedirect.vue'
 import { mock } from 'jest-mock-extended'
 import {
-  createStore,
   defaultPlugins,
   mount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   defaultStubs,
   RouteLocation
@@ -23,14 +21,12 @@ function getMountedWrapper({ currentRouteName = 'files-spaces-generic' } = {}) {
   const mocks = {
     ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: currentRouteName }) })
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
+
   return {
-    storeOptions,
     mocks,
     wrapper: mount(DriveRedirect, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         stubs: defaultStubs,
         mocks,
         provide: mocks
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 52629328b5e..1b9700bfd0c 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
@@ -8,10 +8,8 @@ import { locationPublicUpload } from '@ownclouders/web-pkg'
 import { PublicSpaceResource, Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { SharePermissionBit } from '@ownclouders/web-client/src/helpers/share'
 import {
-  createStore,
   defaultPlugins,
   mount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   defaultStubs,
   RouteLocation,
@@ -148,18 +146,15 @@ function getMountedWrapper({
     }),
     ...(mocks && mocks)
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
+
   return {
     mocks: defaultMocks,
-    storeOptions,
     wrapper: mount(DriveResolver, {
       global: {
         plugins: [
           ...defaultPlugins({
             piniaOptions: { authState: { userContextReady: userContextReady } }
-          }),
-          store
+          })
         ],
         mocks: defaultMocks,
         provide: defaultMocks,
diff --git a/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts b/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
index e9150fc9472..c7a17165e78 100644
--- a/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
@@ -5,10 +5,8 @@ import GenericSpace from 'web-app-files/src/views/spaces/GenericSpace.vue'
 import { useResourcesViewDefaults } from 'web-app-files/src/composables/resourcesViewDefaults'
 import { useResourcesViewDefaultsMock } from 'web-app-files/tests/mocks/useResourcesViewDefaultsMock'
 import {
-  createStore,
   defaultPlugins,
   mount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   defaultStubs,
   RouteLocation
@@ -170,7 +168,7 @@ describe('GenericSpace view', () => {
     describe('on EOS for single shared resources', () => {
       it('renders the ResourceDetails component if no currentFolder id is present', () => {
         const { wrapper } = getMountedWrapper({
-          currentFolder: {},
+          currentFolder: mock<Resource>({ fileId: '' }),
           files: [mock<Resource>({ isFolder: false })],
           runningOnEos: true
         })
@@ -273,7 +271,7 @@ function getMountedWrapper({
   files = [],
   loading = false,
   currentRoute = { name: 'files-spaces-generic', path: '/' },
-  currentFolder = mock<Resource>() || {},
+  currentFolder = mock<Resource>(),
   runningOnEos = false,
   space = { id: 1, getDriveAliasAndItem: jest.fn(), name: 'Personal space', driveType: '' },
   breadcrumbsFromPath = [],
@@ -294,21 +292,17 @@ function getMountedWrapper({
     ...(mocks && mocks)
   }
 
-  const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
   const propsData = {
     space,
     item: '/',
     ...props
   }
-  const store = createStore(storeOptions)
   const capabilities = {
     spaces: { share_jail: true }
   } satisfies Partial<CapabilityStore['capabilities']>
 
   return {
     mocks: { ...defaultMocks, ...resourcesViewDetailsMock },
-    storeOptions,
     wrapper: mount(GenericSpace, {
       props: propsData,
       global: {
@@ -316,10 +310,10 @@ function getMountedWrapper({
           ...defaultPlugins({
             piniaOptions: {
               capabilityState: { capabilities },
-              configState: { options: { runningOnEos } }
+              configState: { options: { runningOnEos } },
+              resourcesStore: { currentFolder }
             }
-          }),
-          store
+          })
         ],
         mocks: defaultMocks,
         provide: defaultMocks,
diff --git a/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts b/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
index 15c4451dcde..461850df576 100644
--- a/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
@@ -6,10 +6,8 @@ import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 import { SpaceResource } from '@ownclouders/web-client/src/helpers'
 import {
-  createStore,
   defaultPlugins,
   mount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   defaultStubs,
   RouteLocation
@@ -70,19 +68,16 @@ function getMountedWrapper({ mocks = {}, props = {}, files = [], loading = false
     }),
     ...(mocks && mocks)
   }
-  const storeOptions = { ...defaultStoreMockOptions }
   const propsData = {
     space: { id: 1, getDriveAliasAndItem: jest.fn(), name: 'Personal space' },
     ...props
   }
-  const store = createStore(storeOptions)
   return {
     mocks: defaultMocks,
-    storeOptions,
     wrapper: mount(GenericTrash, {
       props: propsData,
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks: defaultMocks,
         stubs: { ...defaultStubs, portal: true }
       }
diff --git a/packages/web-app-files/tests/unit/views/spaces/Projects.spec.ts b/packages/web-app-files/tests/unit/views/spaces/Projects.spec.ts
index 316a10cf48b..c9f874bb2c0 100644
--- a/packages/web-app-files/tests/unit/views/spaces/Projects.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/Projects.spec.ts
@@ -4,10 +4,8 @@ import { nextTick } from 'vue'
 import { queryItemAsString, useFileActionsDelete } from '@ownclouders/web-pkg'
 
 import {
-  createStore,
   defaultPlugins,
   mount,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   defaultStubs,
   RouteLocation
@@ -101,17 +99,12 @@ function getMountedWrapper({ mocks = {}, spaces = [], abilities = [], stubAppBar
     }),
     ...(mocks && mocks)
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
+
   return {
     mocks: defaultMocks,
-    storeOptions,
     wrapper: mount(Projects, {
       global: {
-        plugins: [
-          ...defaultPlugins({ abilities, piniaOptions: { spacesState: { spaces } } }),
-          store
-        ],
+        plugins: [...defaultPlugins({ abilities, piniaOptions: { spacesState: { spaces } } })],
         mocks: defaultMocks,
         provide: defaultMocks,
         stubs: {
diff --git a/packages/web-app-files/tests/unit/views/trash/Overview.spec.ts b/packages/web-app-files/tests/unit/views/trash/Overview.spec.ts
index 186eafc8d97..7e9fb35c0fe 100644
--- a/packages/web-app-files/tests/unit/views/trash/Overview.spec.ts
+++ b/packages/web-app-files/tests/unit/views/trash/Overview.spec.ts
@@ -1,9 +1,7 @@
 import TrashOverview from '../../../../src/views/trash/Overview.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   defaultStubs,
   mount,
   RouteLocation
@@ -109,8 +107,6 @@ describe('TrashOverview', () => {
 })
 
 function getWrapper({ spaces = spaceMocks }: { spaces?: SpaceResource[] } = {}) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks({
       currentRoute: mock<RouteLocation>({ name: 'trash-overview' })
@@ -124,7 +120,7 @@ function getWrapper({ spaces = spaceMocks }: { spaces?: SpaceResource[] } = {})
         stubs: { ...defaultStubs, NoContentMessage: true },
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins({ piniaOptions: { spacesState: { spaces } } }), store]
+        plugins: [...defaultPlugins({ piniaOptions: { spacesState: { spaces } } })]
       }
     })
   }
diff --git a/packages/web-app-importer/src/extensions.ts b/packages/web-app-importer/src/extensions.ts
index cbdce730f6d..9cc122d3576 100644
--- a/packages/web-app-importer/src/extensions.ts
+++ b/packages/web-app-importer/src/extensions.ts
@@ -1,15 +1,14 @@
 import { storeToRefs } from 'pinia'
 import {
-  useStore,
   useThemeStore,
   useModals,
   useUserStore,
-  useAuthStore
+  useAuthStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 import { useService } from '@ownclouders/web-pkg'
 import { computed, nextTick, unref } from 'vue'
-import { Resource } from '@ownclouders/web-client/src'
 import type { UppyService } from '@ownclouders/web-pkg'
 import '@uppy/dashboard/dist/style.min.css'
 import Dashboard from '@uppy/dashboard'
@@ -20,7 +19,6 @@ import { Extension } from '@ownclouders/web-pkg'
 import { ApplicationSetupOptions } from '@ownclouders/web-pkg'
 
 export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
-  const store = useStore()
   const userStore = useUserStore()
   const { $gettext } = useGettext()
   const uppyService = useService<UppyService>('$uppyService')
@@ -29,13 +27,13 @@ export const extensions = ({ applicationConfig }: ApplicationSetupOptions) => {
   const { currentTheme } = storeToRefs(themeStore)
   const { dispatchModal, removeModal, activeModal } = useModals()
 
+  const resourcesStore = useResourcesStore()
+  const { currentFolder } = storeToRefs(resourcesStore)
+
   const { companionUrl, webdavCloudType } = applicationConfig
   let { supportedClouds } = applicationConfig
   supportedClouds = supportedClouds || ['OneDrive', 'GoogleDrive', 'WebdavPublicLink']
 
-  const currentFolder = computed<Resource>(() => {
-    return store.getters['Files/currentFolder']
-  })
   const canUpload = computed(() => {
     return unref(currentFolder)?.canUpload({ user: userStore.user })
   })
diff --git a/packages/web-app-importer/tests/unit/extensions.spec.ts b/packages/web-app-importer/tests/unit/extensions.spec.ts
index b33b6c4e653..3b6b44b0931 100644
--- a/packages/web-app-importer/tests/unit/extensions.spec.ts
+++ b/packages/web-app-importer/tests/unit/extensions.spec.ts
@@ -1,10 +1,4 @@
-import {
-  createStore,
-  defaultStoreMockOptions,
-  defaultComponentMocks,
-  getComposableWrapper,
-  RouteLocation
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper, RouteLocation } from 'web-test-helpers'
 import { unref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
 import { mock, mockDeep } from 'jest-mock-extended'
@@ -141,14 +135,12 @@ function getWrapper({
     ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: routeName }) }),
     $uppyService: uppyService
   }
-  const storeOptions = defaultStoreMockOptions
-  storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
-  const store = createStore(storeOptions)
+
   return {
     wrapper: getComposableWrapper(setup, {
       mocks,
       provide: mocks,
-      store
+      pluginOptions: { piniaOptions: { resourcesStore: { currentFolder } } }
     })
   }
 }
diff --git a/packages/web-app-preview/src/App.vue b/packages/web-app-preview/src/App.vue
index 28ca39b710a..637a639f682 100644
--- a/packages/web-app-preview/src/App.vue
+++ b/packages/web-app-preview/src/App.vue
@@ -251,7 +251,7 @@ export default defineComponent({
 
     const fileId = computed(() => unref(unref(currentFileContext).itemId))
     const space = computed(() => unref(unref(currentFileContext).space))
-    const { selectedResources } = useSelectedResources({})
+    const { selectedResources } = useSelectedResources()
     watch(activeFilteredFile, (file) => {
       selectedResources.value = [file]
     })
diff --git a/packages/web-app-preview/tests/unit/app.spec.ts b/packages/web-app-preview/tests/unit/app.spec.ts
index 62b4e609fce..9edf952baaa 100644
--- a/packages/web-app-preview/tests/unit/app.spec.ts
+++ b/packages/web-app-preview/tests/unit/app.spec.ts
@@ -1,12 +1,6 @@
 import App from '../../src/App.vue'
 import { nextTick, ref } from 'vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, shallowMount } from 'web-test-helpers'
 import { useAppDefaultsMock } from 'web-test-helpers/src/mocks/useAppDefaultsMock'
 import { FileContext, useAppDefaults } from '@ownclouders/web-pkg'
 import { mock } from 'jest-mock-extended'
@@ -94,10 +88,6 @@ describe('Preview app', () => {
   })
 })
 
-const storeOptions = defaultStoreMockOptions
-storeOptions.modules.Files.getters.activeFiles.mockImplementation(() => ['3'])
-const store = createStore(storeOptions)
-
 function createShallowMountWrapper() {
   jest.mocked(useAppDefaults).mockImplementation(() =>
     useAppDefaultsMock({
@@ -125,7 +115,7 @@ function createShallowMountWrapper() {
         }
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks,
         provide: mocks
       }
diff --git a/packages/web-app-search/src/portals/SearchBar.vue b/packages/web-app-search/src/portals/SearchBar.vue
index 750406d92a2..69da3e8807d 100644
--- a/packages/web-app-search/src/portals/SearchBar.vue
+++ b/packages/web-app-search/src/portals/SearchBar.vue
@@ -105,12 +105,13 @@ import {
   createLocationCommon,
   isLocationCommonActive,
   isLocationSpacesActive,
-  useAuthStore
+  useAuthStore,
+  useResourcesStore
 } from '@ownclouders/web-pkg'
 import Mark from 'mark.js'
 import { storeToRefs } from 'pinia'
 import { debounce } from 'lodash-es'
-import { useRouteQuery, useRouter, useStore } from '@ownclouders/web-pkg'
+import { useRouteQuery, useRouter } 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'
@@ -121,7 +122,6 @@ export default defineComponent({
   name: 'SearchBar',
   components: { SearchBarFilter },
   setup() {
-    const store = useStore()
     const router = useRouter()
     const showCancelButton = ref(false)
     const isMobileWidth = inject<Ref<boolean>>('isMobileWidth')
@@ -131,6 +131,9 @@ export default defineComponent({
     const authStore = useAuthStore()
     const { userContextReady } = storeToRefs(authStore)
 
+    const resourcesStore = useResourcesStore()
+    const { currentFolder } = storeToRefs(resourcesStore)
+
     const locationFilterId = ref(SearchLocationFilterConstants.everywhere)
     const optionsDropRef = ref(null)
     const activePreviewIndex = ref(null)
@@ -181,11 +184,10 @@ export default defineComponent({
         unref(currentFolderAvailable) &&
         unref(locationFilterId) === SearchLocationFilterConstants.inHere
       ) {
-        const currentFolder = store.getters['Files/currentFolder']
         let scope
 
-        if (currentFolder?.fileId) {
-          scope = currentFolder?.fileId
+        if (unref(currentFolder)?.fileId) {
+          scope = unref(currentFolder)?.fileId
         } else {
           scope = unref(scopeQueryValue)
         }
@@ -217,11 +219,10 @@ export default defineComponent({
 
       if (unref(activePreviewIndex) === null) {
         const currentQuery = unref(router.currentRoute).query
-        const currentFolder = store.getters['Files/currentFolder']
 
         let scope
-        if (unref(currentFolderAvailable) && currentFolder?.fileId) {
-          scope = currentFolder?.fileId
+        if (unref(currentFolderAvailable) && unref(currentFolder)?.fileId) {
+          scope = unref(currentFolder)?.fileId
         } else {
           scope = unref(scopeQueryValue)
         }
@@ -283,7 +284,6 @@ export default defineComponent({
       currentFolderAvailable,
       listProviderAvailable,
       locationFilterAvailable,
-      store,
       scopeQueryValue,
       optionsDrop,
       optionsDropRef,
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 178d14eaef1..fb1ca1c4fc3 100644
--- a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
+++ b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
@@ -3,14 +3,7 @@ import flushPromises from 'flush-promises'
 import { mock } from 'jest-mock-extended'
 import { ref } from 'vue'
 import { defineComponent } from 'vue'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  defaultComponentMocks,
-  RouteLocation
-} from 'web-test-helpers'
+import { defaultPlugins, mount, defaultComponentMocks, RouteLocation } from 'web-test-helpers'
 import { useAvailableProviders } from '../../../src/composables'
 
 const component = defineComponent({
@@ -245,8 +238,6 @@ function getMountedWrapper({
     ...mocks
   }
 
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   return {
     wrapper: mount(SearchBar, {
       attachTo: document.body,
@@ -254,8 +245,7 @@ function getMountedWrapper({
         plugins: [
           ...defaultPlugins({
             piniaOptions: { authState: { userContextReady: userContextReady } }
-          }),
-          store
+          })
         ],
         mocks: localMocks,
         provide: localMocks,
diff --git a/packages/web-client/src/types.ts b/packages/web-client/src/types.ts
index 78db5014314..5384ca91ad9 100644
--- a/packages/web-client/src/types.ts
+++ b/packages/web-client/src/types.ts
@@ -16,6 +16,7 @@ export type OwnCloudSdk = {
     copy(...args): any
     move(...args): any
     delete(...args): any
+    favorite(...args): any
   }
   /** @deprecated */
   fileTrash: {
diff --git a/packages/web-pkg/src/components/AppBar/AppBar.vue b/packages/web-pkg/src/components/AppBar/AppBar.vue
index fe81ac4fdaf..516ed98f774 100644
--- a/packages/web-pkg/src/components/AppBar/AppBar.vue
+++ b/packages/web-pkg/src/components/AppBar/AppBar.vue
@@ -50,7 +50,7 @@
             v-if="showBatchActions"
             v-bind="{} as any"
             :actions="batchActions"
-            :action-options="{ space, resources: selectedFiles }"
+            :action-options="{ space, resources: selectedResources }"
             :limited-screen-space="limitedScreenSpace"
           />
         </div>
@@ -63,7 +63,6 @@
 <script lang="ts">
 import last from 'lodash-es/last'
 import { computed, defineComponent, inject, PropType, ref, Ref, unref, useSlots } from 'vue'
-import { mapGetters } from 'vuex'
 import { Resource } from '@ownclouders/web-client'
 import {
   isPersonalSpaceResource,
@@ -91,9 +90,9 @@ import {
 import {
   useAbility,
   useFileActionsToggleHideShare,
+  useResourcesStore,
   useRouteMeta,
   useSpacesStore,
-  useStore,
   ViewModeConstants
 } from '../../composables'
 import { BreadcrumbItem } from 'design-system/src/components/OcBreadcrumb/types'
@@ -107,6 +106,7 @@ import {
   useSpaceActionsEditQuota,
   useSpaceActionsRestore
 } from '../../composables'
+import { storeToRefs } from 'pinia'
 
 const { EVENT_ITEM_DROPPED } = helpers
 
@@ -148,23 +148,25 @@ export default defineComponent({
     }
   },
   setup(props, { emit }) {
-    const store = useStore()
     const spacesStore = useSpacesStore()
     const { $gettext } = useGettext()
     const { can } = useAbility()
 
-    const { actions: acceptShareActions } = useFileActionsAcceptShare({ store })
-    const { actions: hideShareActions } = useFileActionsToggleHideShare({ store })
-    const { actions: copyActions } = useFileActionsCopy({ store })
-    const { actions: duplicateActions } = useSpaceActionsDuplicate({ store })
-    const { actions: declineShareActions } = useFileActionsDeclineShare({ store })
-    const { actions: deleteActions } = useFileActionsDelete({ store })
+    const resourcesStore = useResourcesStore()
+    const { selectedResources } = storeToRefs(resourcesStore)
+
+    const { actions: acceptShareActions } = useFileActionsAcceptShare()
+    const { actions: hideShareActions } = useFileActionsToggleHideShare()
+    const { actions: copyActions } = useFileActionsCopy()
+    const { actions: duplicateActions } = useSpaceActionsDuplicate()
+    const { actions: declineShareActions } = useFileActionsDeclineShare()
+    const { actions: deleteActions } = useFileActionsDelete()
     const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: downloadFileActions } = useFileActionsDownloadFile()
-    const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin({ store })
-    const { actions: moveActions } = useFileActionsMove({ store })
-    const { actions: restoreActions } = useFileActionsRestore({ store })
-    const { actions: deleteSpaceActions } = useSpaceActionsDelete({ store })
+    const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin()
+    const { actions: moveActions } = useFileActionsMove()
+    const { actions: restoreActions } = useFileActionsRestore()
+    const { actions: deleteSpaceActions } = useSpaceActionsDelete()
     const { actions: disableSpaceActions } = useSpaceActionsDisable()
     const { actions: editSpaceQuotaActions } = useSpaceActionsEditQuota()
     const { actions: restoreSpaceActions } = useSpaceActionsRestore()
@@ -206,7 +208,7 @@ export default defineComponent({
       }
 
       return actions.filter((item) =>
-        item.isEnabled({ space: props.space, resources: store.getters['Files/selectedFiles'] })
+        item.isEnabled({ space: props.space, resources: resourcesStore.selectedResources })
       )
     })
 
@@ -260,7 +262,8 @@ export default defineComponent({
       breadcrumbMaxWidth,
       breadcrumbTruncationOffset,
       fileDroppedBreadcrumb,
-      pageTitle
+      pageTitle,
+      selectedResources
     }
   },
   data: function () {
@@ -270,28 +273,26 @@ export default defineComponent({
     }
   },
   computed: {
-    ...mapGetters('Files', ['files', 'selectedFiles']),
-
     showContextActions() {
       return last<BreadcrumbItem>(this.breadcrumbs).allowContextActions
     },
     showBatchActions() {
       return (
         this.hasBulkActions &&
-        (this.selectedFiles.length >= 1 ||
+        (this.selectedResources.length >= 1 ||
           isLocationTrashActive(this.$router, 'files-trash-generic'))
       )
     },
     selectedResourcesAnnouncement() {
-      if (this.selectedFiles.length === 0) {
+      if (this.selectedResources.length === 0) {
         return this.$gettext('No items selected.')
       }
       return this.$ngettext(
         '%{ amount } item selected. Actions are available above the table.',
         '%{ amount } items selected. Actions are available above the table.',
-        this.selectedFiles.length,
+        this.selectedResources.length,
         {
-          amount: this.selectedFiles.length
+          amount: this.selectedResources.length.toString()
         }
       )
     }
diff --git a/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue b/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue
index 21bae752c18..ad27f2827d8 100644
--- a/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue
+++ b/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue
@@ -49,14 +49,14 @@ import {
   useRoute,
   useRouteParam,
   useRouteQuery,
-  useStore,
   useSelectedResources,
   useSideBar,
   useModals,
   useMessages,
   useSpacesStore,
   useAppsStore,
-  useConfigStore
+  useConfigStore,
+  useResourcesStore
 } from '../../composables'
 import {
   Action,
@@ -107,17 +107,17 @@ export default defineComponent({
   },
   setup(props) {
     const { $gettext } = useGettext()
-    const store = useStore()
     const appsStore = useAppsStore()
     const { showMessage, showErrorMessage } = useMessages()
     const router = useRouter()
     const currentRoute = useRoute()
     const clientService = useClientService()
     const { getResourceContext } = useGetResourceContext()
-    const { selectedResources } = useSelectedResources({ store })
+    const { selectedResources } = useSelectedResources()
     const { dispatchModal } = useModals()
     const spacesStore = useSpacesStore()
     const configStore = useConfigStore()
+    const resourcesStore = useResourcesStore()
 
     const applicationName = ref('')
     const resource: Ref<Resource> = ref()
@@ -235,7 +235,7 @@ export default defineComponent({
 
         space.value = unref(unref(currentFileContext).space)
         resource.value = yield getFileInfo(currentFileContext)
-        store.commit('Files/LOAD_FILES', { currentFolder: null, files: [unref(resource)] })
+        resourcesStore.initResourceList({ currentFolder: null, resources: [unref(resource)] })
         selectedResources.value = [unref(resource)]
 
         const newExtension = props.importResourceWithExtension(unref(resource))
@@ -318,7 +318,7 @@ export default defineComponent({
         })
         serverContent.value = newContent
         currentETag.value = putFileContentsResponse.etag
-        store.commit('Files/UPSERT_RESOURCE', putFileContentsResponse)
+        resourcesStore.upsertResource(putFileContentsResponse)
       } catch (e) {
         switch (e.statusCode) {
           case 401:
diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 118f0a3c5a9..c7d2c859e42 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -82,7 +82,7 @@
 import { computed, defineComponent, PropType, unref } from 'vue'
 import ContextActionMenu from './ContextActions/ContextActionMenu.vue'
 import { useGettext } from 'vue3-gettext'
-import { Action, useFolderLink, useGetMatchingSpace, useStore } from '../composables'
+import { Action, useFolderLink, useGetMatchingSpace, useResourcesStore } from '../composables'
 import ResourceListItem from './FilesList/ResourceListItem.vue'
 import {
   Resource,
@@ -114,9 +114,9 @@ export default defineComponent({
   setup(props) {
     const { $gettext } = useGettext()
     const { getMatchingSpace } = useGetMatchingSpace()
-    const store = useStore()
+    const resourcesStore = useResourcesStore()
 
-    const areFileExtensionsShown = computed(() => unref(store.state.Files.areFileExtensionsShown))
+    const areFileExtensionsShown = computed(() => resourcesStore.areFileExtensionsShown)
     const contextMenuLabel = computed(() => $gettext('Show context menu'))
     const closeButtonLabel = computed(() => $gettext('Close'))
 
diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index 2b5efcb0f90..1e54537dd22 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -89,15 +89,15 @@ import {
   watch,
   onMounted
 } from 'vue'
-import { Resource, SpaceResource } from '@ownclouders/web-client'
+import { SpaceResource } from '@ownclouders/web-client'
 import {
   Modal,
   useClientService,
   useFolderLink,
   useMessages,
+  useResourcesStore,
   useRouter,
-  useSearch,
-  useStore
+  useSearch
 } from '../composables'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { useGettext } from 'vue3-gettext'
@@ -110,6 +110,7 @@ import { debounce } from 'lodash-es'
 import ResourcePreview from './Search/ResourcePreview.vue'
 import { SearchResult, SearchResultValue } from './Search'
 import { isLocationPublicActive } from '../router'
+import { storeToRefs } from 'pinia'
 
 const SEARCH_LIMIT = 7
 const SEARCH_DEBOUNCE_TIME = 200
@@ -128,7 +129,6 @@ export default defineComponent({
   setup(props, { emit, expose }) {
     const clientService = useClientService()
     const { $gettext } = useGettext()
-    const store = useStore()
     const { showMessage, showErrorMessage } = useMessages()
     const router = useRouter()
     const { search } = useSearch()
@@ -140,6 +140,9 @@ export default defineComponent({
       getFolderLink
     } = useFolderLink()
 
+    const resourcesStore = useResourcesStore()
+    const { resources, currentFolder } = storeToRefs(resourcesStore)
+
     const dropRef = ref(null)
     const inputUrl = ref('')
     const inputFilename = ref('')
@@ -158,10 +161,8 @@ export default defineComponent({
       return `https://${url}`
     })
 
-    const currentFolder = computed<Resource>(() => store.getters['Files/currentFolder'])
-    const files = computed((): Array<Resource> => store.getters['Files/files'])
     const fileAlreadyExists = computed(
-      () => !!unref(files).find((file) => file.name === `${unref(inputFilename)}.url`)
+      () => !!unref(resources).find((file) => file.name === `${unref(inputFilename)}.url`)
     )
 
     const confirmButtonDisabled = computed(
@@ -209,8 +210,11 @@ export default defineComponent({
       inputUrl.value = unref(dropItemUrl)
       try {
         let filename = new URL(unref(dropItemUrl)).host
-        if (unref(files).some((f) => f.name === `${filename}.url`)) {
-          filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(files)).slice(0, -4)
+        if (unref(resources).some((f) => f.name === `${filename}.url`)) {
+          filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(resources)).slice(
+            0,
+            -4
+          )
         }
         inputFilename.value = filename
       } catch (_) {}
@@ -223,8 +227,8 @@ export default defineComponent({
 
       inputUrl.value = `${webURL.origin}/f/${item.id}`
 
-      if (unref(files).some((f) => f.name === `${filename}.url`)) {
-        filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(files)).slice(0, -4)
+      if (unref(resources).some((f) => f.name === `${filename}.url`)) {
+        filename = resolveFileNameDuplicate(`${filename}.url`, 'url', unref(resources)).slice(0, -4)
       }
 
       inputFilename.value = filename
@@ -336,7 +340,7 @@ export default defineComponent({
           path,
           content
         })
-        store.commit('Files/UPSERT_RESOURCE', resource)
+        resourcesStore.upsertResource(resource)
         showMessage({ title: $gettext('Shortcut was created successfully') })
       } catch (e) {
         console.error(e)
diff --git a/packages/web-pkg/src/components/FilesList/ContextActions.vue b/packages/web-pkg/src/components/FilesList/ContextActions.vue
index 870a41eb77f..fdc836f4e14 100644
--- a/packages/web-pkg/src/components/FilesList/ContextActions.vue
+++ b/packages/web-pkg/src/components/FilesList/ContextActions.vue
@@ -9,8 +9,7 @@ import {
   useFileActionsOpenShortcut,
   ActionExtension,
   useExtensionRegistry,
-  useFileActionsToggleHideShare,
-  useStore
+  useFileActionsToggleHideShare
 } from '../../composables'
 import { computed, defineComponent, PropType, Ref, toRef, unref } from 'vue'
 
@@ -49,32 +48,28 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const store = useStore()
-
     const { editorActions } = useFileActions()
 
-    const { actions: acceptShareActions } = useFileActionsAcceptShare({ store })
-    const { actions: hideShareActions } = useFileActionsToggleHideShare({ store })
-    const { actions: copyActions } = useFileActionsCopy({ store })
+    const { actions: acceptShareActions } = useFileActionsAcceptShare()
+    const { actions: hideShareActions } = useFileActionsToggleHideShare()
+    const { actions: copyActions } = useFileActionsCopy()
     const { actions: createQuickLinkActions } = useFileActionsCopyQuickLink()
-    const { actions: declineShareActions } = useFileActionsDeclineShare({ store })
-    const { actions: deleteActions } = useFileActionsDelete({ store })
+    const { actions: declineShareActions } = useFileActionsDeclineShare()
+    const { actions: deleteActions } = useFileActionsDelete()
     const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
     const { actions: downloadFileActions } = useFileActionsDownloadFile()
-    const { actions: favoriteActions } = useFileActionsFavorite({ store })
-    const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin({ store })
-    const { actions: moveActions } = useFileActionsMove({ store })
-    const { actions: navigateActions } = useFileActionsNavigate({ store })
-    const { actions: pasteActions } = useFileActionsPaste({ store })
-    const { actions: renameActions } = useFileActionsRename({ store })
-    const { actions: restoreActions } = useFileActionsRestore({ store })
+    const { actions: favoriteActions } = useFileActionsFavorite()
+    const { actions: emptyTrashBinActions } = useFileActionsEmptyTrashBin()
+    const { actions: moveActions } = useFileActionsMove()
+    const { actions: navigateActions } = useFileActionsNavigate()
+    const { actions: pasteActions } = useFileActionsPaste()
+    const { actions: renameActions } = useFileActionsRename()
+    const { actions: restoreActions } = useFileActionsRestore()
     const { actions: setSpaceImageActions } = useFileActionsSetImage()
     const { actions: setSpaceReadmeActions } = useFileActionsSetReadme()
-    const { actions: showDetailsActions } = useFileActionsShowDetails({ store })
-    const { actions: createSpaceFromResourceActions } = useFileActionsCreateSpaceFromResource({
-      store
-    })
-    const { actions: showSharesActions } = useFileActionsShowShares({ store })
+    const { actions: showDetailsActions } = useFileActionsShowDetails()
+    const { actions: createSpaceFromResourceActions } = useFileActionsCreateSpaceFromResource()
+    const { actions: showSharesActions } = useFileActionsShowShares()
     const { actions: openShortcutActions } = useFileActionsOpenShortcut()
 
     const extensionRegistry = useExtensionRegistry()
diff --git a/packages/web-pkg/src/components/FilesList/ResourceTable.vue b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
index cf2d26071e0..3b0d9ec7c26 100644
--- a/packages/web-pkg/src/components/FilesList/ResourceTable.vue
+++ b/packages/web-pkg/src/components/FilesList/ResourceTable.vue
@@ -216,7 +216,6 @@
 
 <script lang="ts">
 import { defineComponent, PropType, computed, unref, ref, ComputedRef } from 'vue'
-import { mapActions, mapState } from 'vuex'
 import { useWindowSize } from '@vueuse/core'
 import { Resource } from '@ownclouders/web-client'
 import { extractDomSelector, SpaceResource } from '@ownclouders/web-client/src/helpers'
@@ -231,7 +230,8 @@ import {
   useAuthStore,
   useCapabilityStore,
   useConfigStore,
-  useClipboardStore
+  useClipboardStore,
+  useResourcesStore
 } from '../../composables'
 import ResourceListItem from './ResourceListItem.vue'
 import ResourceGhostElement from './ResourceGhostElement.vue'
@@ -316,7 +316,7 @@ export default defineComponent({
      * V-model for the selection
      */
     selectedIds: {
-      type: Array,
+      type: Array as PropType<string[]>,
       default: () => []
     },
     /**
@@ -464,6 +464,10 @@ export default defineComponent({
     const authStore = useAuthStore()
     const { userContextReady } = storeToRefs(authStore)
 
+    const resourcesStore = useResourcesStore()
+    const { toggleSelection } = resourcesStore
+    const { areFileExtensionsShown, latestSelectedId } = storeToRefs(resourcesStore)
+
     const dragItem = ref<Resource>()
     const ghostElement = ref()
 
@@ -517,7 +521,10 @@ export default defineComponent({
         space: ref(props.space),
         targetRouteCallback: computed(() => props.targetRouteCallback)
       }),
-      isLocationPicker
+      isLocationPicker,
+      toggleSelection,
+      areFileExtensionsShown,
+      latestSelectedId
     }
   },
   data() {
@@ -529,8 +536,6 @@ export default defineComponent({
     }
   },
   computed: {
-    ...mapState('Files', ['areFileExtensionsShown', 'latestSelectedId']),
-
     fields() {
       if (this.resources.length === 0) {
         return []
@@ -745,8 +750,6 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions('Files', ['toggleFileSelection']),
-
     isResourceSelected(item) {
       return this.selectedIds.includes(item.id)
     },
@@ -774,15 +777,15 @@ export default defineComponent({
         to: this.getTagLink(tag)
       }
     },
-    isLatestSelectedItem(item) {
+    isLatestSelectedItem(item: Resource) {
       return item.id === this.latestSelectedId
     },
-    hasRenameAction(item) {
+    hasRenameAction(item: Resource) {
       return this.renameActions.filter((menuItem) =>
         menuItem.isEnabled({ space: this.space, resources: [item] })
       ).length
     },
-    openRenameDialog(item) {
+    openRenameDialog(item: Resource) {
       this.renameHandler({
         space: this.getMatchingSpace(item),
         resources: [item]
@@ -853,12 +856,12 @@ export default defineComponent({
     sort(opts) {
       this.$emit('sort', opts)
     },
-    addSelectedResource(file) {
+    addSelectedResource(file: Resource) {
       const isSelected = this.isResourceSelected(file)
       if (isSelected) {
         return
       }
-      this.toggleFileSelection(file)
+      this.toggleSelection(file.id)
     },
     showContextMenuOnBtnClick(data, item) {
       if (this.isResourceDisabled(item)) {
@@ -934,14 +937,14 @@ export default defineComponent({
     formatDateRelative(date) {
       return formatRelativeDateFromJSDate(new Date(date), this.$language.current)
     },
-    setSelection(selected, resource) {
+    setSelection(selected, resource: Resource) {
       if (selected) {
         this.emitSelect([...this.selectedIds, resource.id])
       } else {
         this.emitSelect(this.selectedIds.filter((id) => id !== resource.id))
       }
     },
-    emitSelect(selectedIds) {
+    emitSelect(selectedIds: string[]) {
       eventBus.publish('app.files.list.clicked')
       this.$emit('update:selectedIds', selectedIds)
     },
diff --git a/packages/web-pkg/src/components/Search/ResourcePreview.vue b/packages/web-pkg/src/components/Search/ResourcePreview.vue
index d20b786f417..ed5a4349b55 100644
--- a/packages/web-pkg/src/components/Search/ResourcePreview.vue
+++ b/packages/web-pkg/src/components/Search/ResourcePreview.vue
@@ -21,8 +21,8 @@ import {
   useGetMatchingSpace,
   useFileActions,
   useFolderLink,
-  useStore,
-  useConfigStore
+  useConfigStore,
+  useResourcesStore
 } from '../../composables'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import { isResourceTxtFileAlmostEmpty } from '../../helpers'
@@ -56,13 +56,13 @@ export default defineComponent({
       getParentFolderLinkIconAdditionalAttributes,
       getFolderLink
     } = useFolderLink()
-    const store = useStore()
     const configStore = useConfigStore()
     const { options: configOptions } = storeToRefs(configStore)
+    const resourcesStore = useResourcesStore()
 
     const previewData = ref()
 
-    const areFileExtensionsShown = computed(() => unref(store.state.Files.areFileExtensionsShown))
+    const areFileExtensionsShown = computed(() => resourcesStore.areFileExtensionsShown)
 
     const resource = computed((): Resource => {
       return {
@@ -132,8 +132,7 @@ export default defineComponent({
       return
     }
 
-    const debounced = debounce(async ({ unobserve }) => {
-      unobserve()
+    const loadPreview = async () => {
       const preview = await this.$previewService.loadPreview(
         {
           space: this.space,
@@ -142,7 +141,13 @@ export default defineComponent({
         },
         true
       )
+
       preview && (this.previewData = preview)
+    }
+
+    const debounced = debounce(({ unobserve }) => {
+      unobserve()
+      loadPreview()
     }, 250)
 
     visibilityObserver.observe(this.$el, { onEnter: debounced, onExit: debounced.cancel })
diff --git a/packages/web-pkg/src/components/SideBar/FileSideBar.vue b/packages/web-pkg/src/components/SideBar/FileSideBar.vue
index a32c835a3c6..40d6c319d4c 100644
--- a/packages/web-pkg/src/components/SideBar/FileSideBar.vue
+++ b/packages/web-pkg/src/components/SideBar/FileSideBar.vue
@@ -45,21 +45,20 @@ import {
   SideBarEventTopics,
   useClientService,
   useEventBus,
-  useStore,
   useRouter,
   useActiveLocation,
   useExtensionRegistry,
   useSelectedResources,
   useSpacesStore,
-  useSharesStore
+  useSharesStore,
+  useResourcesStore
 } from '../../composables'
 import {
   isProjectSpaceResource,
   SpaceResource,
   Resource
 } from '@ownclouders/web-client/src/helpers'
-import { WebDAV } from '@ownclouders/web-client/src/webdav'
-import { AncestorMetaData } from '../../types'
+import { storeToRefs } from 'pinia'
 
 export default defineComponent({
   name: 'FileSideBar',
@@ -81,7 +80,6 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const store = useStore()
     const router = useRouter()
     const clientService = useClientService()
     const extensionRegistry = useExtensionRegistry()
@@ -89,13 +87,14 @@ export default defineComponent({
     const spacesStore = useSpacesStore()
     const { loadShares } = useSharesStore()
 
+    const resourcesStore = useResourcesStore()
+    const { currentFolder, ancestorMetaData } = storeToRefs(resourcesStore)
+
     const loadedResource = ref<Resource>()
     const isLoading = ref(false)
 
-    const { selectedResources } = useSelectedResources({ store })
-    const currentFolder = computed(() => {
-      return store.getters['Files/currentFolder']
-    })
+    const { selectedResources } = useSelectedResources()
+
     const panelContext = computed<SideBarPanelContext<SpaceResource, Resource, Resource>>(() => {
       if (unref(selectedResources).length === 0) {
         return {
@@ -176,10 +175,6 @@ export default defineComponent({
         .map((e) => e.panel)
     )
 
-    const ancestorMetaData = computed<AncestorMetaData>(
-      () => store.getters['runtime/ancestorMetaData/ancestorMetaData']
-    )
-
     watch(
       () => [...unref(panelContext).items, props.isOpen],
       async () => {
@@ -224,7 +219,7 @@ export default defineComponent({
 
         // shared resources look different, hence we need to fetch the actual resource here
         try {
-          let shareResource = await (clientService.webdav as WebDAV).getFileInfo(props.space, {
+          let shareResource = await clientService.webdav.getFileInfo(props.space, {
             path: resource.path
           })
           shareResource.share = resource.share
diff --git a/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue b/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
index 3674d828206..601201fa2c6 100644
--- a/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
+++ b/packages/web-pkg/src/components/SideBar/Files/FileInfo.vue
@@ -27,7 +27,7 @@
 <script lang="ts">
 import { computed, defineComponent, inject } from 'vue'
 import { Resource } from '@ownclouders/web-client'
-import { useStore } from '../../../composables'
+import { useResourcesStore } from '../../../composables'
 import ResourceIcon from '../../FilesList/ResourceIcon.vue'
 import ResourceName from '../../FilesList/ResourceName.vue'
 
@@ -41,9 +41,10 @@ export default defineComponent({
     }
   },
   setup() {
-    const store = useStore()
+    const resourcesStore = useResourcesStore()
+
     const resource = inject<Resource>('resource')
-    const areFileExtensionsShown = computed(() => store.state.Files.areFileExtensionsShown)
+    const areFileExtensionsShown = computed(() => resourcesStore.areFileExtensionsShown)
 
     return { resource, areFileExtensionsShown }
   }
diff --git a/packages/web-pkg/src/components/SideBar/Spaces/Details/SpaceDetails.vue b/packages/web-pkg/src/components/SideBar/Spaces/Details/SpaceDetails.vue
index 381c7dc0258..eeb14a035b4 100644
--- a/packages/web-pkg/src/components/SideBar/Spaces/Details/SpaceDetails.vue
+++ b/packages/web-pkg/src/components/SideBar/Spaces/Details/SpaceDetails.vue
@@ -85,12 +85,12 @@ import {
 } from '@ownclouders/web-client/src/helpers'
 import { spaceRoleManager } from '@ownclouders/web-client/src/helpers/share'
 import {
-  useStore,
   usePreviewService,
   useClientService,
   useUserStore,
   useSpacesStore,
-  useSharesStore
+  useSharesStore,
+  useResourcesStore
 } from '../../../../composables'
 import SpaceQuota from '../../../SpaceQuota.vue'
 import WebDavDetails from '../../WebDavDetails.vue'
@@ -116,11 +116,12 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const store = useStore()
     const userStore = useUserStore()
     const previewService = usePreviewService()
     const clientService = useClientService()
     const spacesStore = useSpacesStore()
+    const resourcesStore = useResourcesStore()
+
     const sharesStore = useSharesStore()
     const { spaceMembers } = storeToRefs(spacesStore)
 
@@ -151,9 +152,7 @@ export default defineComponent({
       return sharesStore.outgoingLinks.length
     })
 
-    const showWebDavDetails = computed(() => {
-      return store.getters['Files/areWebDavDetailsShown']
-    })
+    const showWebDavDetails = computed(() => resourcesStore.areWebDavDetailsShown)
 
     return {
       loadImageTask,
diff --git a/packages/web-pkg/src/components/Spaces/QuotaModal.vue b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
index ab8fdbb7d18..09b0b9e2566 100644
--- a/packages/web-pkg/src/components/Spaces/QuotaModal.vue
+++ b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
@@ -26,11 +26,11 @@ import {
   useClientService,
   useMessages,
   useSpacesStore,
-  useCapabilityStore
+  useCapabilityStore,
+  useResourcesStore
 } from '../../composables'
 import { useRouter } from '../../composables/router'
 import { eventBus } from '../../services'
-import { useStore } from '../../composables'
 import { Drive } from '@ownclouders/web-client/src/generated'
 import { storeToRefs } from 'pinia'
 
@@ -64,7 +64,6 @@ export default defineComponent({
   },
   emits: ['update:confirmDisabled'],
   setup(props, { emit, expose }) {
-    const store = useStore()
     const { showMessage, showErrorMessage } = useMessages()
     const capabilityStore = useCapabilityStore()
     const capabilityRefs = storeToRefs(capabilityStore)
@@ -72,6 +71,7 @@ export default defineComponent({
     const clientService = useClientService()
     const router = useRouter()
     const spacesStore = useSpacesStore()
+    const { updateResourceField } = useResourcesStore()
 
     const selectedOption = ref(0)
 
@@ -151,11 +151,7 @@ export default defineComponent({
           })
         }
         spacesStore.updateSpaceField({ id: space.id, field: 'spaceQuota', value: driveData.quota })
-        store.commit('Files/UPDATE_RESOURCE_FIELD', {
-          id: space.id,
-          field: 'spaceQuota',
-          value: driveData.quota
-        })
+        updateResourceField({ id: space.id, field: 'spaceQuota', value: driveData.quota })
       })
       const results = await Promise.allSettled<Array<unknown>>(requests)
       const succeeded = results.filter((r) => r.status === 'fulfilled')
diff --git a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
index e92029c5969..e51415cd3eb 100644
--- a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
+++ b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
@@ -12,7 +12,7 @@ import { defineComponent, PropType, onMounted, ref, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { SpaceResource } from '@ownclouders/web-client/src'
 import { getRelativeSpecialFolderSpacePath } from '@ownclouders/web-client/src/helpers'
-import { Modal, useClientService, useMessages, useStore } from '../../composables'
+import { Modal, useClientService, useMessages, useSpacesStore } from '../../composables'
 
 export default defineComponent({
   name: 'SpaceReadmeContentModal',
@@ -24,10 +24,10 @@ export default defineComponent({
     }
   },
   setup(props, { expose }) {
-    const store = useStore()
     const { showMessage, showErrorMessage } = useMessages()
     const { $gettext } = useGettext()
     const clientService = useClientService()
+    const { updateSpaceField } = useSpacesStore()
 
     const readmeContent = ref<string>()
 
@@ -38,7 +38,7 @@ export default defineComponent({
           content: unref(readmeContent)
         })
 
-        store.commit('Files/UPDATE_RESOURCE_FIELD', {
+        updateSpaceField({
           id: props.space.id,
           field: 'spaceReadmeData',
           value: { ...props.space.spaceReadmeData, ...{ etag: readmeMetaData.etag } }
diff --git a/packages/web-pkg/src/components/ViewOptions.vue b/packages/web-pkg/src/components/ViewOptions.vue
index 7ebf545fb8e..8d9ab0bd051 100644
--- a/packages/web-pkg/src/components/ViewOptions.vue
+++ b/packages/web-pkg/src/components/ViewOptions.vue
@@ -89,7 +89,6 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, unref, watch } from 'vue'
-import { mapMutations, mapState } from 'vuex'
 import { useGettext } from 'vue3-gettext'
 import {
   queryItemAsString,
@@ -99,9 +98,11 @@ import {
   useRouter,
   PaginationConstants,
   ViewModeConstants,
-  useRouteName
+  useRouteName,
+  useResourcesStore
 } from '../composables'
 import { ViewMode } from '../ui/types'
+import { storeToRefs } from 'pinia'
 
 export default defineComponent({
   props: {
@@ -139,6 +140,10 @@ export default defineComponent({
     const currentRoute = useRoute()
     const { $gettext } = useGettext()
 
+    const resourcesStore = useResourcesStore()
+    const { setAreHiddenFilesShown, setAreFileExtensionsShown } = resourcesStore
+    const { areHiddenFilesShown, areFileExtensionsShown } = storeToRefs(resourcesStore)
+
     const queryParamsLoading = ref(false)
 
     const currentPageQuery = useRouteQuery('page')
@@ -196,19 +201,21 @@ export default defineComponent({
       queryItemAsString,
       setItemsPerPage,
       setViewMode,
+      areHiddenFilesShown,
+      areFileExtensionsShown,
+      setAreHiddenFilesShown,
+      setAreFileExtensionsShown,
       viewOptionsButtonLabel: $gettext('Display customization options of the files list')
     }
   },
   computed: {
-    ...mapState('Files', ['areHiddenFilesShown', 'areFileExtensionsShown']),
-
     hiddenFilesShownModel: {
       get() {
         return this.areHiddenFilesShown
       },
 
       set(value) {
-        this.SET_HIDDEN_FILES_VISIBILITY(value)
+        this.setAreHiddenFilesShown(value)
       }
     },
     fileExtensionsShownModel: {
@@ -217,13 +224,11 @@ export default defineComponent({
       },
 
       set(value) {
-        this.SET_FILE_EXTENSIONS_VISIBILITY(value)
+        this.setAreFileExtensionsShown(value)
       }
     }
   },
   methods: {
-    ...mapMutations('Files', ['SET_HIDDEN_FILES_VISIBILITY', 'SET_FILE_EXTENSIONS_VISIBILITY']),
-
     updateHiddenFilesShownModel(event) {
       this.hiddenFilesShownModel = event
     },
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActions.ts b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
index 95457954b6f..1f4af0586f2 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActions.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
@@ -1,10 +1,8 @@
 import kebabCase from 'lodash-es/kebabCase'
-import { Store } from 'vuex'
 import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
 import { routeToContextQuery } from '../../appDefaults'
 import { isLocationSharesActive, isLocationTrashActive } from '../../../router'
 import { computed, unref } from 'vue'
-import { useStore } from '../../store'
 import { useRouter } from '../../router'
 import { useGettext } from 'vue3-gettext'
 import {
@@ -31,9 +29,10 @@ import {
   useFileActionsRestore,
   useFileActionsCreateSpaceFromResource
 } from './index'
-import { useAppsStore, useConfigStore } from '../../piniaStores'
+import { useAppsStore, useConfigStore, useResourcesStore } from '../../piniaStores'
 import { ApplicationFileExtension } from '../../../apps'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
+import { storeToRefs } from 'pinia'
 
 export const EDITOR_MODE_EDIT = 'edit'
 export const EDITOR_MODE_CREATE = 'create'
@@ -42,8 +41,7 @@ export interface GetFileActionsOptions extends FileActionOptions {
   omitSystemActions?: boolean
 }
 
-export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActions = () => {
   const appsStore = useAppsStore()
   const configStore = useConfigStore()
   const router = useRouter()
@@ -52,19 +50,22 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
 
   const { openUrl } = useWindowOpen()
 
-  const { actions: acceptShareActions } = useFileActionsAcceptShare({ store })
-  const { actions: hideShareActions } = useFileActionsToggleHideShare({ store })
-  const { actions: copyActions } = useFileActionsCopy({ store })
-  const { actions: deleteActions } = useFileActionsDelete({ store })
-  const { actions: declineShareActions } = useFileActionsDeclineShare({ store })
+  const resourcesStore = useResourcesStore()
+  const { currentFolder } = storeToRefs(resourcesStore)
+
+  const { actions: acceptShareActions } = useFileActionsAcceptShare()
+  const { actions: hideShareActions } = useFileActionsToggleHideShare()
+  const { actions: copyActions } = useFileActionsCopy()
+  const { actions: deleteActions } = useFileActionsDelete()
+  const { actions: declineShareActions } = useFileActionsDeclineShare()
   const { actions: downloadArchiveActions } = useFileActionsDownloadArchive()
   const { actions: downloadFileActions } = useFileActionsDownloadFile()
-  const { actions: favoriteActions } = useFileActionsFavorite({ store })
-  const { actions: moveActions } = useFileActionsMove({ store })
-  const { actions: navigateActions } = useFileActionsNavigate({ store })
-  const { actions: renameActions } = useFileActionsRename({ store })
-  const { actions: restoreActions } = useFileActionsRestore({ store })
-  const { actions: createSpaceFromResource } = useFileActionsCreateSpaceFromResource({ store })
+  const { actions: favoriteActions } = useFileActionsFavorite()
+  const { actions: moveActions } = useFileActionsMove()
+  const { actions: navigateActions } = useFileActionsNavigate()
+  const { actions: renameActions } = useFileActionsRename()
+  const { actions: restoreActions } = useFileActionsRestore()
+  const { actions: createSpaceFromResource } = useFileActionsCreateSpaceFromResource()
   const { actions: openShortcutActions } = useFileActionsOpenShortcut()
 
   const systemActions = computed((): Action[] => [
@@ -221,7 +222,7 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
     const filterCallback = (action) =>
       action.isEnabled({
         ...options,
-        parent: store.getters['Files/currentFolder']
+        parent: unref(currentFolder)
       })
 
     // first priority: handlers from config
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts
index be394520e6b..b40877dab97 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts
@@ -1,20 +1,23 @@
 import { triggerShareAction } from '../../../helpers/share/triggerShareAction'
 
-import { Store } from 'vuex'
 import PQueue from 'p-queue'
 import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
 import { isLocationSharesActive, isLocationSpacesActive } from '../../../router'
 import { useClientService } from '../../clientService'
 import { useLoadingService } from '../../loadingService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
-import { useMessages, useSpacesStore, useCapabilityStore, useConfigStore } from '../../piniaStores'
+import {
+  useMessages,
+  useSpacesStore,
+  useCapabilityStore,
+  useConfigStore,
+  useResourcesStore
+} from '../../piniaStores'
 
-export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsAcceptShare = () => {
   const { showMessage, showErrorMessage } = useMessages()
   const capabilityStore = useCapabilityStore()
   const router = useRouter()
@@ -25,6 +28,9 @@ export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}
   const configStore = useConfigStore()
   const spacesStore = useSpacesStore()
 
+  const resourcesStore = useResourcesStore()
+  const { upsertResource } = resourcesStore
+
   const handler = async ({ resources }: FileActionOptions) => {
     const errors = []
     const triggerPromises = []
@@ -45,7 +51,7 @@ export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}
               fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
             })
             if (share) {
-              store.commit('Files/UPDATE_RESOURCE', share)
+              upsertResource(share)
             }
           } catch (error) {
             console.error(error)
@@ -57,7 +63,7 @@ export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}
     await Promise.all(triggerPromises)
 
     if (errors.length === 0) {
-      store.dispatch('Files/resetFileSelection')
+      resourcesStore.resetSelection()
 
       if (isLocationSpacesActive(router, 'files-spaces-generic')) {
         showMessage({
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
index f9509e5e290..82c23b4e29b 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
@@ -3,24 +3,25 @@ import {
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../../router'
-import { Store } from 'vuex'
 import { computed, unref } from 'vue'
 
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
-import { useConfigStore, useClipboardStore } from '../../piniaStores'
+import { useConfigStore, useClipboardStore, useResourcesStore } from '../../piniaStores'
+import { storeToRefs } from 'pinia'
 
-export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsCopy = () => {
   const configStore = useConfigStore()
   const router = useRouter()
   const { copyResources } = useClipboardStore()
   const language = useGettext()
   const { $gettext } = language
 
+  const resourcesStore = useResourcesStore()
+  const { currentFolder } = storeToRefs(resourcesStore)
+
   const isMacOs = computed(() => {
     return window.navigator.platform.match('Mac')
   })
@@ -65,7 +66,7 @@ export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {
           }
 
           if (isLocationPublicActive(router, 'files-public-link')) {
-            return store.getters['Files/currentFolder'].canCreate()
+            return unref(currentFolder).canCreate()
           }
 
           if (
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFile.ts
index bc0c5a010c9..43e40621a81 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -3,11 +3,9 @@ import {
   SpaceResource,
   extractNameWithoutExtension
 } from '@ownclouders/web-client/src/helpers'
-import { Store } from 'vuex'
 import { computed, unref } from 'vue'
 import { useClientService } from '../../clientService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { FileAction, FileActionOptions } from '../types'
 import { useGettext } from 'vue3-gettext'
 import { resolveFileNameDuplicate } from '../../../helpers/resource'
@@ -16,18 +14,17 @@ import { WebDAV } from '@ownclouders/web-client/src/webdav'
 import { isLocationSpacesActive } from '../../../router'
 import { getIndicators } from '../../../helpers'
 import { EDITOR_MODE_CREATE, useFileActions } from './useFileActions'
-import { AncestorMetaData } from '../../../types'
-import { useMessages, useModals, useUserStore, useAppsStore } from '../../piniaStores'
+import {
+  useMessages,
+  useModals,
+  useUserStore,
+  useAppsStore,
+  useResourcesStore
+} from '../../piniaStores'
 import { ApplicationFileExtension } from '../../../apps'
+import { storeToRefs } from 'pinia'
 
-export const useFileActionsCreateNewFile = ({
-  store,
-  space
-}: {
-  store?: Store<any>
-  space?: SpaceResource
-} = {}) => {
-  store = store || useStore()
+export const useFileActionsCreateNewFile = ({ space }: { space?: SpaceResource } = {}) => {
   const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const router = useRouter()
@@ -37,12 +34,10 @@ export const useFileActionsCreateNewFile = ({
 
   const { openEditor } = useFileActions()
   const clientService = useClientService()
-  const currentFolder = computed((): Resource => store.getters['Files/currentFolder'])
-  const files = computed((): Array<Resource> => store.getters['Files/files'])
-  const ancestorMetaData = computed<AncestorMetaData>(
-    () => store.getters['runtime/ancestorMetaData/ancestorMetaData']
-  )
-  const areFileExtensionsShown = computed((): boolean => store.state.Files.areFileExtensionsShown)
+
+  const resourcesStore = useResourcesStore()
+  const { resources, currentFolder, ancestorMetaData, areFileExtensionsShown } =
+    storeToRefs(resourcesStore)
 
   const appNewFileMenuExtensions = computed(() =>
     appsStore.fileExtensions.filter(({ newFileMenu }) => !!newFileMenu)
@@ -69,7 +64,7 @@ export const useFileActionsCreateNewFile = ({
       return $gettext('File name cannot end with whitespace')
     }
 
-    const exists = unref(files).find((file) => file.name === fileName)
+    const exists = unref(resources).find((file) => file.name === fileName)
 
     if (exists) {
       return $gettext('%{name} already exists', { name: fileName }, true)
@@ -87,7 +82,7 @@ export const useFileActionsCreateNewFile = ({
       resource.indicators = getIndicators({ resource, ancestorMetaData: unref(ancestorMetaData) })
     }
 
-    store.commit('Files/UPSERT_RESOURCE', resource)
+    resourcesStore.upsertResource(resource)
 
     return openEditor(appFileExtension, space, resource, EDITOR_MODE_CREATE, space.shareId)
   }
@@ -99,8 +94,8 @@ export const useFileActionsCreateNewFile = ({
   ) => {
     let defaultName = $gettext('New file') + `.${extension}`
 
-    if (unref(files).some((f) => f.name === defaultName)) {
-      defaultName = resolveFileNameDuplicate(defaultName, extension, unref(files))
+    if (unref(resources).some((f) => f.name === defaultName)) {
+      defaultName = resolveFileNameDuplicate(defaultName, extension, unref(resources))
     }
 
     if (!areFileExtensionsShown.value) {
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index 93cd7c10a7e..5074d91027c 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -1,9 +1,7 @@
-import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
-import { Store } from 'vuex'
+import { SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { computed, nextTick, unref } from 'vue'
 import { useClientService } from '../../clientService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { FileAction } from '../../../'
 import { useGettext } from 'vue3-gettext'
 import { resolveFileNameDuplicate } from '../../../helpers/resource'
@@ -12,26 +10,20 @@ import { WebDAV } from '@ownclouders/web-client/src/webdav'
 import { isLocationSpacesActive } from '../../../router'
 import { getIndicators } from '../../../helpers/statusIndicators'
 import { useScrollTo } from '../../scrollTo'
-import { AncestorMetaData } from '../../../types'
-import { useMessages, useModals } from '../../../composables/piniaStores'
-
-export const useFileActionsCreateNewFolder = ({
-  store,
-  space
-}: { store?: Store<any>; space?: SpaceResource } = {}) => {
-  store = store || useStore()
+import { useMessages, useModals, useResourcesStore } from '../../../composables/piniaStores'
+import { storeToRefs } from 'pinia'
+
+export const useFileActionsCreateNewFolder = ({ space }: { space?: SpaceResource } = {}) => {
   const { showMessage, showErrorMessage } = useMessages()
   const router = useRouter()
   const { dispatchModal } = useModals()
   const { $gettext } = useGettext()
   const { scrollToResource } = useScrollTo()
 
+  const resourcesStore = useResourcesStore()
+  const { resources, currentFolder, ancestorMetaData } = storeToRefs(resourcesStore)
+
   const clientService = useClientService()
-  const currentFolder = computed((): Resource => store.getters['Files/currentFolder'])
-  const files = computed((): Array<Resource> => store.getters['Files/files'])
-  const ancestorMetaData = computed<AncestorMetaData>(
-    () => store.getters['runtime/ancestorMetaData/ancestorMetaData']
-  )
 
   const checkNewFolderName = (folderName: string, setError: (error: string) => void) => {
     if (folderName.trim() === '') {
@@ -50,7 +42,7 @@ export const useFileActionsCreateNewFolder = ({
       return setError($gettext('Folder name cannot be equal to ".."'))
     }
 
-    const exists = unref(files).find((file) => file.name === folderName)
+    const exists = unref(resources).find((file) => file.name === folderName)
 
     if (exists) {
       return setError($gettext('%{name} already exists', { name: folderName }, true))
@@ -76,7 +68,7 @@ export const useFileActionsCreateNewFolder = ({
         resource.indicators = getIndicators({ resource, ancestorMetaData: unref(ancestorMetaData) })
       }
 
-      store.commit('Files/UPSERT_RESOURCE', resource)
+      resourcesStore.upsertResource(resource)
 
       showMessage({ title: $gettext('"%{folderName}" was created successfully', { folderName }) })
 
@@ -94,8 +86,8 @@ export const useFileActionsCreateNewFolder = ({
   const handler = () => {
     let defaultName = $gettext('New folder')
 
-    if (unref(files).some((f) => f.name === defaultName)) {
-      defaultName = resolveFileNameDuplicate(defaultName, '', unref(files))
+    if (unref(resources).some((f) => f.name === defaultName)) {
+      defaultName = resolveFileNameDuplicate(defaultName, '', unref(resources))
     }
 
     dispatchModal({
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewShortcut.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewShortcut.ts
index 03ffd770551..adef738b6ff 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewShortcut.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewShortcut.ts
@@ -1,15 +1,16 @@
-import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { computed, unref } from 'vue'
-import { useStore } from '../../store'
-import { FileAction, useModals } from '../../../composables'
+import { FileAction, useModals, useResourcesStore } from '../../../composables'
 import { CreateShortcutModal } from '../../../components'
 import { useGettext } from 'vue3-gettext'
+import { storeToRefs } from 'pinia'
+import { SpaceResource } from '@ownclouders/web-client'
 
 export const useFileActionsCreateNewShortcut = ({ space }: { space: SpaceResource }) => {
-  const store = useStore()
   const { dispatchModal } = useModals()
   const { $gettext } = useGettext()
-  const currentFolder = computed((): Resource => store.getters['Files/currentFolder'])
+
+  const resourcesStore = useResourcesStore()
+  const { currentFolder } = storeToRefs(resourcesStore)
 
   const actions = computed((): FileAction[] => {
     return [
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
index 41bd5ba0afc..88eb2a2130e 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
@@ -1,4 +1,3 @@
-import { Store } from 'vuex'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
@@ -11,9 +10,15 @@ import { isLocationSpacesActive } from '../../../router'
 import { useCreateSpace } from '../../spaces'
 import { useSpaceHelpers } from '../../spaces'
 import PQueue from 'p-queue'
-import { useConfigStore, useMessages, useModals, useSpacesStore } from '../../piniaStores'
+import {
+  useConfigStore,
+  useMessages,
+  useModals,
+  useResourcesStore,
+  useSpacesStore
+} from '../../piniaStores'
 
-export const useFileActionsCreateSpaceFromResource = ({ store }: { store?: Store<any> } = {}) => {
+export const useFileActionsCreateSpaceFromResource = () => {
   const { showMessage, showErrorMessage } = useMessages()
   const { can } = useAbility()
   const { $gettext, $ngettext } = useGettext()
@@ -25,6 +30,7 @@ export const useFileActionsCreateSpaceFromResource = ({ store }: { store?: Store
   const { dispatchModal } = useModals()
   const configStore = useConfigStore()
   const spacesStore = useSpacesStore()
+  const resourcesStore = useResourcesStore()
 
   const confirmAction = async ({ spaceName, resources, space }) => {
     const { webdav } = clientService
@@ -49,7 +55,7 @@ export const useFileActionsCreateSpaceFromResource = ({ store }: { store?: Store
       }
 
       await Promise.all(copyOps)
-      store.dispatch('Files/resetFileSelection')
+      resourcesStore.resetSelection()
       showMessage({ title: $gettext('Space was created successfully') })
     } catch (error) {
       console.error(error)
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts
index 85fe0d3909f..ea2fe820312 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts
@@ -4,20 +4,23 @@ import {
   isLocationSpacesActive,
   createLocationShares
 } from '../../../router'
-import { Store } from 'vuex'
 import PQueue from 'p-queue'
 import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
 import { useClientService } from '../../clientService'
 import { useLoadingService } from '../../loadingService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
-import { useMessages, useSpacesStore, useCapabilityStore, useConfigStore } from '../../piniaStores'
+import {
+  useMessages,
+  useSpacesStore,
+  useCapabilityStore,
+  useConfigStore,
+  useResourcesStore
+} from '../../piniaStores'
 
-export const useFileActionsDeclineShare = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsDeclineShare = () => {
   const { showMessage, showErrorMessage } = useMessages()
   const capabilityStore = useCapabilityStore()
   const router = useRouter()
@@ -27,6 +30,7 @@ export const useFileActionsDeclineShare = ({ store }: { store?: Store<any> } = {
   const loadingService = useLoadingService()
   const configStore = useConfigStore()
   const spacesStore = useSpacesStore()
+  const { upsertResource } = useResourcesStore()
 
   const handler = async ({ resources }: FileActionOptions) => {
     const errors = []
@@ -48,7 +52,7 @@ export const useFileActionsDeclineShare = ({ store }: { store?: Store<any> } = {
               fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
             })
             if (share) {
-              store.commit('Files/UPDATE_RESOURCE', share)
+              upsertResource(share)
             }
           } catch (error) {
             console.error(error)
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsDelete.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsDelete.ts
index b2b7a2a3265..90537755615 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsDelete.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsDelete.ts
@@ -1,5 +1,4 @@
 import { useFileActionsDeleteResources } from '../helpers'
-import { Store } from 'vuex'
 import {
   isLocationPublicActive,
   isLocationSpacesActive,
@@ -8,18 +7,16 @@ import {
 } from '../../../router'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
 import { computed } from 'vue'
 import { useUserStore, useCapabilityStore } from '../../piniaStores'
 
-export const useFileActionsDelete = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsDelete = () => {
   const userStore = useUserStore()
   const capabilityStore = useCapabilityStore()
   const router = useRouter()
-  const { displayDialog, filesList_delete } = useFileActionsDeleteResources({ store })
+  const { displayDialog, filesList_delete } = useFileActionsDeleteResources()
 
   const { $gettext } = useGettext()
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
index 40dd239bc9f..008e6a54773 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
@@ -1,18 +1,20 @@
-import { Store } from 'vuex'
 import { isLocationTrashActive } from '../../../router'
 import { SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { computed } from 'vue'
 import { useClientService } from '../../clientService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
-
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
-import { useMessages, useModals, useUserStore, useCapabilityStore } from '../../piniaStores'
+import {
+  useMessages,
+  useModals,
+  useUserStore,
+  useCapabilityStore,
+  useResourcesStore
+} from '../../piniaStores'
 
-export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsEmptyTrashBin = () => {
   const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const capabilityStore = useCapabilityStore()
@@ -20,13 +22,15 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
   const { $gettext } = useGettext()
   const clientService = useClientService()
   const { dispatchModal } = useModals()
+  const resourcesStore = useResourcesStore()
 
   const emptyTrashBin = ({ space }: { space: SpaceResource }) => {
     return clientService.webdav
       .clearTrashBin(space)
       .then(() => {
         showMessage({ title: $gettext('All deleted files were removed') })
-        store.dispatch('Files/clearTrashBin')
+        resourcesStore.clearResources()
+        resourcesStore.resetSelection()
       })
       .catch((error) => {
         console.error(error)
@@ -74,7 +78,7 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
         return true
       },
       isDisabled: () => {
-        return store.getters['Files/activeFiles'].length === 0
+        return resourcesStore.activeResources.length === 0
       },
       componentType: 'button',
       class: 'oc-files-actions-empty-trash-bin-trigger',
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsFavorite.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsFavorite.ts
index f3ebb30e29b..375b43250d2 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsFavorite.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsFavorite.ts
@@ -1,16 +1,14 @@
 import { computed, unref } from 'vue'
-import { Store } from 'vuex'
 import { isLocationCommonActive, isLocationSpacesActive } from '../../../router'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions, useIsFilesAppActive } from '../../actions'
-import { useStore } from '../../store'
 import { useRouter } from '../../router'
 import { useClientService } from '../../clientService'
 import { useAbility } from '../../ability'
-import { useMessages, useCapabilityStore } from '../../piniaStores'
+import { useMessages, useCapabilityStore, useResourcesStore } from '../../piniaStores'
+import { useEventBus } from '../../eventBus'
 
-export const useFileActionsFavorite = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsFavorite = () => {
   const { showErrorMessage } = useMessages()
   const capabilityStore = useCapabilityStore()
   const router = useRouter()
@@ -18,21 +16,26 @@ export const useFileActionsFavorite = ({ store }: { store?: Store<any> } = {}) =
   const clientService = useClientService()
   const isFilesAppActive = useIsFilesAppActive()
   const ability = useAbility()
+  const resourcesStore = useResourcesStore()
+  const eventBus = useEventBus()
 
-  const handler = ({ resources }: FileActionOptions) => {
-    store
-      .dispatch('Files/markFavorite', {
-        client: clientService.owncloudSdk,
-        file: resources[0]
-      })
-      .catch((error) => {
-        const title = $gettext(
-          'Failed to change favorite state of "%{file}"',
-          { file: resources[0].name },
-          true
-        )
-        showErrorMessage({ title, errors: [error] })
-      })
+  const handler = async ({ resources }: FileActionOptions) => {
+    try {
+      const newValue = !resources[0].starred
+      await clientService.owncloudSdk.files.favorite(resources[0].webDavPath, newValue)
+
+      resourcesStore.updateResourceField({ id: resources[0].id, field: 'starred', value: newValue })
+      if (!newValue) {
+        eventBus.publish('app.files.list.removeFromFavorites', resources[0].id)
+      }
+    } catch (error) {
+      const title = $gettext(
+        'Failed to change favorite state of "%{file}"',
+        { file: resources[0].name },
+        true
+      )
+      showErrorMessage({ title, errors: [error] })
+    }
   }
 
   const actions = computed((): FileAction[] => [
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
index 7e3f4c4fffd..0c9c620d71c 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
@@ -4,22 +4,23 @@ import {
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../../router'
-import { Store } from 'vuex'
 import { useGettext } from 'vue3-gettext'
 import { ActionOptions, FileAction } from '../types'
 import { computed, unref } from 'vue'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
-import { useClipboardStore } from '../../piniaStores'
+import { useClipboardStore, useResourcesStore } from '../../piniaStores'
 import { Resource } from '@ownclouders/web-client'
+import { storeToRefs } from 'pinia'
 
-export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsMove = () => {
   const router = useRouter()
   const { cutResources } = useClipboardStore()
   const language = useGettext()
   const { $gettext } = language
 
+  const resourcesStore = useResourcesStore()
+  const { currentFolder } = storeToRefs(resourcesStore)
+
   const isMacOs = computed(() => {
     return window.navigator.platform.match('Mac')
   })
@@ -53,7 +54,7 @@ export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
           return false
         }
 
-        if (!store.getters['Files/currentFolder']) {
+        if (!unref(currentFolder)) {
           return false
         }
 
@@ -62,7 +63,7 @@ export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
         }
 
         const moveDisabled = resources.some((resource) => {
-          return canBeMoved(resource, store.getters['Files/currentFolder'].path) === false
+          return canBeMoved(resource, unref(currentFolder).path) === false
         })
         return !moveDisabled
       },
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts
index e54f1b60204..2032c7503bf 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts
@@ -1,4 +1,3 @@
-import { Store } from 'vuex'
 import { isSameResource } from '../../../helpers/resource'
 import {
   createLocationPublic,
@@ -13,17 +12,20 @@ import { isShareSpaceResource, SpaceResource } from '@ownclouders/web-client/src
 import { createFileRouteOptions } from '../../../helpers/router'
 import { useGetMatchingSpace } from '../../spaces'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction } from '../types'
+import { useResourcesStore } from '../../piniaStores'
+import { storeToRefs } from 'pinia'
 
-export const useFileActionsNavigate = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsNavigate = () => {
   const router = useRouter()
   const { $gettext } = useGettext()
   const { getMatchingSpace } = useGetMatchingSpace()
 
+  const resourcesStore = useResourcesStore()
+  const { currentFolder } = storeToRefs(resourcesStore)
+
   const getSpace = (space: SpaceResource) => {
     return space ? space : getMatchingSpace(space)
   }
@@ -49,8 +51,7 @@ export const useFileActionsNavigate = ({ store }: { store?: Store<any> } = {}) =
           return false
         }
 
-        const currentFolder = store.getters['Files/currentFolder']
-        if (currentFolder !== null && isSameResource(resources[0], currentFolder)) {
+        if (unref(currentFolder) !== null && isSameResource(resources[0], unref(currentFolder))) {
           return false
         }
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
index a2bdf451b9e..1d926bc99af 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
@@ -3,21 +3,19 @@ import {
   isLocationPublicActive,
   isLocationSpacesActive
 } from '../../../router'
-import { Store } from 'vuex'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { useGetMatchingSpace } from '../../spaces'
 import { useClientService } from '../../clientService'
 import { useLoadingService } from '../../loadingService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { FileAction, FileActionOptions } from '../types'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { useClipboardStore } from '../../piniaStores'
+import { useClipboardStore, useResourcesStore } from '../../piniaStores'
 import { ClipboardActions, ResourceTransfer, TransferType } from '../../../helpers'
+import { storeToRefs } from 'pinia'
 
-export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsPaste = () => {
   const router = useRouter()
   const clientService = useClientService()
   const loadingService = useLoadingService()
@@ -25,6 +23,9 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
   const { $gettext, $ngettext } = useGettext()
   const clipboardStore = useClipboardStore()
 
+  const resourcesStore = useResourcesStore()
+  const { currentFolder } = storeToRefs(resourcesStore)
+
   const isMacOs = computed(() => {
     return window.navigator.platform.match('Mac')
   })
@@ -36,8 +37,6 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
     return $gettext('Ctrl + V')
   })
 
-  const currentFolder = computed<Resource>(() => store.getters['Files/currentFolder'])
-
   const pasteSelectedFiles = ({
     targetSpace,
     sourceSpace,
@@ -77,8 +76,8 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
       }
 
       return Promise.all(loadingResources).then(() => {
-        store.commit('Files/UPSERT_RESOURCES', fetchedResources)
-        store.commit('Files/LOAD_INDICATORS', unref(currentFolder).path)
+        resourcesStore.upsertResources(fetchedResources)
+        resourcesStore.loadIndicators(unref(currentFolder).path)
       })
     })
   }
@@ -132,9 +131,8 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
           return false
         }
 
-        const currentFolder = store.getters['Files/currentFolder']
-        if (isLocationPublicActive(router, 'files-public-link') && currentFolder) {
-          return currentFolder.canCreate()
+        if (isLocationPublicActive(router, 'files-public-link') && unref(currentFolder)) {
+          return unref(currentFolder).canCreate()
         }
 
         // copy can't be restricted in authenticated context, because
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsRename.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsRename.ts
index a047ea86e35..8d70017bfd1 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsRename.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsRename.ts
@@ -1,4 +1,3 @@
-import { Store } from 'vuex'
 import { isSameResource } from '../../../helpers/resource'
 import { isLocationTrashActive, isLocationSharesActive } from '../../../router'
 import { Resource } from '@ownclouders/web-client'
@@ -14,13 +13,17 @@ import { renameResource as _renameResource } from '../../../helpers/resource'
 import { computed } from 'vue'
 import { useClientService } from '../../clientService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
-import { useMessages, useModals, useCapabilityStore, useConfigStore } from '../../piniaStores'
-
-export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+import {
+  useMessages,
+  useModals,
+  useCapabilityStore,
+  useConfigStore,
+  useResourcesStore
+} from '../../piniaStores'
+
+export const useFileActionsRename = () => {
   const { showErrorMessage } = useMessages()
   const capabilityStore = useCapabilityStore()
   const router = useRouter()
@@ -29,6 +32,9 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
   const configStore = useConfigStore()
   const { dispatchModal } = useModals()
 
+  const resourcesStore = useResourcesStore()
+  const { setCurrentFolder, upsertResource } = resourcesStore
+
   const getNameErrorMsg = (resource: Resource, newName: string, parentResources = undefined) => {
     const newPath =
       resource.path.substring(0, resource.path.length - resource.name.length) + newName
@@ -53,7 +59,7 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
       return $gettext('The name cannot end with whitespace')
     }
 
-    const exists = store.getters['Files/files'].find(
+    const exists = resourcesStore.resources.find(
       (file) => file.path === newPath && resource.name !== newName
     )
     if (exists) {
@@ -76,7 +82,7 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
   }
 
   const renameResource = async (space: SpaceResource, resource: Resource, newName: string) => {
-    let currentFolder = store.getters['Files/currentFolder']
+    let currentFolder = resourcesStore.currentFolder
 
     try {
       const newPath = join(dirname(resource.path), newName)
@@ -92,7 +98,7 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
         if (isCurrentFolder) {
           currentFolder = { ...currentFolder } as Resource
           currentFolder.name = newName
-          store.commit('Files/SET_CURRENT_FOLDER', currentFolder)
+          setCurrentFolder(currentFolder)
           return router.push(
             createFileRouteOptions(space, {
               path: '',
@@ -103,14 +109,14 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
 
         const sharedResource = { ...resource }
         sharedResource.name = newName
-        store.commit('Files/UPSERT_RESOURCE', sharedResource)
+        upsertResource(sharedResource)
         return
       }
 
       if (isCurrentFolder) {
         currentFolder = { ...currentFolder } as Resource
         _renameResource(space, currentFolder, newPath)
-        store.commit('SET_CURRENT_FOLDER', currentFolder)
+        setCurrentFolder(currentFolder)
         return router.push(
           createFileRouteOptions(space, {
             path: newPath,
@@ -120,7 +126,7 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
       }
       const fileResource = { ...resource } as Resource
       _renameResource(space, fileResource, newPath)
-      store.commit('Files/UPSERT_RESOURCE', fileResource)
+      upsertResource(fileResource)
     } catch (error) {
       console.error(error)
       let title = $gettext(
@@ -140,18 +146,14 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
   }
 
   const handler = async ({ space, resources }: FileActionOptions) => {
-    const currentFolder = store.getters['Files/currentFolder']
+    const currentFolder = resourcesStore.currentFolder
     let parentResources
     if (isSameResource(resources[0], currentFolder)) {
       const parentPath = dirname(currentFolder.path)
-      parentResources = (
-        await (clientService.webdav as WebDAV).listFiles(space, {
-          path: parentPath
-        })
-      ).children
+      parentResources = (await clientService.webdav.listFiles(space, { path: parentPath })).children
     }
 
-    const areFileExtensionsShown = store.state.Files.areFileExtensionsShown
+    const areFileExtensionsShown = resourcesStore.areFileExtensionsShown
     const onConfirm = async (newName: string) => {
       if (!areFileExtensionsShown) {
         newName = `${newName}.${resources[0].extension}`
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsRestore.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsRestore.ts
index d9d1ee5e87f..d0bec74ef08 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsRestore.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsRestore.ts
@@ -1,4 +1,3 @@
-import { Store } from 'vuex'
 import { dirname } from 'path'
 import { isLocationTrashActive } from '../../../router'
 
@@ -18,15 +17,19 @@ import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { useClientService } from '../../clientService'
 import { useLoadingService } from '../../loadingService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
 import { LoadingTaskCallbackArguments } from '../../../services'
-import { useMessages, useSpacesStore, useUserStore, useCapabilityStore } from '../../piniaStores'
+import {
+  useMessages,
+  useSpacesStore,
+  useUserStore,
+  useCapabilityStore,
+  useResourcesStore
+} from '../../piniaStores'
 
-export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsRestore = () => {
   const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const capabilityStore = useCapabilityStore()
@@ -35,6 +38,7 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
   const clientService = useClientService()
   const loadingService = useLoadingService()
   const spacesStore = useSpacesStore()
+  const resourcesStore = useResourcesStore()
 
   const collectConflicts = async (space: SpaceResource, sortedResources: Resource[]) => {
     const existingResourcesCache = {}
@@ -175,8 +179,9 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
 
     // success handler (for partial and full success)
     if (restoredResources.length) {
-      store.dispatch('Files/removeFilesFromTrashbin', restoredResources)
-      let title
+      resourcesStore.removeResources(restoredResources)
+      resourcesStore.resetSelection()
+      let title: string
       if (restoredResources.length === 1) {
         title = $gettext('%{resource} was restored successfully', {
           resource: restoredResources[0].name
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsShowDetails.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsShowDetails.ts
index fb237ee359d..b82ebf656b9 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsShowDetails.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsShowDetails.ts
@@ -1,4 +1,3 @@
-import { Store } from 'vuex'
 import { isLocationTrashActive } from '../../../router'
 import { eventBus } from '../../../services/eventBus'
 import { SideBarEventTopics } from '../../sideBar'
@@ -6,12 +5,12 @@ import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { useIsFilesAppActive } from '../helpers'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { FileAction } from '../types'
+import { useResourcesStore } from '../../piniaStores'
 
-export const useFileActionsShowDetails = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsShowDetails = () => {
   const router = useRouter()
+  const resourcesStore = useResourcesStore()
 
   const { $gettext } = useGettext()
   const isFilesAppActive = useIsFilesAppActive()
@@ -37,7 +36,7 @@ export const useFileActionsShowDetails = ({ store }: { store?: Store<any> } = {}
         return resources.length > 0
       },
       handler({ resources }) {
-        store.commit('Files/SET_FILE_SELECTION', resources)
+        resourcesStore.setSelection(resources.map(({ id }) => id))
         eventBus.publish(SideBarEventTopics.open)
       }
     }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
index 0bbdb9f31bd..d81cf96692b 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsShowShares.ts
@@ -6,20 +6,19 @@ import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { useIsFilesAppActive } from '../helpers'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
-import { Store } from 'vuex'
 import { FileAction, FileActionOptions } from '../types'
 import { useCanShare } from '../../shares'
+import { useResourcesStore } from '../../piniaStores'
 
-export const useFileActionsShowShares = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsShowShares = () => {
   const router = useRouter()
   const { $gettext } = useGettext()
   const isFilesAppActive = useIsFilesAppActive()
   const { canShare } = useCanShare()
+  const resourcesStore = useResourcesStore()
 
   const handler = ({ resources }: FileActionOptions) => {
-    store.commit('Files/SET_FILE_SELECTION', resources)
+    resourcesStore.setSelection(resources.map(({ id }) => id))
     eventBus.publish(SideBarEventTopics.openWithPanel, 'sharing#peopleShares')
   }
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
index a86da60260c..844ff06f0cb 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
@@ -1,19 +1,22 @@
 import { triggerShareAction } from '../../../helpers/share/triggerShareAction'
 
-import { Store } from 'vuex'
 import PQueue from 'p-queue'
 import { isLocationSharesActive } from '../../../router'
 import { useClientService } from '../../clientService'
 import { useLoadingService } from '../../loadingService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
-import { useMessages, useSpacesStore, useCapabilityStore, useConfigStore } from '../../piniaStores'
+import {
+  useMessages,
+  useSpacesStore,
+  useCapabilityStore,
+  useConfigStore,
+  useResourcesStore
+} from '../../piniaStores'
 
-export const useFileActionsToggleHideShare = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsToggleHideShare = () => {
   const { showMessage, showErrorMessage } = useMessages()
   const capabilityStore = useCapabilityStore()
   const router = useRouter()
@@ -23,6 +26,7 @@ export const useFileActionsToggleHideShare = ({ store }: { store?: Store<any> }
   const loadingService = useLoadingService()
   const configStore = useConfigStore()
   const spacesStore = useSpacesStore()
+  const { upsertResource, resetSelection } = useResourcesStore()
 
   const handler = async ({ resources }: FileActionOptions) => {
     const errors = []
@@ -47,7 +51,7 @@ export const useFileActionsToggleHideShare = ({ store }: { store?: Store<any> }
               fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
             })
             if (share) {
-              store.commit('Files/UPDATE_RESOURCE', share)
+              upsertResource(share)
             }
           } catch (error) {
             console.error(error)
@@ -60,7 +64,7 @@ export const useFileActionsToggleHideShare = ({ store }: { store?: Store<any> }
     await Promise.all(triggerPromises)
 
     if (errors.length === 0) {
-      store.dispatch('Files/resetFileSelection')
+      resetSelection()
       showMessage({
         title: hidden
           ? $gettext('The share was hidden successfully')
diff --git a/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts b/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
index a17d3145e43..b1c7b7ac06f 100644
--- a/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
+++ b/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
@@ -1,4 +1,3 @@
-import { Store } from 'vuex'
 import { cloneStateObject } from '../../../helpers/store'
 import { isSameResource } from '../../../helpers/resource'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
@@ -13,7 +12,6 @@ import { useRouteQuery } from '../../router'
 import { useLoadingService } from '../../loadingService'
 import { useClientService } from '../../clientService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { useGettext } from 'vue3-gettext'
 import { ref } from 'vue'
 import {
@@ -22,11 +20,13 @@ import {
   useSpacesStore,
   useCapabilityStore,
   useConfigStore,
-  useSharesStore
+  useSharesStore,
+  useResourcesStore
 } from '../../piniaStores'
+import { storeToRefs } from 'pinia'
+import { LoadingTaskCallbackArguments } from '../../../services'
 
-export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> }) => {
-  store = store || useStore()
+export const useFileActionsDeleteResources = () => {
   const configStore = useConfigStore()
   const messageStore = useMessages()
   const { showMessage, showErrorMessage } = messageStore
@@ -41,6 +41,9 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
   const spacesStore = useSpacesStore()
   const sharesStore = useSharesStore()
 
+  const resourcesStore = useResourcesStore()
+  const { currentFolder } = storeToRefs(resourcesStore)
+
   const queue = new PQueue({
     concurrency: configStore.options.concurrentRequests.resourceBatchActions
   })
@@ -122,7 +125,9 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
         id: resource.id
       })
       .then(() => {
-        store.dispatch('Files/removeFilesFromTrashbin', [resource])
+        resourcesStore.removeResources([resource])
+        resourcesStore.resetSelection()
+
         const translated = $gettext(
           '"%{file}" was deleted successfully',
           { file: resource.name },
@@ -162,6 +167,63 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
     await Promise.all(deleteOps)
   }
 
+  const deleteFiles = ({
+    space,
+    files,
+    loadingCallbackArgs,
+    firstRun
+  }: {
+    space: SpaceResource
+    files: Resource[]
+    loadingCallbackArgs: LoadingTaskCallbackArguments
+    firstRun?: boolean
+  }) => {
+    const { setProgress } = loadingCallbackArgs
+    const promises = []
+    const removedFiles = []
+    for (const [i, file] of files.entries()) {
+      const promise = clientService.webdav
+        .deleteFile(space, file)
+        .then(() => {
+          removedFiles.push(file)
+        })
+        .catch((error) => {
+          let title = $gettext('Failed to delete "%{file}"', { file: file.name })
+          if (error.statusCode === 423) {
+            if (firstRun) {
+              return deleteFiles({ space, files: [file], loadingCallbackArgs, firstRun: false })
+            }
+
+            title = $gettext('Failed to delete "%{file}" - the file is locked', { file: file.name })
+          }
+          messageStore.showErrorMessage({ title, errors: [error] })
+        })
+        .finally(() => {
+          setProgress({ total: files.length, current: i + 1 })
+        })
+      promises.push(promise)
+    }
+    return Promise.all(promises).then(() => {
+      resourcesStore.removeResources(removedFiles)
+      resourcesStore.resetSelection()
+      sharesStore.pruneShares()
+
+      if (removedFiles.length) {
+        const title =
+          removedFiles.length === 1 && files.length === 1
+            ? $gettext('"%{item}" was moved to trash bin', { item: removedFiles[0].name })
+            : $ngettext(
+                '%{itemCount} item was moved to trash bin',
+                '%{itemCount} items were moved to trash bin',
+                removedFiles.length,
+                { itemCount: removedFiles.length.toString() },
+                true
+              )
+        messageStore.showMessage({ title })
+      }
+    })
+  }
+
   const filesList_delete = (resources: Resource[]) => {
     resourcesToDelete.value = [...resources]
 
@@ -186,55 +248,49 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
       ({ space: spaceForDeletion, resources: resourcesForDeletion }) => {
         return loadingService.addTask(
           (loadingCallbackArgs) => {
-            return store
-              .dispatch('Files/deleteFiles', {
-                ...language,
-                space: spaceForDeletion,
-                files: resourcesForDeletion,
-                clientService,
-                loadingCallbackArgs,
-                messageStore,
-                sharesStore
-              })
-              .then(async () => {
-                // Load quota
-                if (
-                  isLocationSpacesActive(router, 'files-spaces-generic') &&
-                  !['public', 'share'].includes(spaceForDeletion?.driveType)
-                ) {
-                  if (capabilityStore.spacesEnabled) {
-                    const graphClient = clientService.graphAuthenticated
-                    const driveResponse = await graphClient.drives.getDrive(
-                      unref(resources)[0].storageId
-                    )
-                    spacesStore.updateSpaceField({
-                      id: driveResponse.data.id,
-                      field: 'spaceQuota',
-                      value: driveResponse.data.quota
-                    })
-                  }
-                }
-
-                if (
-                  unref(resourcesToDelete).length &&
-                  isSameResource(unref(resourcesToDelete)[0], store.getters['Files/currentFolder'])
-                ) {
-                  // current folder is being deleted
-                  return router.push(
-                    createFileRouteOptions(spaceForDeletion, {
-                      path: dirname(unref(resourcesToDelete)[0].path),
-                      fileId: unref(resourcesToDelete)[0].parentFolderId
-                    })
+            return deleteFiles({
+              space: spaceForDeletion,
+              files: resourcesForDeletion,
+              loadingCallbackArgs
+            }).then(async () => {
+              // Load quota
+              if (
+                isLocationSpacesActive(router, 'files-spaces-generic') &&
+                !['public', 'share'].includes(spaceForDeletion?.driveType)
+              ) {
+                if (capabilityStore.spacesEnabled) {
+                  const graphClient = clientService.graphAuthenticated
+                  const driveResponse = await graphClient.drives.getDrive(
+                    unref(resources)[0].storageId
                   )
+                  spacesStore.updateSpaceField({
+                    id: driveResponse.data.id,
+                    field: 'spaceQuota',
+                    value: driveResponse.data.quota
+                  })
                 }
+              }
 
-                const activeFilesCount = store.getters['Files/activeFiles'].length
-                const pageCount = Math.ceil(unref(activeFilesCount) / unref(itemsPerPage))
-                if (unref(currentPage) > 1 && unref(currentPage) > pageCount) {
-                  // reset pagination to avoid empty lists (happens when deleting all items on the last page)
-                  currentPageQuery.value = pageCount.toString()
-                }
-              })
+              if (
+                unref(resourcesToDelete).length &&
+                isSameResource(unref(resourcesToDelete)[0], unref(currentFolder))
+              ) {
+                // current folder is being deleted
+                return router.push(
+                  createFileRouteOptions(spaceForDeletion, {
+                    path: dirname(unref(resourcesToDelete)[0].path),
+                    fileId: unref(resourcesToDelete)[0].parentFolderId
+                  })
+                )
+              }
+
+              const activeFilesCount = resourcesStore.activeResources.length
+              const pageCount = Math.ceil(unref(activeFilesCount) / unref(itemsPerPage))
+              if (unref(currentPage) > 1 && unref(currentPage) > pageCount) {
+                // reset pagination to avoid empty lists (happens when deleting all items on the last page)
+                currentPageQuery.value = pageCount.toString()
+              }
+            })
           },
           { indeterminate: false }
         )
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
index 7317c6b7866..9868a8404a9 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
@@ -5,14 +5,17 @@ import { useClientService } from '../../clientService'
 import { useRoute } from '../../router'
 import { eventBus } from '../../../services'
 import { useAbility } from '../../ability'
-import { useStore } from '../../store'
 import { SpaceAction, SpaceActionOptions } from '../types'
-import { Store } from 'vuex'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { useMessages, useModals, useSpacesStore, useUserStore } from '../../piniaStores'
+import {
+  useMessages,
+  useModals,
+  useResourcesStore,
+  useSpacesStore,
+  useUserStore
+} from '../../piniaStores'
 
-export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useSpaceActionsDelete = () => {
   const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const { $gettext, $ngettext } = useGettext()
@@ -21,6 +24,7 @@ export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
   const route = useRoute()
   const { dispatchModal } = useModals()
   const spacesStore = useSpacesStore()
+  const { removeResources } = useResourcesStore()
 
   const filterResourcesToDelete = (resources: SpaceResource[]) => {
     return resources.filter(
@@ -32,7 +36,7 @@ export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
     const client = clientService.graphAuthenticated
     const promises = spaces.map((space) =>
       client.drives.deleteDrive(space.id.toString()).then(() => {
-        store.commit('Files/REMOVE_FILES', [{ id: space.id }])
+        removeResources([space])
         spacesStore.removeSpace(space)
         return true
       })
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDuplicate.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDuplicate.ts
index 4355fa825eb..955fccfc688 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDuplicate.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDuplicate.ts
@@ -2,25 +2,18 @@ import { SpaceResource } from '@ownclouders/web-client'
 import { computed } from 'vue'
 import { SpaceAction, SpaceActionOptions } from '../types'
 import { useGettext } from 'vue3-gettext'
-import { useStore } from '../../store'
 import { useAbility } from '../../ability'
 import { useClientService } from '../../clientService'
 import { useLoadingService } from '../../loadingService'
-import { Store } from 'vuex'
 import { buildSpace, isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { Drive } from '@ownclouders/web-client/src/generated'
 import { resolveFileNameDuplicate } from '../../../helpers/resource/conflictHandling'
 import PQueue from 'p-queue'
 import { useRouter } from '../../router'
 import { isLocationSpacesActive } from '../../../router'
-import { useConfigStore, useMessages, useSpacesStore } from '../../piniaStores'
-
-export const useSpaceActionsDuplicate = ({
-  store
-}: {
-  store?: Store<any>
-} = {}) => {
-  store = store || useStore()
+import { useConfigStore, useMessages, useResourcesStore, useSpacesStore } from '../../piniaStores'
+
+export const useSpaceActionsDuplicate = () => {
   const configStore = useConfigStore()
   const spacesStore = useSpacesStore()
   const { showMessage, showErrorMessage } = useMessages()
@@ -29,6 +22,7 @@ export const useSpaceActionsDuplicate = ({
   const ability = useAbility()
   const clientService = useClientService()
   const loadingService = useLoadingService()
+  const { upsertResource } = useResourcesStore()
 
   const isProjectsLocation = isLocationSpacesActive(router, 'files-spaces-projects')
 
@@ -107,7 +101,7 @@ export const useSpaceActionsDuplicate = ({
 
       spacesStore.upsertSpace(duplicatedSpace)
       if (isProjectsLocation) {
-        store.commit('Files/UPSERT_RESOURCE', duplicatedSpace)
+        upsertResource(duplicatedSpace)
       }
 
       showMessage({
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsShowMembers.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsShowMembers.ts
index ad77203e570..ff7a34dd738 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsShowMembers.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsShowMembers.ts
@@ -1,17 +1,16 @@
-import { useStore } from 'vuex'
 import { eventBus } from '../../../services/eventBus'
 import { SideBarEventTopics } from '../../sideBar'
-import { Store } from 'vuex'
 import { computed } from 'vue'
 import { SpaceAction, SpaceActionOptions } from '../types'
 import { useGettext } from 'vue3-gettext'
+import { useResourcesStore } from '../../piniaStores'
 
-export const useSpaceActionsShowMembers = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useSpaceActionsShowMembers = () => {
   const { $gettext } = useGettext()
+  const resourcesStore = useResourcesStore()
 
   const handler = ({ resources }: SpaceActionOptions) => {
-    store.commit('Files/SET_FILE_SELECTION', resources)
+    resourcesStore.setSelection(resources.map(({ id }) => id))
     eventBus.publish(SideBarEventTopics.openWithPanel, 'space-share')
   }
 
diff --git a/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts b/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
index a70af15714b..23c5ca8ae95 100644
--- a/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
+++ b/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
@@ -1,6 +1,5 @@
 import { computed, unref, Ref } from 'vue'
 import { useRouter, useRoute, useRouteParam } from '../router'
-import { useStore } from '../store'
 import { ClientService } from '../../services'
 import { basename } from 'path'
 
@@ -45,7 +44,6 @@ export type AppDefaultsResult = AppConfigResult &
 
 export function useAppDefaults(options: AppDefaultsOptions): AppDefaultsResult {
   const router = useRouter()
-  const store = useStore()
   const appsStore = useAppsStore()
   const currentRoute = useRoute()
   const clientService = options.clientService ?? useClientService()
@@ -60,7 +58,7 @@ export function useAppDefaults(options: AppDefaultsOptions): AppDefaultsResult {
     if (unref(loading)) {
       return null
     }
-    let path
+    let path: string
     if (unref(space)) {
       path = urlJoin(unref(space).webDavPath, unref(item))
     } else {
@@ -99,7 +97,6 @@ export function useAppDefaults(options: AppDefaultsOptions): AppDefaultsResult {
     ...useAppFolderHandling({
       // FIXME: what's wrong here? mismatch in packages somehow...
       clientService: clientService as any,
-      store,
       currentRoute
     }),
     ...useRequest({ clientService, currentRoute: unref(currentRoute) })
diff --git a/packages/web-pkg/src/composables/appDefaults/useAppFolderHandling.ts b/packages/web-pkg/src/composables/appDefaults/useAppFolderHandling.ts
index dbeeca6cae3..43f3791c1f4 100644
--- a/packages/web-pkg/src/composables/appDefaults/useAppFolderHandling.ts
+++ b/packages/web-pkg/src/composables/appDefaults/useAppFolderHandling.ts
@@ -1,5 +1,4 @@
-import { Store } from 'vuex'
-import { computed, Ref, ref, unref, MaybeRef } from 'vue'
+import { Ref, ref, unref, MaybeRef } from 'vue'
 import { dirname } from 'path'
 import { ClientService } from '../../services'
 import { useAppFileHandling } from './useAppFileHandling'
@@ -10,10 +9,10 @@ import { useFileRouteReplace } from '../router/useFileRouteReplace'
 import { DavProperty } from '@ownclouders/web-client/src/webdav/constants'
 import { useAuthService } from '../authContext/useAuthService'
 import { isMountPointSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { useSpacesStore } from '../piniaStores'
+import { useResourcesStore, useSpacesStore } from '../piniaStores'
+import { storeToRefs } from 'pinia'
 
 interface AppFolderHandlingOptions {
-  store: Store<any>
   currentRoute: Ref<RouteLocationNormalizedLoaded>
   clientService?: ClientService
 }
@@ -26,27 +25,22 @@ export interface AppFolderHandlingResult {
 }
 
 export function useAppFolderHandling({
-  store,
   currentRoute,
   clientService
 }: AppFolderHandlingOptions): AppFolderHandlingResult {
   const isFolderLoading = ref(false)
-  const activeFiles = computed(() => {
-    return store.getters['Files/activeFiles']
-  })
   const { webdav } = clientService
   const { replaceInvalidFileRoute } = useFileRouteReplace()
   const { getFileInfo } = useAppFileHandling({ clientService })
   const authService = useAuthService()
   const spacesStore = useSpacesStore()
 
-  const loadFolderForFileContext = async (context: MaybeRef<FileContext>) => {
-    if (store.getters.activeFile && store.getters.activeFile.path !== '') {
-      return
-    }
+  const resourcesStore = useResourcesStore()
+  const { activeResources } = storeToRefs(resourcesStore)
 
+  const loadFolderForFileContext = async (context: MaybeRef<FileContext>) => {
     isFolderLoading.value = true
-    store.commit('Files/CLEAR_CURRENT_FILES_LIST', null)
+    resourcesStore.clearResourceList()
     try {
       context = unref(context)
       const space = unref(context.space)
@@ -67,10 +61,7 @@ export function useAppFolderHandling({
 
       if (isSpaceRoot) {
         const resource = await getFileInfo(context)
-        store.commit('Files/LOAD_FILES', {
-          currentFolder: resource,
-          files: [resource]
-        })
+        resourcesStore.initResourceList({ currentFolder: resource, resources: [resource] })
         isFolderLoading.value = false
         return
       }
@@ -81,22 +72,19 @@ export function useAppFolderHandling({
       })
 
       if (resource.type === 'file') {
-        store.commit('Files/LOAD_FILES', {
+        resourcesStore.initResourceList({
           // FIXME: currentFolder should be null?!
           currentFolder: resource,
-          files: [resource]
+          resources: [resource]
         })
       } else {
-        store.commit('Files/LOAD_FILES', {
-          currentFolder: resource,
-          files: children
-        })
+        resourcesStore.initResourceList({ currentFolder: resource, resources: children })
       }
     } catch (error) {
       if (error.statusCode === 401) {
         return authService.handleAuthError(unref(currentRoute))
       }
-      store.commit('Files/SET_CURRENT_FOLDER', null)
+      resourcesStore.setCurrentFolder(null)
       console.error(error)
     }
     isFolderLoading.value = false
@@ -105,6 +93,6 @@ export function useAppFolderHandling({
   return {
     isFolderLoading,
     loadFolderForFileContext,
-    activeFiles
+    activeFiles: activeResources
   }
 }
diff --git a/packages/web-pkg/src/composables/links/useCreateLink.ts b/packages/web-pkg/src/composables/links/useCreateLink.ts
index 141dbd7d17e..69ee8f0dcf5 100644
--- a/packages/web-pkg/src/composables/links/useCreateLink.ts
+++ b/packages/web-pkg/src/composables/links/useCreateLink.ts
@@ -1,5 +1,4 @@
 import { unref } from 'vue'
-import { useStore } from '../store'
 import { useGettext } from 'vue3-gettext'
 import { useDefaultLinkPermissions } from './useDefaultLinkPermissions'
 import {
@@ -13,7 +12,6 @@ import { useClientService } from '../clientService'
 import { useSharesStore } from '../piniaStores'
 
 export const useCreateLink = () => {
-  const store = useStore()
   const { $gettext } = useGettext()
   const clientService = useClientService()
   const { defaultLinkPermissions } = useDefaultLinkPermissions()
@@ -73,8 +71,7 @@ export const useCreateLink = () => {
       path,
       clientService,
       params,
-      storageId: resource.fileId || resource.id,
-      vuexStore: store
+      storageId: resource.fileId || resource.id
     })
   }
 
diff --git a/packages/web-pkg/src/composables/piniaStores/index.ts b/packages/web-pkg/src/composables/piniaStores/index.ts
index 5767e1e753e..371b95322bc 100644
--- a/packages/web-pkg/src/composables/piniaStores/index.ts
+++ b/packages/web-pkg/src/composables/piniaStores/index.ts
@@ -6,6 +6,7 @@ export * from './config'
 export * from './extensionRegistry'
 export * from './messages'
 export * from './modals'
+export * from './resources'
 export * from './shares'
 export * from './spaces'
 export * from './theme'
diff --git a/packages/web-pkg/src/composables/piniaStores/resources.ts b/packages/web-pkg/src/composables/piniaStores/resources.ts
new file mode 100644
index 00000000000..6417a5bd39b
--- /dev/null
+++ b/packages/web-pkg/src/composables/piniaStores/resources.ts
@@ -0,0 +1,330 @@
+import { defineStore } from 'pinia'
+import { Ref, computed, ref, unref } from 'vue'
+import {
+  extractStorageId,
+  isMountPointSpaceResource,
+  isProjectSpaceResource,
+  SpaceResource,
+  type Resource
+} from '@ownclouders/web-client/src/helpers'
+import { getIndicators, getParentPaths } from '../../helpers'
+import { AncestorMetaData, AncestorMetaDataValue } from '../../types'
+import { DavProperty, WebDAV } from '@ownclouders/web-client/src/webdav'
+import { useSpacesStore } from './spaces'
+import { useUserStore } from './user'
+import { useConfigStore } from './config'
+
+export const useResourcesStore = defineStore('resources', () => {
+  const configStore = useConfigStore()
+  const spacesStore = useSpacesStore()
+  const userStore = useUserStore()
+
+  const resources = ref<Resource[]>([]) as Ref<Resource[]>
+  const currentFolder = ref<Resource>()
+  const ancestorMetaData = ref<AncestorMetaData>({})
+
+  const activeResources = computed(() => {
+    let res = unref(resources)
+
+    if (!unref(areHiddenFilesShown)) {
+      res = res.filter((file) => !file.name.startsWith('.'))
+    }
+
+    return res
+  })
+
+  const totalResourcesSize = computed(() => {
+    return unref(resources)
+      .map((r) => (r.size ? parseInt(r.size.toString()) : 0))
+      .reduce((x, y) => x + y, 0)
+  })
+
+  const totalResourcesCount = computed(() => {
+    const fileCount = unref(resources).filter(({ type }) => type === 'file').length
+    const folderCount = unref(resources).filter(({ type }) => type === 'folder').length
+    const spaceCount = unref(resources).filter(isProjectSpaceResource).length
+
+    return {
+      files: fileCount,
+      folders: folderCount,
+      spaces: spaceCount
+    }
+  })
+
+  const setResources = (file: Resource[]) => {
+    resources.value = file
+  }
+
+  const removeResources = (values: Resource[]) => {
+    resources.value = unref(resources).filter((file) => !values.find(({ id }) => id === file.id))
+  }
+
+  const clearResources = () => {
+    resources.value = []
+  }
+
+  const upsertResource = (resource: Resource) => {
+    const existing = unref(resources).find(({ id }) => id === resource.id)
+    if (existing) {
+      Object.assign(existing, resource)
+      return
+    }
+    unref(resources).push(resource)
+  }
+
+  const upsertResources = (values: Resource[]) => {
+    const other = unref(resources).filter((f) => !values.some((r) => r.path === f.path))
+    resources.value = [...other, ...values]
+  }
+
+  const updateResourceField = <T extends Resource, K extends keyof Resource>({
+    id,
+    field,
+    value
+  }: {
+    id: T['id']
+    field: K
+    value: T[K]
+  }) => {
+    const resource = unref(resources).find((resource) => id === resource.id)
+    if (resource) {
+      resource[field] = value
+    }
+  }
+
+  const setCurrentFolder = (value: Resource) => {
+    currentFolder.value = value
+  }
+
+  const clearCurrentFolder = () => {
+    currentFolder.value = undefined
+  }
+
+  const initResourceList = (data: { resources: Resource[]; currentFolder: Resource }) => {
+    resources.value = data.resources
+    currentFolder.value = data.currentFolder
+  }
+
+  const clearResourceList = () => {
+    resources.value = []
+    currentFolder.value = undefined
+    selectedIds.value = []
+  }
+
+  const selectedIds = ref<string[]>([])
+  const latestSelectedId = ref<string>(null)
+
+  const selectedResources = computed(() => {
+    return unref(resources).filter((f) => unref(selectedIds).includes(f.id))
+  })
+
+  const setSelection = (ids: string[]) => {
+    const latestSelected = ids.find((id) => !unref(selectedIds).includes(id))
+
+    if (latestSelected) {
+      latestSelectedId.value = latestSelected
+    }
+    selectedIds.value = ids
+  }
+
+  const addSelection = (id: string) => {
+    latestSelectedId.value = id
+    if (!unref(selectedIds).includes(id)) {
+      unref(selectedIds).push(id)
+    }
+  }
+
+  const removeSelection = (id: string) => {
+    latestSelectedId.value = id
+    if (unref(selectedIds).includes(id)) {
+      delete unref(selectedIds)[id]
+    }
+  }
+
+  const toggleSelection = (id: string) => {
+    if (unref(selectedIds).includes(id)) {
+      removeSelection(id)
+    } else {
+      addSelection(id)
+    }
+  }
+
+  const resetSelection = () => {
+    selectedIds.value = []
+  }
+
+  const setLastSelectedId = (id: string) => {
+    latestSelectedId.value = id
+  }
+
+  const areHiddenFilesShown = ref(true)
+  const areFileExtensionsShown = ref(true)
+  const areWebDavDetailsShown = ref(false)
+
+  const setAreHiddenFilesShown = (value: boolean) => {
+    areHiddenFilesShown.value = value
+    window.localStorage.setItem('oc_hiddenFilesShown', value.toString())
+  }
+  const setAreFileExtensionsShown = (value: boolean) => {
+    areFileExtensionsShown.value = value
+    window.localStorage.setItem('oc_fileExtensionsShown', value.toString())
+  }
+  const setAreWebDavDetailsShown = (value: boolean) => {
+    areWebDavDetailsShown.value = value
+    window.localStorage.setItem('oc_webDavDetailsShown', value.toString())
+  }
+
+  const loadIndicators = (path: string) => {
+    const files = unref(resources).filter((f) => f.path.startsWith(path))
+    for (const resource of files) {
+      const indicators = getIndicators({
+        resource,
+        ancestorMetaData: unref(ancestorMetaData)
+      })
+      if (!indicators.length && !resource.indicators.length) {
+        continue
+      }
+
+      updateResourceField({ id: resource.id, field: 'indicators', value: indicators })
+    }
+  }
+
+  const setAncestorMetaData = (value: AncestorMetaData) => {
+    ancestorMetaData.value = value
+  }
+
+  const updateAncestorField = <
+    T extends AncestorMetaDataValue,
+    K extends keyof AncestorMetaDataValue
+  >({
+    path,
+    field,
+    value
+  }: {
+    path: T['path']
+    field: K
+    value: T[K]
+  }) => {
+    const resource = unref(ancestorMetaData)[path] ?? null
+    if (resource) {
+      resource[field] = value
+    }
+  }
+
+  const loadAncestorMetaData = ({
+    folder,
+    space,
+    client
+  }: {
+    folder: Resource
+    space: SpaceResource
+    client: WebDAV
+  }) => {
+    const data: AncestorMetaData = {
+      [folder.path]: {
+        id: folder.fileId,
+        shareTypes: folder.shareTypes,
+        parentFolderId: folder.parentFolderId,
+        spaceId: space.id,
+        path: folder.path
+      }
+    }
+    const promises = []
+    const davProperties = [DavProperty.FileId, DavProperty.ShareTypes, DavProperty.FileParent]
+    const parentPaths = getParentPaths(folder.path)
+    const spaces = spacesStore.spaces
+
+    const getMountPoints = () =>
+      spaces.filter(
+        (s) =>
+          isMountPointSpaceResource(s) && extractStorageId(s.root.remoteItem.rootId) === space.id
+      )
+
+    let fullyAccessibleSpace = true
+    if (configStore.options.routing.fullShareOwnerPaths) {
+      // keep logic in sync with "isResourceAccessible" from useGetMatchingSpace
+      const projectSpace = spaces.find((s) => isProjectSpaceResource(s) && s.id === space.id)
+      fullyAccessibleSpace = space.isOwner(userStore.user) || projectSpace?.isMember(userStore.user)
+    }
+
+    for (const path of parentPaths) {
+      const cachedData = unref(ancestorMetaData)[path] ?? null
+      if (cachedData?.spaceId === space.id) {
+        data[path] = cachedData
+        continue
+      }
+
+      // keep logic in sync with "isResourceAccessible" from useGetMatchingSpace
+      if (
+        !fullyAccessibleSpace &&
+        !getMountPoints().find((m) => path.startsWith(m.root.remoteItem.path))
+      ) {
+        // no access to the parent resource
+        break
+      }
+
+      promises.push(
+        client.listFiles(space, { path }, { depth: 0, davProperties }).then(({ resource }) => {
+          data[path] = {
+            id: resource.fileId,
+            shareTypes: resource.shareTypes,
+            parentFolderId: resource.parentFolderId,
+            spaceId: space.id,
+            path
+          }
+        })
+      )
+    }
+
+    return Promise.all(promises).then(() => {
+      setAncestorMetaData(data)
+    })
+  }
+
+  return {
+    resources,
+    currentFolder,
+    activeResources,
+    totalResourcesCount,
+    totalResourcesSize,
+
+    setResources,
+    removeResources,
+    clearResources,
+    upsertResource,
+    upsertResources,
+    updateResourceField,
+
+    setCurrentFolder,
+    clearCurrentFolder,
+
+    initResourceList,
+    clearResourceList,
+
+    selectedIds,
+    latestSelectedId,
+    selectedResources,
+    setSelection,
+    addSelection,
+    removeSelection,
+    toggleSelection,
+    resetSelection,
+    setLastSelectedId,
+
+    areHiddenFilesShown,
+    areFileExtensionsShown,
+    areWebDavDetailsShown,
+    setAreHiddenFilesShown,
+    setAreFileExtensionsShown,
+    setAreWebDavDetailsShown,
+
+    loadIndicators,
+
+    ancestorMetaData,
+    setAncestorMetaData,
+    updateAncestorField,
+    loadAncestorMetaData
+  }
+})
+
+export type ResourcesStore = ReturnType<typeof useResourcesStore>
diff --git a/packages/web-pkg/src/composables/piniaStores/shares/shares.ts b/packages/web-pkg/src/composables/piniaStores/shares/shares.ts
index ce13028ad0b..5b62a22d0d7 100644
--- a/packages/web-pkg/src/composables/piniaStores/shares/shares.ts
+++ b/packages/web-pkg/src/composables/piniaStores/shares/shares.ts
@@ -2,7 +2,8 @@ import {
   Share,
   ShareTypes,
   buildCollaboratorShare,
-  buildShare
+  buildShare,
+  isProjectSpaceResource
 } from '@ownclouders/web-client/src/helpers'
 import { defineStore } from 'pinia'
 import { Ref, computed, ref, unref } from 'vue'
@@ -19,10 +20,12 @@ import {
   UpdateLinkOptions,
   UpdateShareOptions
 } from './types'
+import { useResourcesStore } from '../resources'
 
 export const useSharesStore = defineStore('shares', () => {
   const configStore = useConfigStore()
   const capabilityStore = useCapabilityStore()
+  const resourcesStore = useResourcesStore()
 
   const loading = ref<Promise<unknown>>()
   const shares = ref<Share[]>([]) as Ref<Share[]>
@@ -91,6 +94,39 @@ export const useSharesStore = defineStore('shares', () => {
 
     return resolvePromise
   }
+
+  const updateFileShareTypes = (path: string) => {
+    const computeShareTypes = (shares: Share[]): any => {
+      const shareTypes = new Set()
+      shares.forEach((share) => {
+        shareTypes.add(share.shareType)
+      })
+      return Array.from(shareTypes)
+    }
+
+    const file = [...resourcesStore.resources, resourcesStore.currentFolder].find(
+      (f) => f?.path === path
+    )
+    if (!file || isProjectSpaceResource(file)) {
+      return
+    }
+
+    resourcesStore.updateResourceField({
+      id: file.id,
+      field: 'shareTypes',
+      value: computeShareTypes(unref(outgoingShares).filter((s) => !s.indirect))
+    })
+
+    const ancestorEntry = resourcesStore.ancestorMetaData[file.path] ?? null
+    if (ancestorEntry) {
+      resourcesStore.updateAncestorField({
+        path: ancestorEntry.path,
+        field: 'shareTypes',
+        value: computeShareTypes(unref(outgoingShares).filter((s) => !s.indirect))
+      })
+    }
+  }
+
   const loadShares = async ({
     clientService,
     resource,
@@ -175,7 +211,6 @@ export const useSharesStore = defineStore('shares', () => {
   const addShare = async ({
     clientService,
     resource,
-    vuexStore,
     path,
     shareWith,
     shareType,
@@ -209,11 +244,8 @@ export const useSharesStore = defineStore('shares', () => {
 
     await awaitLoading()
     upsertShare({ ...builtShare, outgoing: true })
-    vuexStore.dispatch('Files/updateFileShareTypes', {
-      path,
-      outgoingShares: unref(outgoingShares)
-    })
-    vuexStore.commit('Files/LOAD_INDICATORS', path)
+    updateFileShareTypes(path)
+    resourcesStore.loadIndicators(path)
   }
 
   const updateShare = async ({
@@ -242,22 +274,18 @@ export const useSharesStore = defineStore('shares', () => {
     clientService,
     share,
     path,
-    vuexStore,
     loadIndicators = false
   }: DeleteShareOptions) => {
     await clientService.owncloudSdk.shares.deleteShare(share.id, {} as any)
     await awaitLoading()
     removeShare(share)
-    vuexStore.dispatch('Files/updateFileShareTypes', {
-      path,
-      outgoingShares: unref(outgoingShares)
-    })
+    updateFileShareTypes(path)
     if (loadIndicators) {
-      vuexStore.commit('Files/LOAD_INDICATORS', path)
+      resourcesStore.loadIndicators(path)
     }
   }
 
-  const addLink = async ({ path, clientService, params, storageId, vuexStore }: AddLinkOptions) => {
+  const addLink = async ({ path, clientService, params, storageId }: AddLinkOptions) => {
     const { shareInfo } = await clientService.owncloudSdk.shares.shareFileWithLink(path, {
       ...params,
       spaceRef: storageId
@@ -266,38 +294,30 @@ export const useSharesStore = defineStore('shares', () => {
     const link = buildShare(shareInfo, null, unref(allowResharing))
     await awaitLoading()
 
-    const selectedFiles = vuexStore.getters['Files/selectedFiles']
-    const currentFolder = vuexStore.getters['Files/currentFolder']
+    const selectedFiles = resourcesStore.selectedResources
     const fileIsSelected =
       selectedFiles.some(({ fileId }) => fileId === storageId) ||
-      (selectedFiles.length === 0 && currentFolder.fileId === storageId)
+      (selectedFiles.length === 0 && resourcesStore.currentFolder.fileId === storageId)
 
     upsertShare({ ...link, outgoing: true, indirect: !fileIsSelected })
-    vuexStore.dispatch('Files/updateFileShareTypes', {
-      path,
-      outgoingShares: unref(outgoingShares)
-    })
+    updateFileShareTypes(path)
 
     if (!fileIsSelected) {
       // we might need to update the share types for the ancestor resource as well
-      const ancestor = vuexStore.getters['runtime/ancestorMetaData/ancestorMetaData'][path] ?? null
+      const ancestor = resourcesStore.ancestorMetaData[path] ?? null
       if (ancestor) {
         const { shareTypes } = ancestor
         if (!shareTypes.includes(ShareTypes.link.value)) {
-          vuexStore.commit(
-            'runtime/ancestorMetaData/UPDATE_ANCESTOR_FIELD',
-            {
-              path: ancestor.path,
-              field: 'shareTypes',
-              value: [...shareTypes, ShareTypes.link.value]
-            },
-            { root: true }
-          )
+          resourcesStore.updateAncestorField({
+            path: ancestor.path,
+            field: 'shareTypes',
+            value: [...shareTypes, ShareTypes.link.value]
+          })
         }
       }
     }
 
-    vuexStore.commit('Files/LOAD_INDICATORS', path)
+    resourcesStore.loadIndicators(path)
     return link
   }
 
@@ -313,18 +333,14 @@ export const useSharesStore = defineStore('shares', () => {
     share,
     clientService,
     path,
-    vuexStore,
     loadIndicators = false
   }: DeleteLinkOptions) => {
     await clientService.owncloudSdk.shares.deleteShare(share.id)
     await awaitLoading()
     removeShare(share)
-    vuexStore.dispatch('Files/updateFileShareTypes', {
-      path,
-      outgoingShares: unref(outgoingShares)
-    })
+    updateFileShareTypes(path)
     if (loadIndicators) {
-      vuexStore.commit('Files/LOAD_INDICATORS', path)
+      resourcesStore.loadIndicators(path)
     }
   }
 
diff --git a/packages/web-pkg/src/composables/piniaStores/shares/types.ts b/packages/web-pkg/src/composables/piniaStores/shares/types.ts
index 48447e9af81..95f84d7ad11 100644
--- a/packages/web-pkg/src/composables/piniaStores/shares/types.ts
+++ b/packages/web-pkg/src/composables/piniaStores/shares/types.ts
@@ -2,7 +2,6 @@ import { Resource } from '@ownclouders/web-client'
 import { ClientService } from '../../../services'
 import { AncestorMetaData } from '../../../types'
 import { Share, ShareRole, ShareTypes } from '@ownclouders/web-client/src/helpers'
-import { Store } from 'vuex'
 
 export interface LoadSharesOptions {
   clientService: ClientService
@@ -22,7 +21,6 @@ export interface AddShareOptions {
   permissions: number
   role: ShareRole
   storageId: string
-  vuexStore: Store<any>
   expirationDate?: string
   notify?: boolean
   shareWithUser?: string
@@ -42,7 +40,6 @@ export interface DeleteShareOptions {
   clientService: ClientService
   share: Share
   path: string
-  vuexStore: Store<any>
   loadIndicators?: boolean
 }
 
@@ -51,7 +48,6 @@ export interface AddLinkOptions {
   path: string
   params: any
   storageId: string
-  vuexStore: Store<any>
 }
 
 export interface UpdateLinkOptions {
@@ -64,6 +60,5 @@ export interface DeleteLinkOptions {
   clientService: ClientService
   share: Share
   path: string
-  vuexStore: Store<any>
   loadIndicators?: boolean
 }
diff --git a/packages/web-pkg/src/composables/scrollTo/useScrollTo.ts b/packages/web-pkg/src/composables/scrollTo/useScrollTo.ts
index 91eda227d9a..5b5df731cc0 100644
--- a/packages/web-pkg/src/composables/scrollTo/useScrollTo.ts
+++ b/packages/web-pkg/src/composables/scrollTo/useScrollTo.ts
@@ -1,10 +1,10 @@
 import { computed, unref } from 'vue'
 import { Resource } from '@ownclouders/web-client/src'
 import { queryItemAsString } from '../appDefaults/useAppNavigation'
-import { useStore } from '../store/useStore'
 import { eventBus } from '../../services'
 import { useRouteQuery } from '../router'
 import { SideBarEventTopics } from '../sideBar'
+import { useResourcesStore } from '../piniaStores'
 
 export interface ScrollToResult {
   scrollToResource(
@@ -15,9 +15,10 @@ export interface ScrollToResult {
 }
 
 export const useScrollTo = (): ScrollToResult => {
-  const store = useStore()
   const scrollToQuery = useRouteQuery('scrollTo')
   const detailsQuery = useRouteQuery('details')
+  const resourcesStore = useResourcesStore()
+
   const scrollTo = computed(() => {
     return queryItemAsString(unref(scrollToQuery))
   })
@@ -72,7 +73,7 @@ export const useScrollTo = (): ScrollToResult => {
 
     const resource = unref(resources).find((r) => r.id === unref(scrollTo))
     if (resource && resource.processing !== true) {
-      store.commit('Files/SET_FILE_SELECTION', [resource])
+      resourcesStore.setSelection([resource.id])
       scrollToResource(resource.id, { forceScroll: true, topbarElement })
 
       if (unref(details)) {
diff --git a/packages/web-pkg/src/composables/search/useSearch.ts b/packages/web-pkg/src/composables/search/useSearch.ts
index 5669caf9ea9..27d78436dd7 100644
--- a/packages/web-pkg/src/composables/search/useSearch.ts
+++ b/packages/web-pkg/src/composables/search/useSearch.ts
@@ -2,19 +2,18 @@ import { computed, unref } from 'vue'
 import { SearchResult } from '../../components'
 import { DavProperties } from '@ownclouders/web-client/src/webdav'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
-import { useStore } from '../store'
 import { useClientService } from '../clientService'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { useConfigStore, useSpacesStore } from '../piniaStores'
+import { useConfigStore, useResourcesStore, useSpacesStore } from '../piniaStores'
 import { SearchResource } from '@ownclouders/web-client/src/webdav/search'
 
 export const useSearch = () => {
-  const store = useStore()
   const configStore = useConfigStore()
   const clientService = useClientService()
   const spacesStore = useSpacesStore()
+  const resourcesStore = useResourcesStore()
 
-  const areHiddenFilesShown = computed(() => store.state.Files?.areHiddenFilesShown)
+  const areHiddenFilesShown = computed(() => resourcesStore.areHiddenFilesShown)
   const projectSpaces = computed(() => spacesStore.spaces.filter(isProjectSpaceResource))
   const getProjectSpace = (id: string) => {
     return unref(projectSpaces).find((s) => s.id === id)
diff --git a/packages/web-pkg/src/composables/selection/useSelectedResources.ts b/packages/web-pkg/src/composables/selection/useSelectedResources.ts
index 9f6ae0448fd..850d1f83b2a 100644
--- a/packages/web-pkg/src/composables/selection/useSelectedResources.ts
+++ b/packages/web-pkg/src/composables/selection/useSelectedResources.ts
@@ -1,41 +1,34 @@
 import { computed, unref, WritableComputedRef, Ref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
 import { useGetMatchingSpace } from '../spaces'
-import { useStore } from '../store'
-import { Store } from 'vuex'
 import { SpaceResource } from '@ownclouders/web-client/src/helpers'
+import { useResourcesStore } from '../piniaStores'
 
 export interface SelectedResourcesResult {
   selectedResources: Ref<Resource[]>
-  selectedResourcesIds: Ref<(string | number)[]>
+  selectedResourcesIds: Ref<string[]>
   isResourceInSelection(resource: Resource): boolean
   selectedResourceSpace?: Ref<SpaceResource>
 }
 
-interface SelectedResourcesOptions {
-  store?: Store<any>
-}
-
-export const useSelectedResources = (
-  options?: SelectedResourcesOptions
-): SelectedResourcesResult => {
-  const store = options.store || useStore()
+export const useSelectedResources = (): SelectedResourcesResult => {
   const { getMatchingSpace } = useGetMatchingSpace()
+  const resourcesStore = useResourcesStore()
 
   const selectedResources: WritableComputedRef<Resource[]> = computed({
     get(): Resource[] {
-      return store.getters['Files/selectedFiles']
+      return resourcesStore.selectedResources
     },
     set(resources) {
-      store.commit('Files/SET_FILE_SELECTION', resources)
+      resourcesStore.setSelection(resources.map(({ id }) => id))
     }
   })
-  const selectedResourcesIds: WritableComputedRef<(string | number)[]> = computed({
-    get(): (string | number)[] {
-      return store.state.Files.selectedIds
+  const selectedResourcesIds: WritableComputedRef<string[]> = computed({
+    get(): string[] {
+      return resourcesStore.selectedIds
     },
     set(selectedIds) {
-      store.commit('Files/SET_SELECTED_IDS', selectedIds)
+      resourcesStore.setSelection(selectedIds)
     }
   })
 
diff --git a/packages/web-pkg/src/composables/store/index.ts b/packages/web-pkg/src/composables/store/index.ts
index 70b2b59228a..708e4f7dee3 100644
--- a/packages/web-pkg/src/composables/store/index.ts
+++ b/packages/web-pkg/src/composables/store/index.ts
@@ -1,2 +1 @@
-export * from './useMutationSubscription'
 export * from './useStore'
diff --git a/packages/web-pkg/src/composables/store/useMutationSubscription.ts b/packages/web-pkg/src/composables/store/useMutationSubscription.ts
deleted file mode 100644
index a5ab3d70734..00000000000
--- a/packages/web-pkg/src/composables/store/useMutationSubscription.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { onMounted, onBeforeUnmount } from 'vue'
-import { MutationPayload, SubscribeOptions } from 'vuex'
-import { useStore } from './useStore'
-
-export const useMutationSubscription = <P extends MutationPayload>(
-  mutations: string[],
-  callback: (mutation: P) => void,
-  options?: SubscribeOptions
-): void => {
-  let unsubscribe
-  onMounted(() => {
-    unsubscribe = useStore().subscribe<P>(
-      (mutation: P) => mutations.includes(mutation.type) && callback(mutation),
-      options
-    )
-  })
-
-  onBeforeUnmount(() => unsubscribe())
-}
diff --git a/packages/web-pkg/tests/unit/components/AppBar/AppBar.spec.ts b/packages/web-pkg/tests/unit/components/AppBar/AppBar.spec.ts
index 00005d7becd..c04012b30b4 100644
--- a/packages/web-pkg/tests/unit/components/AppBar/AppBar.spec.ts
+++ b/packages/web-pkg/tests/unit/components/AppBar/AppBar.spec.ts
@@ -3,11 +3,9 @@ import AppBar from '../../../../src/components/AppBar/AppBar.vue'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
   shallowMount,
-  defaultStoreMockOptions,
   RouteLocation
 } from 'web-test-helpers'
 import { ArchiverService } from '../../../../src/services'
@@ -159,15 +157,19 @@ function getShallowWrapper(
     $archiverService: mock<ArchiverService>()
   }
   mocks.$route.meta.title = 'ExampleTitle'
-  const storeOptions = defaultStoreMockOptions
-  storeOptions.modules.Files.getters.selectedFiles.mockImplementation(() => selected)
-  const store = createStore(storeOptions)
+
   return {
     wrapper: shallowMount(AppBar, {
       props: { ...props, space: mock<SpaceResource>() },
       slots,
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: {
+              resourcesStore: { resources: selected, selectedIds: selected.map(({ id }) => id) }
+            }
+          })
+        ],
         provide: { ...mocks, isMobileWidth: ref(isMobileWidth) },
         mocks
       }
diff --git a/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts b/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
index 559d659f3d3..14081f33346 100644
--- a/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
+++ b/packages/web-pkg/tests/unit/components/AppTopBar.spec.ts
@@ -1,10 +1,8 @@
 import { mock } from 'jest-mock-extended'
 import {
   RouteLocation,
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   shallowMount
 } from 'web-test-helpers'
 import { Resource } from '@ownclouders/web-client/src/helpers'
@@ -68,14 +66,10 @@ function getWrapper(
   mainActions: Action[] = [],
   areFileExtensionsShown = true
 ) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.modules.Files.state.areFileExtensionsShown = areFileExtensionsShown
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: 'admin-settings-general' })
   })
   return {
-    storeOptions,
     wrapper: shallowMount(AppTopBar, {
       props: {
         dropDownActions,
@@ -83,7 +77,9 @@ function getWrapper(
         resource
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [
+          ...defaultPlugins({ piniaOptions: { resourcesStore: { areFileExtensionsShown } } })
+        ],
         mocks,
         provide: mocks
       }
diff --git a/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
index 1c45caf7f62..095441f4eee 100644
--- a/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateLinkModal.spec.ts
@@ -1,11 +1,5 @@
 import CreateLinkModal from '../../../src/components/CreateLinkModal.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, mount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { PasswordPolicyService } from '../../../src/services'
 import { usePasswordPolicyService } from '../../../src/composables/passwordPolicyService'
@@ -220,8 +214,6 @@ function getWrapper({
 
   const mocks = { ...defaultComponentMocks(), postMessageMock, createLinkMock }
 
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const abilities = [] as AbilityRule[]
   if (userCanCreatePublicLinks) {
     abilities.push({ action: 'create-all', subject: 'PublicLink' })
@@ -240,7 +232,6 @@ function getWrapper({
   } satisfies Partial<CapabilityStore['capabilities']>
 
   return {
-    storeOptions,
     mocks,
     wrapper: mount(CreateLinkModal, {
       props: {
@@ -250,8 +241,7 @@ function getWrapper({
       },
       global: {
         plugins: [
-          ...defaultPlugins({ abilities, piniaOptions: { capabilityState: { capabilities } } }),
-          store
+          ...defaultPlugins({ abilities, piniaOptions: { capabilityState: { capabilities } } })
         ],
         mocks,
         provide: mocks,
diff --git a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
index 3444070b9a8..a74a2e40514 100644
--- a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
@@ -1,9 +1,7 @@
 import CreateShortcutModal from '../../../src/components/CreateShortcutModal.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   mockAxiosReject,
   RouteLocation,
   shallowMount
@@ -12,22 +10,26 @@ import { SpaceResource } from '@ownclouders/web-client'
 import { mock } from 'jest-mock-extended'
 import { FileResource } from '@ownclouders/web-client/src/helpers'
 import { SearchResource } from '@ownclouders/web-client/src/webdav/search'
-import { useMessages } from '../../../src/composables/piniaStores'
+import { useMessages, useResourcesStore } from '../../../src/composables/piniaStores'
 
 describe('CreateShortcutModal', () => {
   describe('method "onConfirm"', () => {
     it('should show message on success', async () => {
-      const { wrapper, storeOptions } = getWrapper()
+      const { wrapper } = getWrapper()
       await wrapper.vm.onConfirm('https://owncloud.com', 'owncloud.url')
-      expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
+
+      const { upsertResource } = useResourcesStore()
+      expect(upsertResource).toHaveBeenCalled()
       const { showMessage } = useMessages()
       expect(showMessage).toHaveBeenCalled()
     })
     it('should show error message on fail', async () => {
       console.error = jest.fn()
-      const { wrapper, storeOptions } = getWrapper({ rejectPutFileContents: true })
+      const { wrapper } = getWrapper({ rejectPutFileContents: true })
       await wrapper.vm.onConfirm('https://owncloud.com', 'owncloud.url')
-      expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).not.toHaveBeenCalled()
+
+      const { upsertResource } = useResourcesStore()
+      expect(upsertResource).not.toHaveBeenCalled()
       const { showErrorMessage } = useMessages()
       expect(showErrorMessage).toHaveBeenCalled()
     })
@@ -48,14 +50,6 @@ describe('CreateShortcutModal', () => {
 })
 
 function getWrapper({ rejectPutFileContents = false, rejectSearch = false } = {}) {
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-
-  storeOptions.modules.Files.getters.currentFolder.mockImplementation(() => mock<FileResource>())
-
-  const store = createStore(storeOptions)
-
   const mocks = {
     ...defaultComponentMocks({
       currentRoute: mock<RouteLocation>({ name: 'files-spaces-generic' })
@@ -83,13 +77,16 @@ function getWrapper({ rejectPutFileContents = false, rejectSearch = false } = {}
 
   return {
     mocks,
-    storeOptions,
     wrapper: shallowMount(CreateShortcutModal, {
       props: {
         space: mock<SpaceResource>()
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [
+          ...defaultPlugins({
+            piniaOptions: { resourcesStore: { currentFolder: mock<FileResource>() } }
+          })
+        ],
         mocks,
         provide: mocks
       }
diff --git a/packages/web-pkg/tests/unit/components/FilesList/ContextActions.spec.ts b/packages/web-pkg/tests/unit/components/FilesList/ContextActions.spec.ts
index f3ef2241ddf..d1de0ef2bf0 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/ContextActions.spec.ts
+++ b/packages/web-pkg/tests/unit/components/FilesList/ContextActions.spec.ts
@@ -1,11 +1,4 @@
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  defaultStubs,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, defaultStubs, mount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import ContextActions from '../../../../src/components/FilesList/ContextActions.vue'
@@ -57,14 +50,10 @@ describe.skip('ContextActions', () => {
 })
 
 function getWrapper() {
-  const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.modules.Files.getters.currentFolder.mockImplementation(() => '/')
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks()
   }
   return {
-    storeOptions,
     mocks,
     wrapper: mount(ContextActions, {
       props: {
@@ -77,7 +66,7 @@ function getWrapper() {
         mocks,
         provide: { ...mocks, currentSpace: mock<SpaceResource>() },
         stubs: { ...defaultStubs, 'action-menu-item': true },
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
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 884d41be45d..3290d9c6dba 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
+++ b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
@@ -1,7 +1,7 @@
 import { DateTime } from 'luxon'
 import ResourceTable from '../../../../src/components/FilesList/ResourceTable.vue'
 import { extractDomSelector, Resource } from '@ownclouders/web-client/src/helpers'
-import { createStore, defaultPlugins, mount, defaultStoreMockOptions } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 import { CapabilityStore, displayPositionedDropdown } from '../../../../src'
 import { eventBus } from '../../../../src/services/eventBus'
 import { SideBarEventTopics } from '../../../../src/composables/sideBar'
@@ -451,8 +451,6 @@ function getMountedWrapper({
   userContextReady = true,
   addProcessingResources = false
 } = {}) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const capabilities = {
     files: { tags: true }
   } satisfies Partial<CapabilityStore['capabilities']>
@@ -480,8 +478,7 @@ function getMountedWrapper({
               capabilityState: { capabilities },
               configState: { options: { displayResourcesLazy: false } }
             }
-          }),
-          store
+          })
         ],
         stubs: {
           OcButton: false,
diff --git a/packages/web-pkg/tests/unit/components/LinkRoleDropdown.spec.ts b/packages/web-pkg/tests/unit/components/LinkRoleDropdown.spec.ts
index ed7d0784c7c..405d61942d4 100644
--- a/packages/web-pkg/tests/unit/components/LinkRoleDropdown.spec.ts
+++ b/packages/web-pkg/tests/unit/components/LinkRoleDropdown.spec.ts
@@ -1,11 +1,5 @@
 import LinkRoleDropdown from '../../../src/components/LinkRoleDropdown.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  mount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, mount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import {
   ShareRole,
@@ -39,21 +33,17 @@ describe('LinkRoleDropdown', () => {
 })
 
 function getWrapper({ modelValue = mock<ShareRole>(), availableRoleOptions = [] } = {}) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
-
   const mocks = { ...defaultComponentMocks() }
 
   return {
     mocks,
-    storeOptions,
     wrapper: mount(LinkRoleDropdown, {
       props: {
         modelValue,
         availableRoleOptions
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks,
         provide: mocks
       }
diff --git a/packages/web-pkg/tests/unit/components/Modals/ResourceConflictModal.spec.ts b/packages/web-pkg/tests/unit/components/Modals/ResourceConflictModal.spec.ts
index 76dbb1f562c..e7417f7250a 100644
--- a/packages/web-pkg/tests/unit/components/Modals/ResourceConflictModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Modals/ResourceConflictModal.spec.ts
@@ -1,11 +1,5 @@
 import ResourceConflictModal from '../../../../src/components/Modals/ResourceConflictModal.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  shallowMount
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, shallowMount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 import { ResolveStrategy } from '../../../../src/helpers/resource'
@@ -68,8 +62,6 @@ describe('ResourceConflictModal', () => {
 
 function getWrapper({ props = {} } = {}) {
   const mocks = defaultComponentMocks()
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   return {
     mocks,
@@ -82,7 +74,7 @@ function getWrapper({ props = {} } = {}) {
         ...props
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks,
         provide: mocks
       }
diff --git a/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts b/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
index 2dfdb4a045c..ed7c946f6f4 100644
--- a/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Search/ResourcePreview.spec.ts
@@ -3,11 +3,9 @@ import { ResourcePreview } from '../../../../src/components'
 import { SpaceResource } from '@ownclouders/web-client/src'
 import { useGetMatchingSpace } from '../../../../src/composables/spaces/useGetMatchingSpace'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
   shallowMount,
-  defaultStoreMockOptions,
   useGetMatchingSpaceMock
 } from 'web-test-helpers'
 import { useFileActions } from '../../../../src/composables/actions'
@@ -84,17 +82,6 @@ function getWrapper({
   )
   jest.mocked(useFileActions).mockReturnValue(mock<ReturnType<typeof useFileActions>>())
 
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: {
-      Files: {
-        state: {
-          areFileExtensionsShown
-        }
-      }
-    }
-  }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks()
   const capabilities = {
     spaces: { share_jail: true, projects: true }
@@ -113,10 +100,10 @@ function getWrapper({
           ...defaultPlugins({
             piniaOptions: {
               capabilityState: { capabilities },
-              configState: { options: { disablePreviews: true } }
+              configState: { options: { disablePreviews: true } },
+              resourcesStore: { areFileExtensionsShown }
             }
-          }),
-          store
+          })
         ]
       }
     })
diff --git a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
index 805fe150f99..34a7d38d4e0 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
@@ -1,9 +1,7 @@
 import QuotaModal from '../../../../src/components/Spaces/QuotaModal.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   defaultStubs,
   mount,
   mockAxiosResolve
@@ -49,12 +47,9 @@ describe('QuotaModal', () => {
 })
 
 function getWrapper() {
-  const storeOptions = defaultStoreMockOptions
   const mocks = defaultComponentMocks()
-  const store = createStore(storeOptions)
   return {
     mocks,
-    storeOptions,
     wrapper: mount(QuotaModal, {
       props: {
         spaces: [
@@ -73,7 +68,7 @@ function getWrapper() {
         stubs: { ...defaultStubs },
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
index 70ff4795cb7..cc25b78d6a5 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
@@ -1,13 +1,6 @@
 import ReadmeContentModal from '../../../../src/components/Spaces/ReadmeContentModal.vue'
 
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  defaultComponentMocks,
-  defaultStubs
-} from 'web-test-helpers'
+import { defaultPlugins, mount, defaultComponentMocks, defaultStubs } from 'web-test-helpers'
 import { GetFileContentsResponse } from '@ownclouders/web-client/src/webdav/getFileContents'
 import { Resource } from '@ownclouders/web-client/src'
 import { mock } from 'jest-mock-extended'
@@ -33,9 +26,6 @@ describe('ReadmeContentModal', () => {
 })
 
 function getWrapper(resolvePutFileContents = true) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
-
   const mocks = defaultComponentMocks()
   const { $clientService: clientService } = mocks
   clientService.webdav.getFileContents.mockResolvedValue(mock<GetFileContentsResponse>())
@@ -46,7 +36,6 @@ function getWrapper(resolvePutFileContents = true) {
   }
 
   return {
-    storeOptions,
     wrapper: mount(ReadmeContentModal, {
       props: {
         cancel: jest.fn(),
@@ -59,7 +48,7 @@ function getWrapper(resolvePutFileContents = true) {
         }
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         stubs: { ...defaultStubs, portal: true, 'oc-modal': true },
         mocks,
         provide: mocks
diff --git a/packages/web-pkg/tests/unit/components/ViewOptions.spec.ts b/packages/web-pkg/tests/unit/components/ViewOptions.spec.ts
index 4faf27658e6..315a467ad8a 100644
--- a/packages/web-pkg/tests/unit/components/ViewOptions.spec.ts
+++ b/packages/web-pkg/tests/unit/components/ViewOptions.spec.ts
@@ -1,15 +1,13 @@
 import { ref, unref } from 'vue'
-import {
-  createStore,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  defaultComponentMocks,
-  mount,
-  RouteLocation
-} from 'web-test-helpers'
+import { defaultPlugins, defaultComponentMocks, mount, RouteLocation } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import ViewOptions from '../../../src/components/ViewOptions.vue'
-import { ViewModeConstants, useRouteQuery, useRouteQueryPersisted } from '../../../src/composables'
+import {
+  ViewModeConstants,
+  useResourcesStore,
+  useRouteQuery,
+  useRouteQueryPersisted
+} from '../../../src/composables'
 
 jest.mock('../../../src/composables/router', () => ({
   ...jest.requireActual('../../../src/composables/router'),
@@ -65,12 +63,14 @@ describe('ViewOptions component', () => {
       expect(wrapper.find(selectors.hiddenFilesSwitch).exists()).toBeFalsy()
     })
     it('toggles the setting to show/hide hidden files', () => {
-      const { wrapper, storeOptions } = getWrapper()
+      const { wrapper } = getWrapper()
       ;(wrapper.findComponent<any>(selectors.hiddenFilesSwitch).vm as any).$emit(
         'update:checked',
         false
       )
-      expect(storeOptions.modules.Files.mutations.SET_HIDDEN_FILES_VISIBILITY).toHaveBeenCalled()
+
+      const { setAreHiddenFilesShown } = useResourcesStore()
+      expect(setAreHiddenFilesShown).toHaveBeenCalled()
     })
   })
   describe('file extension toggle', () => {
@@ -79,12 +79,14 @@ describe('ViewOptions component', () => {
       expect(wrapper.find(selectors.fileExtensionsSwitch).exists()).toBeFalsy()
     })
     it('toggles the setting to show/hide file extensions', () => {
-      const { wrapper, storeOptions } = getWrapper()
+      const { wrapper } = getWrapper()
       ;(wrapper.findComponent<any>(selectors.fileExtensionsSwitch).vm as any).$emit(
         'update:checked',
         false
       )
-      expect(storeOptions.modules.Files.mutations.SET_FILE_EXTENSIONS_VISIBILITY).toHaveBeenCalled()
+
+      const { setAreFileExtensionsShown } = useResourcesStore()
+      expect(setAreFileExtensionsShown).toHaveBeenCalled()
     })
   })
   describe('view mode switcher', () => {
@@ -133,14 +135,11 @@ function getWrapper({
   jest.mocked(useRouteQueryPersisted).mockImplementationOnce(() => tileSizeQueryMock)
   jest.mocked(useRouteQuery).mockImplementationOnce(() => ref(currentPage))
 
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ path: '/files' }) }),
     tileSizeQueryMock
   }
   return {
-    storeOptions,
     mocks,
     wrapper: mount(ViewOptions, {
       props: { ...props },
@@ -148,7 +147,7 @@ function getWrapper({
         mocks,
         provide: mocks,
         stubs: { OcButton: true, OcPageSize: false, OcSelect: true },
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-pkg/tests/unit/components/sidebar/FileSideBar.spec.ts b/packages/web-pkg/tests/unit/components/sidebar/FileSideBar.spec.ts
index 488b9bdca83..a777ef6ae0a 100644
--- a/packages/web-pkg/tests/unit/components/sidebar/FileSideBar.spec.ts
+++ b/packages/web-pkg/tests/unit/components/sidebar/FileSideBar.spec.ts
@@ -2,10 +2,8 @@ import FileSideBar from '../../../../src/components/SideBar/FileSideBar.vue'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import { mock } from 'jest-mock-extended'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   RouteLocation,
   shallowMount
 } from 'web-test-helpers'
@@ -81,17 +79,12 @@ function createWrapper({
   item = undefined,
   isOpen = true
 }: { item?: Resource; isOpen?: boolean } = {}) {
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-
   jest.mocked(useSelectedResources).mockReturnValue(
     mock<ReturnType<typeof useSelectedResources>>({
       selectedResources: item ? ref([item]) : ref([])
     })
   )
 
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: 'files-spaces-generic' })
   })
@@ -101,7 +94,7 @@ function createWrapper({
         isOpen
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         renderStubDefaultSlot: true,
         stubs: {
           InnerSideBar: InnerSideBarComponent
diff --git a/packages/web-pkg/tests/unit/components/sidebar/Files/FileInfo.spec.ts b/packages/web-pkg/tests/unit/components/sidebar/Files/FileInfo.spec.ts
index 5112ca5830b..8f992a083ee 100644
--- a/packages/web-pkg/tests/unit/components/sidebar/Files/FileInfo.spec.ts
+++ b/packages/web-pkg/tests/unit/components/sidebar/Files/FileInfo.spec.ts
@@ -1,10 +1,8 @@
 import FileInfo from '../../../../../src/components/SideBar/Files/FileInfo.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
   shallowMount,
-  defaultStoreMockOptions,
   RouteLocation
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
@@ -28,13 +26,11 @@ function createWrapper() {
     type: 'folder',
     extension: ''
   })
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
 
   return {
     wrapper: shallowMount(FileInfo, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         provide: {
           resource: file
         },
diff --git a/packages/web-pkg/tests/unit/components/sidebar/Spaces/Details/SpaceDetails.spec.ts b/packages/web-pkg/tests/unit/components/sidebar/Spaces/Details/SpaceDetails.spec.ts
index df955a1ce4a..295c6bd0ba5 100644
--- a/packages/web-pkg/tests/unit/components/sidebar/Spaces/Details/SpaceDetails.spec.ts
+++ b/packages/web-pkg/tests/unit/components/sidebar/Spaces/Details/SpaceDetails.spec.ts
@@ -1,11 +1,6 @@
 import SpaceDetails from '../../../../../../src/components/SideBar/Spaces/Details/SpaceDetails.vue'
 import { spaceRoleManager, ShareTypes, Share } from '@ownclouders/web-client/src/helpers/share'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount } from 'web-test-helpers'
 
 const spaceMock = {
   type: 'space',
@@ -60,8 +55,6 @@ describe('Details SideBar Panel', () => {
 })
 
 function createWrapper({ spaceResource = spaceMock, props = {} } = {}) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   return {
     wrapper: shallowMount(SpaceDetails, {
       props: { ...props },
@@ -73,8 +66,7 @@ function createWrapper({ spaceResource = spaceMock, props = {} } = {}) {
               spacesState: { spaceMembers: [spaceShare] },
               sharesState: { shares: [spaceShare] }
             }
-          }),
-          store
+          })
         ],
         provide: { resource: spaceResource }
       }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsAcceptShare.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsAcceptShare.spec.ts
index b51de877271..7a3be80f0db 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsAcceptShare.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsAcceptShare.spec.ts
@@ -3,7 +3,6 @@ import { unref } from 'vue'
 import { useFileActionsAcceptShare } from '../../../../../src/composables/actions/files/useFileActionsAcceptShare'
 import { Resource } from '@ownclouders/web-client'
 import { ShareStatus } from '@ownclouders/web-client/src/helpers/share'
-import { useStore } from '../../../../../src/composables'
 import { defaultComponentMocks, getComposableWrapper, RouteLocation } from 'web-test-helpers'
 
 const sharesWithMeLocation = 'files-shares-with-me'
@@ -21,8 +20,7 @@ describe('acceptShare', () => {
         (inputData) => {
           getWrapper({
             setup: () => {
-              const store = useStore()
-              const { actions } = useFileActionsAcceptShare({ store })
+              const { actions } = useFileActionsAcceptShare()
 
               const resources = inputData.resources
               expect(unref(actions)[0].isEnabled({ space: null, resources })).toBe(
@@ -42,8 +40,7 @@ describe('acceptShare', () => {
           getWrapper({
             routeName: sharesWithOthersLocation,
             setup: () => {
-              const store = useStore()
-              const { actions } = useFileActionsAcceptShare({ store })
+              const { actions } = useFileActionsAcceptShare()
 
               expect(
                 unref(actions)[0].isEnabled({ space: null, resources: [resource] })
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopy.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopy.spec.ts
index 3507be6e8c0..0edb542c412 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopy.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopy.spec.ts
@@ -1,14 +1,7 @@
 import { mock } from 'jest-mock-extended'
 import { unref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
-
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  RouteLocation,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, RouteLocation, getComposableWrapper } from 'web-test-helpers'
 import { useFileActionsCopy } from '../../../../../src/composables/actions/files'
 import { useClipboardStore } from '../../../../../src/composables/piniaStores'
 
@@ -52,22 +45,10 @@ function getWrapper({
   setup
 }: {
   searchLocation: boolean
-  setup: (
-    instance: ReturnType<typeof useFileActionsCopy>,
-    {
-      storeOptions
-    }: {
-      storeOptions: typeof defaultStoreMockOptions
-    }
-  ) => void
+  setup: (instance: ReturnType<typeof useFileActionsCopy>) => void
 }) {
   const routeName = searchLocation ? 'files-common-search' : 'files-spaces-generic'
 
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: { ...defaultStoreMockOptions.modules, user: { state: { id: 'alice', uuid: 1 } } }
-  }
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: routeName }) }),
     space: { driveType: 'personal', spaceRoles: { viewer: [], editor: [], manager: [] } }
@@ -76,13 +57,12 @@ function getWrapper({
     mocks,
     wrapper: getComposableWrapper(
       () => {
-        const instance = useFileActionsCopy({ store })
-        setup(instance, { storeOptions })
+        const instance = useFileActionsCopy()
+        setup(instance)
       },
       {
         mocks,
-        provide: mocks,
-        store
+        provide: mocks
       }
     )
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index fb865e07626..4c2c3851dc2 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -6,14 +6,9 @@ import { SpaceResource } from '@ownclouders/web-client/src'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import { FileActionOptions } from '../../../../../src/composables/actions'
 import { useFileActions } from '../../../../../src/composables/actions/files/useFileActions'
-import {
-  RouteLocation,
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers/src'
+import { RouteLocation, defaultComponentMocks, getComposableWrapper } from 'web-test-helpers/src'
 import { ApplicationFileExtension } from '../../../../../types'
+import { useResourcesStore } from '../../../../../src/composables/piniaStores'
 
 jest.mock('../../../../../src/composables/actions/files/useFileActions', () => ({
   useFileActions: jest.fn(() => mock<ReturnType<typeof useFileActions>>())
@@ -44,9 +39,11 @@ describe('useFileActionsCreateNewFile', () => {
       const space = mock<SpaceResource>({ id: '1' })
       getWrapper({
         space,
-        setup: ({ openFile }, { storeOptions }) => {
+        setup: ({ openFile }) => {
           openFile(mock<Resource>(), null)
-          expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
+
+          const { upsertResource } = useResourcesStore()
+          expect(upsertResource).toHaveBeenCalled()
         }
       })
     })
@@ -75,10 +72,7 @@ function getWrapper({
 }: {
   resolveCreateFile?: boolean
   space?: SpaceResource
-  setup: (
-    instance: ReturnType<typeof useFileActionsCreateNewFile>,
-    options: { storeOptions: typeof defaultStoreMockOptions }
-  ) => void
+  setup: (instance: ReturnType<typeof useFileActionsCreateNewFile>) => void
 }) {
   const mocks = {
     ...defaultComponentMocks({
@@ -98,26 +92,15 @@ function getWrapper({
     return Promise.reject('error')
   })
 
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  const currentFolder = {
-    id: 1,
-    path: '/'
-  }
-  storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
-  const store = createStore(storeOptions)
+  const currentFolder = mock<Resource>({ id: '1', path: '/' })
+
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useFileActionsCreateNewFile({
-          store,
-          space
-        })
-        setup(instance, { storeOptions })
+        const instance = useFileActionsCreateNewFile({ space })
+        setup(instance)
       },
       {
-        store,
         provide: mocks,
         mocks,
         pluginOptions: {
@@ -129,7 +112,8 @@ function getWrapper({
                   newFileMenu: { menuTitle: jest.fn() }
                 })
               ]
-            }
+            },
+            resourcesStore: { currentFolder }
           }
         }
       }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
index a1d0bbc5a89..94bf6ac27a1 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
@@ -1,16 +1,14 @@
 import { mock } from 'jest-mock-extended'
 import { nextTick, unref } from 'vue'
 import { useFileActionsCreateNewFolder } from '../../../../../src/composables/actions'
-import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
-import { SpaceResource } from '@ownclouders/web-client/src'
-import { FolderResource } from '@ownclouders/web-client/src/helpers'
 import {
-  RouteLocation,
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers/src'
+  useMessages,
+  useModals,
+  useResourcesStore
+} from '../../../../../src/composables/piniaStores'
+import { SpaceResource } from '@ownclouders/web-client/src'
+import { FolderResource, Resource } from '@ownclouders/web-client/src/helpers'
+import { RouteLocation, defaultComponentMocks, getComposableWrapper } from 'web-test-helpers/src'
 import { useScrollToMock } from '../../../../mocks/useScrollToMock'
 import { useScrollTo } from '../../../../../src/composables/scrollTo'
 
@@ -41,10 +39,13 @@ describe('useFileActionsCreateNewFolder', () => {
       const space = mock<SpaceResource>({ id: '1' })
       getWrapper({
         space,
-        setup: async ({ addNewFolder }, { storeOptions }) => {
+        setup: async ({ addNewFolder }) => {
           await addNewFolder('myfolder')
           await nextTick()
-          expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
+
+          const { upsertResource } = useResourcesStore()
+          expect(upsertResource).toHaveBeenCalled()
+
           const { showMessage } = useMessages()
           expect(showMessage).toHaveBeenCalledWith({ title: '"myfolder" was created successfully' })
 
@@ -95,10 +96,7 @@ function getWrapper({
 }: {
   resolveCreateFolder?: boolean
   space?: SpaceResource
-  setup: (
-    instance: ReturnType<typeof useFileActionsCreateNewFolder>,
-    options: { storeOptions: typeof defaultStoreMockOptions }
-  ) => void
+  setup: (instance: ReturnType<typeof useFileActionsCreateNewFolder>) => void
 }) {
   jest.mocked(useScrollTo).mockImplementation(() => useScrollToMock())
 
@@ -120,25 +118,18 @@ function getWrapper({
     return Promise.reject('error')
   })
 
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  const currentFolder = {
-    id: 1,
-    path: '/'
-  }
-  storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
-  const store = createStore(storeOptions)
+  const currentFolder = mock<Resource>({ id: '1', path: '/' })
+
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useFileActionsCreateNewFolder({ store, space })
-        setup(instance, { storeOptions })
+        const instance = useFileActionsCreateNewFolder({ space })
+        setup(instance)
       },
       {
-        store,
         mocks,
-        provide: mocks
+        provide: mocks,
+        pluginOptions: { piniaOptions: { resourcesStore: { currentFolder } } }
       }
     )
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewShortcut.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewShortcut.spec.ts
index a1b4f4fe781..0876e09e02a 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewShortcut.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewShortcut.spec.ts
@@ -1,13 +1,7 @@
 import { mock } from 'jest-mock-extended'
 import { unref } from 'vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  RouteLocation,
-  getComposableWrapper
-} from 'web-test-helpers'
-import { useFileActionsCreateNewShortcut, useModals } from '../../../../../src'
+import { defaultComponentMocks, RouteLocation, getComposableWrapper } from 'web-test-helpers'
+import { useFileActionsCreateNewShortcut, useModals } from '../../../../../src/composables'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
 
 describe('createNewShortcut', () => {
@@ -49,12 +43,7 @@ function getWrapper({
   setup,
   currentFolder = mock<Resource>()
 }: {
-  setup: (
-    instance: ReturnType<typeof useFileActionsCreateNewShortcut>,
-    options: {
-      storeOptions: typeof defaultStoreMockOptions
-    }
-  ) => void
+  setup: (instance: ReturnType<typeof useFileActionsCreateNewShortcut>) => void
   currentFolder?: Resource
 }) {
   const mocks = {
@@ -63,23 +52,16 @@ function getWrapper({
     })
   }
 
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
-
-  const store = createStore(storeOptions)
-
   return {
     wrapper: getComposableWrapper(
       () => {
         const instance = useFileActionsCreateNewShortcut({ space: mock<SpaceResource>() })
-        setup(instance, { storeOptions })
+        setup(instance)
       },
       {
-        store,
         mocks,
-        provide: mocks
+        provide: mocks,
+        pluginOptions: { piniaOptions: { resourcesStore: { currentFolder } } }
       }
     )
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts
index 6c56061f76f..02b96ae9f4e 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsDelete.spec.ts
@@ -5,15 +5,7 @@ import {
   useFileActionsDelete
 } from '../../../../../src/composables/actions'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { useStore } from '../../../../../src/composables/store'
-
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  RouteLocation,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, RouteLocation, getComposableWrapper } from 'web-test-helpers'
 import { CapabilityStore } from '../../../../../src/composables/piniaStores'
 
 jest.mock('../../../../../src/composables/actions/helpers/useFileActionsDeleteResources')
@@ -46,8 +38,7 @@ describe('delete', () => {
         getWrapper({
           invalidLocation: inputData.invalidLocation,
           setup: () => {
-            const store = useStore()
-            const { actions } = useFileActionsDelete({ store })
+            const { actions } = useFileActionsDelete()
 
             const resources = inputData.resources
             expect(unref(actions)[0].isEnabled({ space: null, resources })).toBe(
@@ -82,8 +73,7 @@ describe('delete', () => {
           deletePermanent: true,
           invalidLocation: inputData.invalidLocation,
           setup: () => {
-            const store = useStore()
-            const { actions } = useFileActionsDelete({ store })
+            const { actions } = useFileActionsDelete()
 
             const resources = inputData.resources
             expect(unref(actions)[1].isEnabled({ space: mock<SpaceResource>(), resources })).toBe(
@@ -123,8 +113,7 @@ describe('delete', () => {
             searchLocation: true,
             filesListDeleteMock,
             setup: () => {
-              const store = useStore()
-              const { actions } = useFileActionsDelete({ store })
+              const { actions } = useFileActionsDelete()
 
               unref(actions)[0].handler({ space: null, resources })
 
@@ -160,8 +149,6 @@ function getWrapper({
     ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ name: routeName }) }),
     space: { driveType: 'personal', spaceRoles: { viewer: [], editor: [], manager: [] } }
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const capabilities = {
     spaces: { enabled: true }
   } satisfies Partial<CapabilityStore['capabilities']>
@@ -170,7 +157,6 @@ function getWrapper({
     wrapper: getComposableWrapper(setup, {
       mocks,
       provide: mocks,
-      store,
       pluginOptions: { piniaOptions: { capabilityState: { capabilities } } }
     })
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
index 488e3d40ece..008391bbe4f 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
@@ -2,14 +2,7 @@ import { useFileActionsEmptyTrashBin } from '../../../../../src/composables/acti
 import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { createLocationTrash, createLocationSpaces } from '../../../../../src/router'
 import { mock } from 'jest-mock-extended'
-import {
-  createStore,
-  defaultStoreMockOptions,
-  getComposableWrapper,
-  defaultComponentMocks,
-  RouteLocation
-} from 'web-test-helpers'
-import { useStore } from '../../../../../src/composables/store'
+import { getComposableWrapper, defaultComponentMocks, RouteLocation } from 'web-test-helpers'
 import { unref } from 'vue'
 import { ProjectSpaceResource, Resource } from '@ownclouders/web-client/src/helpers'
 import { FileActionOptions } from '../../../../../src/composables/actions'
@@ -92,11 +85,9 @@ function getWrapper({
   setup: (
     instance: ReturnType<typeof useFileActionsEmptyTrashBin>,
     {
-      space,
-      storeOptions
+      space
     }: {
       space: ProjectSpaceResource
-      storeOptions: typeof defaultStoreMockOptions
     }
   ) => void
 }) {
@@ -117,19 +108,15 @@ function getWrapper({
     mocks.$clientService.webdav.clearTrashBin.mockRejectedValue(new Error(''))
   }
 
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   return {
     wrapper: getComposableWrapper(
       () => {
-        const store = useStore()
-        const instance = useFileActionsEmptyTrashBin({ store })
-        setup(instance, { space: mocks.space, storeOptions })
+        const instance = useFileActionsEmptyTrashBin()
+        setup(instance, { space: mocks.space })
       },
       {
         mocks,
-        provide: mocks,
-        store
+        provide: mocks
       }
     )
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsMove.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsMove.spec.ts
index 7853ee6eafa..d2095cf8871 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsMove.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsMove.spec.ts
@@ -2,14 +2,7 @@ import { mock, mockDeep } from 'jest-mock-extended'
 import { unref } from 'vue'
 import { useFileActionsMove } from '../../../../../src/composables/actions'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src'
-import { useStore } from '../../../../../src/composables/store'
-import {
-  RouteLocation,
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers/src'
+import { RouteLocation, defaultComponentMocks, getComposableWrapper } from 'web-test-helpers/src'
 
 describe('move', () => {
   describe('computed property "actions"', () => {
@@ -28,8 +21,7 @@ describe('move', () => {
       ])('should be set correctly', (inputData) => {
         getWrapper({
           setup: () => {
-            const store = useStore()
-            const { actions } = useFileActionsMove({ store })
+            const { actions } = useFileActionsMove()
 
             const resources = inputData.resources
             expect(unref(actions)[0].isEnabled({ space: null, resources })).toBe(
@@ -44,14 +36,7 @@ describe('move', () => {
 function getWrapper({
   setup
 }: {
-  setup: (
-    instance: ReturnType<typeof useFileActionsMove>,
-    {
-      storeOptions
-    }: {
-      storeOptions: typeof defaultStoreMockOptions
-    }
-  ) => void
+  setup: (instance: ReturnType<typeof useFileActionsMove>) => void
 }) {
   const routeName = 'files-spaces-generic'
   const mocks = {
@@ -61,24 +46,17 @@ function getWrapper({
     })
   }
 
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  storeOptions.modules.Files.getters.currentFolder.mockImplementation(() => mocks.space)
-  const store = createStore(storeOptions)
   return {
     mocks,
-    storeOptions,
     wrapper: getComposableWrapper(
       () => {
-        const store = useStore()
-        const instance = useFileActionsMove({ store })
-        setup(instance, { storeOptions })
+        const instance = useFileActionsMove()
+        setup(instance)
       },
       {
         mocks,
         provide: mocks,
-        store
+        pluginOptions: { piniaOptions: { resourcesStore: { currentFolder: mocks.space } } }
       }
     )
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRename.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
index 502cbaa5d66..8256d99b2cd 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
@@ -1,13 +1,12 @@
-import { useFileActionsRename, useStore } from '../../../../../src'
-import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
+import { useFileActionsRename } from '../../../../../src/composables/actions'
+import {
+  useMessages,
+  useModals,
+  useResourcesStore
+} from '../../../../../src/composables/piniaStores'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
-import {
-  createStore,
-  defaultStoreMockOptions,
-  defaultComponentMocks,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { nextTick, unref } from 'vue'
 
 const currentFolder = {
@@ -56,10 +55,9 @@ describe('rename', () => {
   describe('method "getNameErrorMsg"', () => {
     it('should not show an error if new name not taken', () => {
       getWrapper({
-        setup: ({ getNameErrorMsg }, { storeOptions }) => {
-          storeOptions.modules.Files.getters.files.mockReturnValue([
-            { name: 'file1', path: '/file1' }
-          ])
+        setup: ({ getNameErrorMsg }) => {
+          const resourcesStore = useResourcesStore()
+          resourcesStore.resources = [{ name: 'file1', path: '/file1' }] as Resource[]
           const message = getNameErrorMsg(
             { name: 'currentName', path: '/currentName' } as Resource,
             'newName'
@@ -71,10 +69,10 @@ describe('rename', () => {
 
     it('should not show an error if new name already exists but in different folder', () => {
       getWrapper({
-        setup: ({ getNameErrorMsg }, { storeOptions }) => {
-          storeOptions.modules.Files.getters.files.mockReturnValue([
-            { name: 'file1', path: '/file1' }
-          ])
+        setup: ({ getNameErrorMsg }) => {
+          const resourcesStore = useResourcesStore()
+          resourcesStore.resources = [{ name: 'file1', path: '/file1' }] as Resource[]
+
           const message = getNameErrorMsg(
             mock<Resource>({ name: 'currentName', path: '/favorites/currentName' }),
             'file1'
@@ -108,6 +106,9 @@ describe('rename', () => {
     ])('should detect name errors and display error messages accordingly', (inputData) => {
       getWrapper({
         setup: ({ getNameErrorMsg }) => {
+          const resourcesStore = useResourcesStore()
+          resourcesStore.resources = [{ name: 'file1', path: '/file1' }] as Resource[]
+
           const message = getNameErrorMsg(
             mock<Resource>({ name: inputData.currentName, path: `/${inputData.currentName}` }),
             inputData.newName,
@@ -122,21 +123,25 @@ describe('rename', () => {
   describe('method "renameResource"', () => {
     it('should call the rename action on a resource in the file list', () => {
       getWrapper({
-        setup: async ({ renameResource }, { space, storeOptions }) => {
+        setup: async ({ renameResource }, { space }) => {
           const resource = { id: '2', path: '/folder', webDavPath: '/files/admin/folder' }
           renameResource(space, resource, 'new name')
           await nextTick()
-          expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalledTimes(1)
+
+          const { upsertResource } = useResourcesStore()
+          expect(upsertResource).toHaveBeenCalledTimes(1)
         }
       })
     })
 
     it('should call the rename action on the current folder', () => {
       getWrapper({
-        setup: async ({ renameResource }, { space, storeOptions }) => {
+        setup: async ({ renameResource }, { space }) => {
           renameResource(space, currentFolder, 'new name')
           await nextTick()
-          expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalledTimes(1)
+
+          const { upsertResource } = useResourcesStore()
+          expect(upsertResource).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -166,11 +171,9 @@ function getWrapper({
     instance: ReturnType<typeof useFileActionsRename>,
     {
       space,
-      storeOptions,
       clientService
     }: {
       space: SpaceResource
-      storeOptions: typeof defaultStoreMockOptions
       clientService: ReturnType<typeof defaultComponentMocks>['$clientService']
     }
   ) => void
@@ -182,21 +185,16 @@ function getWrapper({
     })
   }
 
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   return {
     mocks,
-    storeOptions,
     wrapper: getComposableWrapper(
       () => {
-        const store = useStore()
-        const instance = useFileActionsRename({ store })
-        setup(instance, { space: mocks.space, storeOptions, clientService: mocks.$clientService })
+        const instance = useFileActionsRename()
+        setup(instance, { space: mocks.space, clientService: mocks.$clientService })
       },
       {
         mocks,
-        provide: mocks,
-        store
+        provide: mocks
       }
     )
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
index 6b012f56ca8..7f4a9291be1 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
@@ -1,22 +1,14 @@
 import { useFileActionsRestore } from '../../../../../src/composables/actions'
 import { createLocationTrash, createLocationSpaces } from '../../../../../src/router'
 import { mock } from 'jest-mock-extended'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper,
-  RouteLocation
-} from 'web-test-helpers'
-import { useMessages, useStore } from '../../../../../src/composables'
+import { defaultComponentMocks, getComposableWrapper, RouteLocation } from 'web-test-helpers'
+import { useMessages, useResourcesStore } from '../../../../../src/composables/piniaStores'
 import { unref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
 import { ProjectSpaceResource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { LoadingTaskCallbackArguments } from '../../../../../src/services/loadingService'
 
 describe('restore', () => {
-  afterEach(() => jest.clearAllMocks())
-
   describe('isEnabled property', () => {
     it('should be false when no resource is given', () => {
       getWrapper({
@@ -80,7 +72,7 @@ describe('restore', () => {
   describe('method "restoreResources"', () => {
     it('should show message on success', () => {
       getWrapper({
-        setup: async ({ restoreResources }, { space, storeOptions }) => {
+        setup: async ({ restoreResources }, { space }) => {
           await restoreResources(
             space,
             [{ id: '1', path: '/1' }],
@@ -90,9 +82,10 @@ describe('restore', () => {
 
           const { showMessage } = useMessages()
           expect(showMessage).toHaveBeenCalledTimes(1)
-          expect(storeOptions.modules.Files.actions.removeFilesFromTrashbin).toHaveBeenCalledTimes(
-            1
-          )
+
+          const { removeResources, resetSelection } = useResourcesStore()
+          expect(removeResources).toHaveBeenCalledTimes(1)
+          expect(resetSelection).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -169,11 +162,9 @@ function getWrapper({
   setup: (
     instance: ReturnType<typeof useFileActionsRestore>,
     {
-      space,
-      storeOptions
+      space
     }: {
       space: SpaceResource
-      storeOptions: typeof defaultStoreMockOptions
       router: ReturnType<typeof defaultComponentMocks>['$router']
     }
   ) => void
@@ -200,28 +191,17 @@ function getWrapper({
   } else {
     mocks.$clientService.webdav.restoreFile.mockRejectedValue(new Error(''))
   }
-  mocks.$clientService.owncloudSdk.users.getUser.mockImplementation(() => ({ quota: {} }))
 
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: {
-      ...defaultStoreMockOptions.modules,
-      user: { state: { uuid: 1 } }
-    }
-  }
-  const store = createStore(storeOptions)
   return {
     mocks,
     wrapper: getComposableWrapper(
       () => {
-        const store = useStore()
-        const instance = useFileActionsRestore({ store })
-        setup(instance, { space: mocks.space, storeOptions, router: mocks.$router })
+        const instance = useFileActionsRestore()
+        setup(instance, { space: mocks.space, router: mocks.$router })
       },
       {
         mocks,
-        provide: mocks,
-        store
+        provide: mocks
       }
     )
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsShowDetails.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsShowDetails.spec.ts
index ad24d31067c..4eb690c577c 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsShowDetails.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsShowDetails.spec.ts
@@ -1,15 +1,5 @@
-import {
-  SideBarEventTopics,
-  eventBus,
-  useFileActionsShowDetails,
-  useStore
-} from '../../../../../src'
-import {
-  createStore,
-  defaultStoreMockOptions,
-  defaultComponentMocks,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { SideBarEventTopics, eventBus, useFileActionsShowDetails } from '../../../../../src'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { unref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
 
@@ -19,15 +9,14 @@ describe('showDetails', () => {
       const mocks = defaultComponentMocks()
       getComposableWrapper(
         () => {
-          const store = useStore()
-          const { actions } = useFileActionsShowDetails({ store })
+          const { actions } = useFileActionsShowDetails()
 
           const busStub = jest.spyOn(eventBus, 'publish')
           const resources = [{ id: '1', path: '/folder' }] as Resource[]
           unref(actions)[0].handler({ space: null, resources })
           expect(busStub).toHaveBeenCalledWith(SideBarEventTopics.open)
         },
-        { mocks, provide: mocks, store: createStore(defaultStoreMockOptions) }
+        { mocks, provide: mocks }
       )
     })
   })
diff --git a/packages/web-pkg/tests/unit/composables/actions/helpers/useFileActionsDeleteResources.spec.ts b/packages/web-pkg/tests/unit/composables/actions/helpers/useFileActionsDeleteResources.spec.ts
index ddff8b5eb13..5e388fd0551 100644
--- a/packages/web-pkg/tests/unit/composables/actions/helpers/useFileActionsDeleteResources.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/helpers/useFileActionsDeleteResources.spec.ts
@@ -1,12 +1,7 @@
-import { useStore, useFileActionsDeleteResources } from '../../../../../src'
+import { useFileActionsDeleteResources } from '../../../../../src/composables/actions'
 import { mockDeep } from 'jest-mock-extended'
 import { FolderResource, SpaceResource } from '@ownclouders/web-client/src/helpers'
-import {
-  createStore,
-  defaultStoreMockOptions,
-  defaultComponentMocks,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { nextTick } from 'vue'
 
 const currentFolder = {
@@ -33,6 +28,13 @@ describe('deleteResources', () => {
         currentFolder,
         setup: async ({ filesList_delete }, { router }) => {
           await filesList_delete(resourcesToDelete)
+          // FIXME: well...
+          await nextTick()
+          await nextTick()
+          await nextTick()
+          await nextTick()
+          await nextTick()
+          await nextTick()
           await nextTick()
           expect(router.push).toHaveBeenCalledTimes(1)
         }
@@ -50,12 +52,10 @@ function getWrapper({
     instance: ReturnType<typeof useFileActionsDeleteResources>,
     {
       space,
-      router,
-      storeOptions
+      router
     }: {
       space: SpaceResource
       router: ReturnType<typeof defaultComponentMocks>['$router']
-      storeOptions: typeof defaultStoreMockOptions
     }
   ) => void
 }) {
@@ -63,27 +63,19 @@ function getWrapper({
     ...defaultComponentMocks(),
     space: mockDeep<SpaceResource>()
   }
+  mocks.$clientService.webdav.deleteFile.mockResolvedValue(undefined)
 
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  storeOptions.modules.Files.getters.currentFolder.mockReturnValue(currentFolder)
-  storeOptions.modules.Files.getters.activeFiles.mockReturnValue([])
-
-  const store = createStore(storeOptions)
   return {
     mocks,
-    storeOptions,
     wrapper: getComposableWrapper(
       () => {
-        const store = useStore()
-        const instance = useFileActionsDeleteResources({ store })
-        setup(instance, { space: mocks.space, storeOptions, router: mocks.$router })
+        const instance = useFileActionsDeleteResources()
+        setup(instance, { space: mocks.space, router: mocks.$router })
       },
       {
         mocks,
         provide: mocks,
-        store
+        pluginOptions: { piniaOptions: { resourcesStore: { currentFolder } } }
       }
     )
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
index 985ac2ac7cd..ee94423a870 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
@@ -2,10 +2,8 @@ import { useSpaceActionsDelete } from '../../../../../src/composables/actions'
 import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { buildSpace, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import {
-  createStore,
   defaultComponentMocks,
   mockAxiosResolve,
-  defaultStoreMockOptions,
   RouteLocation,
   getComposableWrapper
 } from 'web-test-helpers'
@@ -141,19 +139,12 @@ function getWrapper({
   setup: (
     instance: ReturnType<typeof useSpaceActionsDelete>,
     {
-      storeOptions,
       clientService
     }: {
-      storeOptions: typeof defaultStoreMockOptions
       clientService: ReturnType<typeof defaultComponentMocks>['$clientService']
     }
   ) => void
 }) {
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: 'files-spaces-projects' })
   })
@@ -161,13 +152,12 @@ function getWrapper({
     mocks,
     wrapper: getComposableWrapper(
       () => {
-        const instance = useSpaceActionsDelete({ store })
-        setup(instance, { storeOptions, clientService: mocks.$clientService })
+        const instance = useSpaceActionsDelete()
+        setup(instance, { clientService: mocks.$clientService })
       },
       {
         mocks,
         provide: mocks,
-        store,
         pluginOptions: {
           piniaOptions: { userState: { user: { id: '1', onPremisesSamAccountName: 'alice' } } }
         }
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDuplicate.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDuplicate.spec.ts
index 5ef38f5f048..9f6d1e6431e 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDuplicate.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDuplicate.spec.ts
@@ -2,16 +2,18 @@ import { useSpaceActionsDuplicate } from '../../../../../src/composables/actions
 import { AbilityRule, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { mock } from 'jest-mock-extended'
 import {
-  createStore,
   defaultComponentMocks,
   mockAxiosResolve,
-  defaultStoreMockOptions,
   RouteLocation,
   getComposableWrapper
 } from 'web-test-helpers'
 import { unref } from 'vue'
 import { ListFilesResult } from '@ownclouders/web-client/src/webdav/listFiles'
-import { useMessages, useSpacesStore } from '../../../../../src/composables/piniaStores'
+import {
+  useMessages,
+  useResourcesStore,
+  useSpacesStore
+} from '../../../../../src/composables/piniaStores'
 
 const spaces = [
   mock<SpaceResource>({
@@ -135,7 +137,7 @@ describe('restore', () => {
     it('should upsert a space as resource on the projects page', () => {
       getWrapper({
         currentRouteName: 'files-spaces-projects',
-        setup: async ({ duplicateSpace }, { storeOptions, clientService }) => {
+        setup: async ({ duplicateSpace }, { clientService }) => {
           clientService.graphAuthenticated.drives.createDrive.mockResolvedValue(
             mockAxiosResolve({
               id: '1',
@@ -145,7 +147,9 @@ describe('restore', () => {
           )
           clientService.webdav.listFiles.mockResolvedValue({ children: [] } as ListFilesResult)
           await duplicateSpace(spaces[0])
-          expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
+
+          const { upsertResource } = useResourcesStore()
+          expect(upsertResource).toHaveBeenCalled()
         }
       })
     })
@@ -160,20 +164,14 @@ function getWrapper({
   setup: (
     instance: ReturnType<typeof useSpaceActionsDuplicate>,
     {
-      storeOptions,
       clientService
     }: {
-      storeOptions: typeof defaultStoreMockOptions
       clientService: ReturnType<typeof defaultComponentMocks>['$clientService']
     }
   ) => void
   abilities?: AbilityRule[]
   currentRouteName?: string
 }) {
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: currentRouteName })
   })
@@ -181,13 +179,12 @@ function getWrapper({
     mocks,
     wrapper: getComposableWrapper(
       () => {
-        const instance = useSpaceActionsDuplicate({ store })
-        setup(instance, { storeOptions, clientService: mocks.$clientService })
+        const instance = useSpaceActionsDuplicate()
+        setup(instance, { clientService: mocks.$clientService })
       },
       {
         mocks,
         provide: mocks,
-        store,
         pluginOptions: { abilities, piniaOptions: { spacesState: { spaces } } }
       }
     )
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditQuota.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditQuota.spec.ts
index 8af3c8d5950..2d5d7fb4072 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditQuota.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditQuota.spec.ts
@@ -1,12 +1,7 @@
 import { useSpaceActionsEditQuota } from '../../../../../src/composables/actions'
 import { useModals } from '../../../../../src/composables/piniaStores'
 import { buildSpace } from '@ownclouders/web-client/src/helpers'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { unref } from 'vue'
 import { mock } from 'jest-mock-extended'
 import { Drive } from '@ownclouders/web-client/src/generated'
@@ -73,31 +68,17 @@ function getWrapper({
   setup
 }: {
   canEditSpaceQuota?: boolean
-  setup: (
-    instance: ReturnType<typeof useSpaceActionsEditQuota>,
-    {
-      storeOptions
-    }: {
-      storeOptions: typeof defaultStoreMockOptions
-    }
-  ) => void
+  setup: (instance: ReturnType<typeof useSpaceActionsEditQuota>) => void
 }) {
   const mocks = defaultComponentMocks()
 
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: { ...defaultStoreMockOptions.modules, user: { state: { id: 'alice', uuid: 1 } } }
-  }
-  const store = createStore(storeOptions)
-
   return {
     wrapper: getComposableWrapper(
       () => {
         const instance = useSpaceActionsEditQuota()
-        setup(instance, { storeOptions })
+        setup(instance)
       },
       {
-        store,
         mocks,
         pluginOptions: {
           abilities: canEditSpaceQuota ? [{ action: 'set-quota-all', subject: 'Drive' }] : []
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditReadmeContent.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditReadmeContent.spec.ts
index 1a022a83749..e405be18674 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditReadmeContent.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditReadmeContent.spec.ts
@@ -1,7 +1,7 @@
 import { useSpaceActionsEditReadmeContent } from '../../../../../src/composables/actions'
 import { useModals } from '../../../../../src/composables/piniaStores'
 import { SpaceResource, buildSpace } from '@ownclouders/web-client/src/helpers'
-import { createStore, defaultStoreMockOptions, getComposableWrapper } from 'web-test-helpers'
+import { getComposableWrapper } from 'web-test-helpers'
 import { unref } from 'vue'
 import { mock } from 'jest-mock-extended'
 import { Drive } from '@ownclouders/web-client/src/generated'
@@ -89,28 +89,15 @@ describe('editReadmeContent', () => {
 function getWrapper({
   setup
 }: {
-  setup: (
-    instance: ReturnType<typeof useSpaceActionsEditReadmeContent>,
-    {
-      storeOptions
-    }: {
-      storeOptions: typeof defaultStoreMockOptions
-    }
-  ) => void
+  setup: (instance: ReturnType<typeof useSpaceActionsEditReadmeContent>) => void
 }) {
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-
-  const store = createStore(storeOptions)
   return {
     wrapper: getComposableWrapper(
       () => {
         const instance = useSpaceActionsEditReadmeContent()
-        setup(instance, { storeOptions })
+        setup(instance)
       },
       {
-        store,
         pluginOptions: {
           piniaOptions: { userState: { user: { id: '1', onPremisesSamAccountName: 'alice' } } }
         }
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsNavigateToTrash.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsNavigateToTrash.spec.ts
index f2cadbae0af..86f6ca7d4c0 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsNavigateToTrash.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsNavigateToTrash.spec.ts
@@ -1,12 +1,6 @@
 import { useSpaceActionsNavigateToTrash } from '../../../../../src'
 import { mock } from 'jest-mock-extended'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  RouteLocation,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, RouteLocation, getComposableWrapper } from 'web-test-helpers'
 import { unref } from 'vue'
 import { SpaceResource } from '@ownclouders/web-client/src'
 
@@ -69,20 +63,8 @@ describe('navigateToSpace', () => {
 function getWrapper({
   setup
 }: {
-  setup: (
-    instance: ReturnType<typeof useSpaceActionsNavigateToTrash>,
-    {
-      storeOptions
-    }: {
-      storeOptions: typeof defaultStoreMockOptions
-    }
-  ) => void
+  setup: (instance: ReturnType<typeof useSpaceActionsNavigateToTrash>) => void
 }) {
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: { ...defaultStoreMockOptions.modules, user: { state: { id: 'alice', uuid: 1 } } }
-  }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: 'files-spaces-projects' })
   })
@@ -91,10 +73,9 @@ function getWrapper({
     wrapper: getComposableWrapper(
       () => {
         const instance = useSpaceActionsNavigateToTrash()
-        setup(instance, { storeOptions })
+        setup(instance)
       },
       {
-        store,
         mocks,
         provide: mocks
       }
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsShowMembers.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsShowMembers.spec.ts
index 9a90aacd02a..de18546f531 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsShowMembers.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsShowMembers.spec.ts
@@ -1,7 +1,7 @@
 import { unref } from 'vue'
 import { SpaceResource } from '@ownclouders/web-client/src'
-import { useSpaceActionsShowMembers } from '../../../../../src'
-import { createStore, defaultStoreMockOptions, getComposableWrapper } from 'web-test-helpers'
+import { useSpaceActionsShowMembers } from '../../../../../src/composables/actions'
+import { getComposableWrapper } from 'web-test-helpers'
 
 describe('showMembers', () => {
   describe('isEnabled property', () => {
@@ -29,17 +29,10 @@ function getWrapper({
 }: {
   setup: (instance: ReturnType<typeof useSpaceActionsShowMembers>) => void
 }) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   return {
-    wrapper: getComposableWrapper(
-      () => {
-        const instance = useSpaceActionsShowMembers({ store })
-        setup(instance)
-      },
-      {
-        store
-      }
-    )
+    wrapper: getComposableWrapper(() => {
+      const instance = useSpaceActionsShowMembers()
+      setup(instance)
+    })
   }
 }
diff --git a/packages/web-pkg/tests/unit/composables/driveResolver/useDriveResolver.spec.ts b/packages/web-pkg/tests/unit/composables/driveResolver/useDriveResolver.spec.ts
index 7030eb0f678..8026bd19480 100644
--- a/packages/web-pkg/tests/unit/composables/driveResolver/useDriveResolver.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/driveResolver/useDriveResolver.spec.ts
@@ -3,9 +3,7 @@ import { ref, unref } from 'vue'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { isShareSpaceResource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import {
-  createStore,
   getComposableWrapper,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   RouteLocation,
   writable
@@ -25,14 +23,13 @@ describe('useDriveResolver', () => {
         expect(unref(space)).toEqual(null)
         expect(unref(item)).toEqual(null)
       },
-      { mocks, provide: mocks, store: createStore(defaultStoreMockOptions) }
+      { mocks, provide: mocks }
     )
   })
   it('returns a public space on a public page', () => {
     const token = 'token'
     const spaceMock = mockDeep<SpaceResource>({ id: token })
-    const storeOptions = { ...defaultStoreMockOptions }
-    const store = createStore(storeOptions)
+
     const mocks = defaultComponentMocks()
 
     getComposableWrapper(
@@ -44,15 +41,13 @@ describe('useDriveResolver', () => {
       {
         mocks,
         provide: mocks,
-        store,
         pluginOptions: { piniaOptions: { spacesState: { spaces: [spaceMock] } } }
       }
     )
   })
   it('returns a share space for a share', () => {
     const spaceMock = mockDeep<SpaceResource>()
-    const storeOptions = { ...defaultStoreMockOptions }
-    const store = createStore(storeOptions)
+
     const mocks = defaultComponentMocks()
     getComposableWrapper(
       () => {
@@ -65,7 +60,6 @@ describe('useDriveResolver', () => {
       {
         mocks,
         provide: mocks,
-        store,
         pluginOptions: { piniaOptions: { spacesState: { spaces: [spaceMock] } } }
       }
     )
@@ -75,8 +69,6 @@ describe('useDriveResolver', () => {
     const fileId = 'someFileId'
     const resourcePath = '/someFolder'
     const spaceMock = mockDeep<SpaceResource>({ fileId, driveAlias: 'driveAlias' })
-    const storeOptions = { ...defaultStoreMockOptions }
-    const store = createStore(storeOptions)
     const mocks = defaultComponentMocks({
       currentRoute: mock<RouteLocation>({
         name: 'files-spaces-generic',
@@ -100,7 +92,6 @@ describe('useDriveResolver', () => {
       {
         mocks,
         provide: mocks,
-        store,
         pluginOptions: { piniaOptions: { spacesState: { spaces: [spaceMock] } } }
       }
     )
@@ -110,8 +101,6 @@ describe('useDriveResolver', () => {
     const driveAlias = '/personal'
     const resourcePath = '/someFolder'
     const spaceMock = mockDeep<SpaceResource>({ driveAlias })
-    const storeOptions = { ...defaultStoreMockOptions }
-    const store = createStore(storeOptions)
     const mocks = defaultComponentMocks({
       currentRoute: mock<RouteLocation>({
         name: 'files-spaces-generic',
@@ -134,7 +123,6 @@ describe('useDriveResolver', () => {
       {
         mocks,
         provide: mocks,
-        store,
         pluginOptions: { piniaOptions: { spacesState: { spaces: [spaceMock] } } }
       }
     )
@@ -147,8 +135,6 @@ describe('useDriveResolver', () => {
   ])('loads space members for a project space', (data) => {
     const driveAlias = `/${data.driveType}`
     const spaceMock = mockDeep<SpaceResource>({ driveAlias, driveType: data.driveType })
-    const storeOptions = { ...defaultStoreMockOptions }
-    const store = createStore(storeOptions)
 
     const mocks = defaultComponentMocks({
       currentRoute: mock<RouteLocation>({
@@ -167,7 +153,6 @@ describe('useDriveResolver', () => {
       {
         mocks,
         provide: mocks,
-        store,
         pluginOptions: { piniaOptions: { spacesState: { spaces: [spaceMock] } } }
       }
     )
diff --git a/packages/web-pkg/tests/unit/composables/fileListHeaderPosition/spec/index.ts b/packages/web-pkg/tests/unit/composables/fileListHeaderPosition/spec/index.ts
index 2133c29b503..b389916dc61 100644
--- a/packages/web-pkg/tests/unit/composables/fileListHeaderPosition/spec/index.ts
+++ b/packages/web-pkg/tests/unit/composables/fileListHeaderPosition/spec/index.ts
@@ -1,6 +1,5 @@
 import { defineComponent } from 'vue'
 import { useFileListHeaderPosition } from '../../../../../src/composables/fileListHeaderPosition'
-import { useStore } from '../../../../../src/composables/store'
 import { defaultPlugins, mount } from 'web-test-helpers'
 
 export const createWrapper = () =>
@@ -9,7 +8,7 @@ export const createWrapper = () =>
       setup() {
         const { y, refresh } = useFileListHeaderPosition()
 
-        return { y, refresh, store: useStore() }
+        return { y, refresh }
       },
       template: `<div>{{ y }}</div>`
     }),
diff --git a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
index 4d4eb5d3e13..114bd6f3437 100644
--- a/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/folderLink/useFolderLink.spec.ts
@@ -1,9 +1,4 @@
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { CapabilityStore, useFolderLink } from '../../../../src/composables'
 import { SpaceResource } from '@ownclouders/web-client'
 
@@ -101,8 +96,6 @@ describe('useFolderLink', () => {
 })
 
 const createWrapper = ({ hasShareJail = true }: { hasShareJail?: boolean } = {}) => {
-  const storeOptions = { ...defaultStoreMockOptions }
-
   const spaces = [
     {
       id: '1',
@@ -118,7 +111,6 @@ const createWrapper = ({ hasShareJail = true }: { hasShareJail?: boolean } = {})
     }
   ] as unknown as SpaceResource[]
 
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({})
   const capabilities = {
     spaces: { projects: true, share_jail: hasShareJail }
@@ -143,7 +135,6 @@ const createWrapper = ({ hasShareJail = true }: { hasShareJail?: boolean } = {})
     {
       mocks,
       provide: mocks,
-      store,
       pluginOptions: {
         piniaOptions: { spacesState: { spaces }, capabilityState: { capabilities } }
       }
diff --git a/packages/web-pkg/tests/unit/composables/piniaStores/shares.spec.ts b/packages/web-pkg/tests/unit/composables/piniaStores/shares.spec.ts
index dc8ef5de0b0..0297bfff8fa 100644
--- a/packages/web-pkg/tests/unit/composables/piniaStores/shares.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/piniaStores/shares.spec.ts
@@ -17,14 +17,13 @@ jest.mock('@ownclouders/web-client/src/helpers/share/functions', () => ({
   buildCollaboratorShare: (share) => share
 }))
 
-const getVuexStoreMock = () => ({
-  dispatch: jest.fn(),
-  commit: jest.fn(),
-  getters: { 'Files/selectedFiles': [], 'Files/currentFolder': {} }
-})
-
 describe('useSharesStore', () => {
-  beforeEach(() => createTestingPinia({ stubActions: false }))
+  beforeEach(() =>
+    createTestingPinia({
+      stubActions: false,
+      initialState: { resources: { currentFolder: mock<Resource>() } }
+    })
+  )
 
   describe('loadShares', () => {
     it('fetches shares and sets them as in- and outgoing shares', () => {
@@ -101,8 +100,7 @@ describe('useSharesStore', () => {
           await instance.addShare(
             mock<AddShareOptions>({
               clientService,
-              shareType: ShareTypes.user.value,
-              vuexStore: getVuexStoreMock() as any
+              shareType: ShareTypes.user.value
             })
           )
 
@@ -118,8 +116,7 @@ describe('useSharesStore', () => {
           await instance.addShare(
             mock<AddShareOptions>({
               clientService,
-              shareType: ShareTypes.group.value,
-              vuexStore: getVuexStoreMock() as any
+              shareType: ShareTypes.group.value
             })
           )
 
@@ -149,8 +146,7 @@ describe('useSharesStore', () => {
           clientService.owncloudSdk.shares.deleteShare.mockResolvedValue({})
           await instance.deleteShare(
             mock<DeleteShareOptions>({
-              clientService,
-              vuexStore: getVuexStoreMock() as any
+              clientService
             })
           )
 
@@ -166,9 +162,7 @@ describe('useSharesStore', () => {
         setup: async (instance) => {
           const clientService = mockDeep<ClientService>()
           clientService.owncloudSdk.shares.shareFileWithLink.mockResolvedValue({})
-          await instance.addLink(
-            mock<AddLinkOptions>({ clientService, vuexStore: getVuexStoreMock() as any })
-          )
+          await instance.addLink(mock<AddLinkOptions>({ clientService }))
 
           expect(clientService.owncloudSdk.shares.shareFileWithLink).toHaveBeenCalledTimes(1)
         }
@@ -194,9 +188,7 @@ describe('useSharesStore', () => {
         setup: async (instance) => {
           const clientService = mockDeep<ClientService>()
           clientService.owncloudSdk.shares.deleteShare.mockResolvedValue({})
-          await instance.deleteLink(
-            mock<DeleteLinkOptions>({ clientService, vuexStore: getVuexStoreMock() as any })
-          )
+          await instance.deleteLink(mock<DeleteLinkOptions>({ clientService }))
 
           expect(clientService.owncloudSdk.shares.deleteShare).toHaveBeenCalledTimes(1)
         }
diff --git a/packages/web-pkg/tests/unit/composables/scrollTo/useScrollTo.spec.ts b/packages/web-pkg/tests/unit/composables/scrollTo/useScrollTo.spec.ts
index d074b97e7aa..1868f2c8aff 100644
--- a/packages/web-pkg/tests/unit/composables/scrollTo/useScrollTo.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/scrollTo/useScrollTo.spec.ts
@@ -3,7 +3,6 @@ import { useScrollTo } from '../../../../src/composables/scrollTo'
 import { Resource } from '@ownclouders/web-client/src'
 import { eventBus } from '../../../../src/services'
 import { defaultComponentMocks } from 'web-test-helpers/src/mocks/defaultComponentMocks'
-import { defaultStoreMockOptions } from 'web-test-helpers/src/mocks/store/defaultStoreMockOptions'
 import { getComposableWrapper, RouteLocation } from 'web-test-helpers'
 
 const mockResourceId = 'fakeResourceId'
@@ -36,7 +35,7 @@ describe('useScrollTo', () => {
           scrollToResource(mockResourceId)
           expect(htmlPageObject.scrollIntoView).not.toHaveBeenCalled()
         },
-        { mocks, provide: mocks, store: defaultStoreMockOptions }
+        { mocks, provide: mocks }
       )
     })
     it('calls "scrollIntoView" when the page bottom is reached', () => {
@@ -54,7 +53,7 @@ describe('useScrollTo', () => {
           scrollToResource(mockResourceId)
           expect(htmlPageObject.scrollIntoView).toHaveBeenCalled()
         },
-        { mocks, provide: mocks, store: defaultStoreMockOptions }
+        { mocks, provide: mocks }
       )
     })
     it('calls "scrollIntoView" when the page top is reached', () => {
@@ -72,7 +71,7 @@ describe('useScrollTo', () => {
           scrollToResource(mockResourceId)
           expect(htmlPageObject.scrollIntoView).toHaveBeenCalled()
         },
-        { mocks, provide: mocks, store: defaultStoreMockOptions }
+        { mocks, provide: mocks }
       )
     })
   })
@@ -90,11 +89,7 @@ describe('useScrollTo', () => {
           scrollToResourceFromRoute([resource], 'files-app-bar')
           expect(querySelectorAllSpy).not.toHaveBeenCalled()
         },
-        {
-          mocks,
-          provide: mocks,
-          store: defaultStoreMockOptions
-        }
+        { mocks, provide: mocks }
       )
     })
     it('does not scroll when no resource found', () => {
@@ -112,11 +107,7 @@ describe('useScrollTo', () => {
           scrollToResourceFromRoute([resource], 'files-app-bar')
           expect(querySelectorAllSpy).not.toHaveBeenCalled()
         },
-        {
-          mocks,
-          provide: mocks,
-          store: defaultStoreMockOptions
-        }
+        { mocks, provide: mocks }
       )
     })
     it('does not scroll when resource is processing', () => {
@@ -134,11 +125,7 @@ describe('useScrollTo', () => {
           scrollToResourceFromRoute([resource], 'files-app-bar')
           expect(querySelectorAllSpy).not.toHaveBeenCalled()
         },
-        {
-          mocks,
-          provide: mocks,
-          store: defaultStoreMockOptions
-        }
+        { mocks, provide: mocks }
       )
     })
     it('scrolls to the resource when the "scrollTo" param is given and a resource is found', () => {
diff --git a/packages/web-pkg/tests/unit/composables/search/useSearch.spec.ts b/packages/web-pkg/tests/unit/composables/search/useSearch.spec.ts
index 266097384d5..89d569487d4 100644
--- a/packages/web-pkg/tests/unit/composables/search/useSearch.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/search/useSearch.spec.ts
@@ -1,9 +1,4 @@
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { CapabilityStore, useSearch } from '../../../../src/composables'
 import { SpaceResource } from '@ownclouders/web-client'
 
@@ -36,8 +31,6 @@ describe('useSearch', () => {
 })
 
 const createWrapper = ({ resources = [] }: { resources?: any[] } = {}) => {
-  const storeOptions = { ...defaultStoreMockOptions }
-
   const spaces = [
     {
       id: '1',
@@ -53,7 +46,6 @@ const createWrapper = ({ resources = [] }: { resources?: any[] } = {}) => {
     }
   ] as unknown as SpaceResource[]
 
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({})
   const capabilities = {
     spaces: { projects: true, share_jail: true }
@@ -75,7 +67,6 @@ const createWrapper = ({ resources = [] }: { resources?: any[] } = {}) => {
     {
       mocks,
       provide: mocks,
-      store,
       pluginOptions: {
         piniaOptions: { spacesState: { spaces }, capabilityState: { capabilities } }
       }
diff --git a/packages/web-pkg/tests/unit/composables/store/useMutationSubscription.spec.ts b/packages/web-pkg/tests/unit/composables/store/useMutationSubscription.spec.ts
deleted file mode 100644
index f056e3a91bc..00000000000
--- a/packages/web-pkg/tests/unit/composables/store/useMutationSubscription.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { MutationPayload } from 'vuex'
-import { useMutationSubscription, useStore } from '../../../../src/composables/store'
-import { createStore, getComposableWrapper } from 'web-test-helpers'
-
-describe('subscribeMutation', () => {
-  it('should be valid', () => {
-    expect(useMutationSubscription).toBeDefined()
-    expect(useMutationSubscription).toBeInstanceOf(Function)
-  })
-
-  it('subscribes to mutations', () => {
-    let mutation: MutationPayload
-    let callCount = 0
-    const defaultStore = createStore({
-      state: {
-        value: 0
-      },
-      mutations: {
-        UPDATE(state, value) {
-          state.value = value
-        }
-      },
-      actions: {
-        update({ commit }, value) {
-          commit('UPDATE', value)
-        },
-        reset({ commit }) {
-          commit('UPDATE', 0)
-        }
-      }
-    })
-    const wrapper = getComposableWrapper(
-      () => {
-        useMutationSubscription(['UPDATE'], (callbackMutation) => {
-          mutation = callbackMutation
-          callCount += 1
-        })
-
-        return { store: useStore() }
-      },
-      { store: defaultStore }
-    )
-
-    const { store } = wrapper.vm as any
-
-    store.commit('UPDATE', 5)
-    expect(callCount).toBe(1)
-    expect(mutation.payload).toBe(5)
-    expect(mutation.type).toBe('UPDATE')
-
-    store.dispatch('update', 10)
-    expect(callCount).toBe(2)
-    expect(mutation.payload).toBe(10)
-    expect(mutation.type).toBe('UPDATE')
-
-    store.dispatch('reset')
-    expect(callCount).toBe(3)
-    expect(mutation.payload).toBe(0)
-    expect(mutation.type).toBe('UPDATE')
-
-    wrapper.unmount()
-  })
-})
diff --git a/packages/web-pkg/tests/unit/composables/store/useStore.spec.ts b/packages/web-pkg/tests/unit/composables/store/useStore.spec.ts
deleted file mode 100644
index cb72f2af008..00000000000
--- a/packages/web-pkg/tests/unit/composables/store/useStore.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useStore } from '../../../../src/composables/store'
-import { Store } from 'vuex'
-import { createStore, getComposableWrapper, defaultStoreMockOptions } from 'web-test-helpers'
-
-describe('useStore', () => {
-  it('should be valid', () => {
-    expect(useStore).toBeDefined()
-
-    const store = createStore(defaultStoreMockOptions)
-    getComposableWrapper(
-      () => {
-        expect(useStore()).toBeInstanceOf(Store)
-      },
-      { store }
-    )
-  })
-
-  it('behaves like Vuex', () => {
-    const storeOptions = {
-      state: {
-        value: 0
-      },
-      mutations: {
-        UPDATE(state, value) {
-          state.value = value
-        }
-      },
-      actions: {
-        update({ commit }, value) {
-          commit('UPDATE', value)
-        },
-        reset({ commit }) {
-          commit('UPDATE', 0)
-        }
-      }
-    }
-    const store = createStore(storeOptions)
-    getComposableWrapper(
-      () => {
-        const store = useStore()
-
-        expect(store.state.value).toBe(0)
-
-        store.commit('UPDATE', 1)
-        expect(store.state.value).toBe(1)
-
-        store.dispatch('update', 2)
-        expect(store.state.value).toBe(2)
-
-        store.dispatch('reset')
-        expect(store.state.value).toBe(0)
-      },
-      { store }
-    ).unmount()
-  })
-})
diff --git a/packages/web-runtime/src/App.vue b/packages/web-runtime/src/App.vue
index c29845ee5a9..1b527cc0700 100644
--- a/packages/web-runtime/src/App.vue
+++ b/packages/web-runtime/src/App.vue
@@ -15,7 +15,7 @@ import ModalWrapper from './components/ModalWrapper.vue'
 import { useLayout } from './composables/layout'
 import { computed, defineComponent, unref, watch } from 'vue'
 import { additionalTranslations } from './helpers/additionalTranslations' // eslint-disable-line
-import { eventBus, useRouter, useStore, useThemeStore } from '@ownclouders/web-pkg'
+import { eventBus, useResourcesStore, useRouter, useThemeStore } from '@ownclouders/web-pkg'
 import { useHead } from './composables/head'
 import { RouteLocation } from 'vue-router'
 import { storeToRefs } from 'pinia'
@@ -26,7 +26,7 @@ export default defineComponent({
     ModalWrapper
   },
   setup() {
-    const store = useStore()
+    const resourcesStore = useResourcesStore()
     const themeStore = useThemeStore()
     const { currentTheme } = storeToRefs(themeStore)
 
@@ -58,7 +58,7 @@ export default defineComponent({
         /*
          * If app has been changed and no file context is set, we will reset current folder.
          */
-        store.commit('Files/SET_CURRENT_FOLDER', null)
+        resourcesStore.setCurrentFolder(null)
       }
     )
 
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 62d8d731e5c..7cc5e4b17e4 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -64,11 +64,11 @@ import {
   useClientService,
   useFileActions,
   useGetMatchingSpace,
-  useSpacesStore,
-  useStore
+  useResourcesStore,
+  useSpacesStore
 } from '@ownclouders/web-pkg'
-import { Resource } from '@ownclouders/web-client'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
+import { storeToRefs } from 'pinia'
 
 export default defineComponent({
   components: {
@@ -82,7 +82,6 @@ export default defineComponent({
     }
   },
   setup() {
-    const store = useStore()
     const { openEditor } = useFileActions()
     const clientService = useClientService()
     const { $gettext } = useGettext()
@@ -91,20 +90,19 @@ export default defineComponent({
     const spacesStore = useSpacesStore()
     const appsStore = useAppsStore()
 
+    const resourcesStore = useResourcesStore()
+    const { resources, currentFolder } = storeToRefs(resourcesStore)
+
     const applicationSwitcherLabel = computed(() => {
       return $gettext('Application Switcher')
     })
     const updateAppIcons = () => {
       appIconKey.value = uuid.v4().replaceAll('-', '')
     }
-    const currentFolder = computed(() => {
-      return store.getters['Files/currentFolder']
-    })
-    const files = computed((): Array<Resource> => store.getters['Files/files'])
 
     const onEditorApplicationClick = async (item: ApplicationInformation) => {
       let destinationSpace = unref(currentFolder) ? getMatchingSpace(unref(currentFolder)) : null
-      let destinationFiles = unref(files)
+      let destinationFiles = unref(resources)
       let filePath = unref(currentFolder)?.path
 
       if (!destinationSpace || !unref(currentFolder).canCreate()) {
diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
index 7d00ab01c56..64b95d0290a 100644
--- a/packages/web-runtime/src/components/Topbar/TopBar.vue
+++ b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -55,7 +55,6 @@ import {
   useConfigStore,
   useEmbedMode,
   useRouter,
-  useStore,
   useThemeStore
 } from '@ownclouders/web-pkg'
 import { isRuntimeRoute } from '../../router'
@@ -76,7 +75,6 @@ export default {
     }
   },
   setup(props) {
-    const store = useStore()
     const capabilityStore = useCapabilityStore()
     const themeStore = useThemeStore()
     const { currentTheme } = storeToRefs(themeStore)
@@ -137,7 +135,7 @@ export default {
           if (app.type === 'extension') {
             return (
               app.applicationMenu.enabled instanceof Function &&
-              app.applicationMenu.enabled(store, ability) &&
+              app.applicationMenu.enabled(ability) &&
               !permittedMenus.includes('user')
             )
           }
diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
index 5a0779d73da..4af8e25e1ad 100644
--- a/packages/web-runtime/src/container/bootstrap.ts
+++ b/packages/web-runtime/src/container/bootstrap.ts
@@ -2,7 +2,7 @@ import { registerClient } from '../services/clientRegistration'
 import { buildApplication, NextApplication } from './application'
 import { Store } from 'vuex'
 import { RouteLocationRaw, Router, RouteRecordNormalized } from 'vue-router'
-import { App, computed } from 'vue'
+import { App, computed, watch } from 'vue'
 import { loadTheme } from '../helpers/theme'
 import OwnCloud from 'owncloud-sdk'
 import { createGettext, GetTextOptions, Language } from 'vue3-gettext'
@@ -25,7 +25,9 @@ import {
   useConfigStore,
   ConfigStore,
   RawConfig,
-  useSharesStore
+  useSharesStore,
+  useResourcesStore,
+  ResourcesStore
 } from '@ownclouders/web-pkg'
 import { authService } from '../services/auth'
 import {
@@ -48,7 +50,6 @@ import {
 import { MESSAGE_TYPE } from '@ownclouders/web-client/src/sse'
 import { getQueryParam } from '../helpers/url'
 import { z } from 'zod'
-import { Resource } from '@ownclouders/web-client'
 import PQueue from 'p-queue'
 import { extractNodeId, extractStorageId } from '@ownclouders/web-client/src/helpers'
 import { storeToRefs } from 'pinia'
@@ -335,6 +336,7 @@ export const announcePiniaStores = () => {
   const configStore = useConfigStore()
   const messagesStore = useMessages()
   const modalStore = useModals()
+  const resourcesStore = useResourcesStore()
   const sharesStore = useSharesStore()
   const spacesStore = useSpacesStore()
   const userStore = useUserStore()
@@ -345,6 +347,7 @@ export const announcePiniaStores = () => {
     capabilityStore,
     extensionRegistry,
     configStore,
+    resourcesStore,
     messagesStore,
     modalStore,
     sharesStore,
@@ -658,21 +661,21 @@ const fileReadyEventSchema = z.object({
 })
 
 const onSSEProcessingFinishedEvent = ({
-  store,
+  resourcesStore,
   msg,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   clientService,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   resourceQueue
 }: {
-  store: Store<unknown>
+  resourcesStore: ResourcesStore
   msg: MessageEvent
   clientService: ClientService
   resourceQueue: PQueue
 }) => {
   try {
     const postProcessingData = fileReadyEventSchema.parse(JSON.parse(msg.data))
-    const currentFolder = store.getters['Files/currentFolder']
+    const currentFolder = resourcesStore.currentFolder
     if (!currentFolder) {
       return
     }
@@ -689,11 +692,9 @@ const onSSEProcessingFinishedEvent = ({
       }
     }
 
-    const isFileLoaded = !!(store.getters['Files/files'] as Resource[]).find(
-      (f) => f.id === postProcessingData.itemid
-    )
+    const isFileLoaded = !!resourcesStore.resources.find((f) => f.id === postProcessingData.itemid)
     if (isFileLoaded) {
-      store.commit('Files/UPDATE_RESOURCE_FIELD', {
+      resourcesStore.updateResourceField({
         id: postProcessingData.itemid,
         field: 'processing',
         value: false
@@ -706,7 +707,7 @@ const onSSEProcessingFinishedEvent = ({
       //     fileId: postProcessingData.itemid
       //   })
       //   resource.path = urlJoin(currentFolder.path, resource.name)
-      //   store.commit('Files/UPSERT_RESOURCE', resource)
+      //   resourcesStore.upsertResource(resource)
       // })
     }
   } catch (e) {
@@ -715,50 +716,52 @@ const onSSEProcessingFinishedEvent = ({
 }
 
 export const registerSSEEventListeners = ({
-  store,
+  resourcesStore,
   clientService,
   configStore
 }: {
-  store: Store<unknown>
+  resourcesStore: ResourcesStore
   clientService: ClientService
   configStore: ConfigStore
 }): void => {
   const resourceQueue = new PQueue({
     concurrency: configStore.options.concurrentRequests.sse
   })
-  store.watch(
-    (state, getters) => getters['Files/currentFolder'],
+
+  watch(
+    () => resourcesStore.currentFolder,
     () => {
       resourceQueue.clear()
     }
   )
+
   clientService.sseAuthenticated.addEventListener(MESSAGE_TYPE.POSTPROCESSING_FINISHED, (msg) =>
-    onSSEProcessingFinishedEvent({ store, msg, clientService, resourceQueue })
+    onSSEProcessingFinishedEvent({ resourcesStore, msg, clientService, resourceQueue })
   )
 }
 
-export const setViewOptions = ({ store }: { store: Store<unknown> }): void => {
+export const setViewOptions = ({ resourcesStore }: { resourcesStore: ResourcesStore }) => {
   /**
    *   Storage returns a string so we need to convert it into a boolean
    */
   const areHiddenFilesShown = window.localStorage.getItem('oc_hiddenFilesShown') || 'false'
   const areHiddenFilesShownBoolean = areHiddenFilesShown === 'true'
 
-  if (areHiddenFilesShownBoolean !== store.getters['Files/areHiddenFilesShown']) {
-    store.commit('Files/SET_HIDDEN_FILES_VISIBILITY', areHiddenFilesShownBoolean)
+  if (areHiddenFilesShownBoolean !== resourcesStore.areHiddenFilesShown) {
+    resourcesStore.setAreHiddenFilesShown(areHiddenFilesShownBoolean)
   }
 
   const areFileExtensionsShown = window.localStorage.getItem('oc_fileExtensionsShown') || 'true'
   const areFileExtensionsShownBoolean = areFileExtensionsShown === 'true'
 
-  if (areFileExtensionsShownBoolean !== store.getters['Files/areFileExtensionsShownBoolean']) {
-    store.commit('Files/SET_FILE_EXTENSIONS_VISIBILITY', areFileExtensionsShownBoolean)
+  if (areFileExtensionsShownBoolean !== resourcesStore.areFileExtensionsShown) {
+    resourcesStore.setAreFileExtensionsShown(areFileExtensionsShownBoolean)
   }
 
   const areWebDavDetailsShown = window.localStorage.getItem('oc_webDavDetailsShown') || 'false'
   const areWebDavDetailsShownBoolean = areWebDavDetailsShown === 'true'
 
-  if (areWebDavDetailsShownBoolean !== store.getters['Files/areWebDavDetailsShown']) {
-    store.commit('Files/SET_FILE_WEB_DAV_DETAILS_VISIBILITY', areWebDavDetailsShownBoolean)
+  if (areWebDavDetailsShownBoolean !== resourcesStore.areWebDavDetailsShown) {
+    resourcesStore.setAreWebDavDetailsShown(areWebDavDetailsShownBoolean)
   }
 }
diff --git a/packages/web-runtime/src/index.ts b/packages/web-runtime/src/index.ts
index a3922795a58..8e0e79942d7 100644
--- a/packages/web-runtime/src/index.ts
+++ b/packages/web-runtime/src/index.ts
@@ -57,7 +57,8 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
     capabilityStore,
     extensionRegistry,
     spacesStore,
-    userStore
+    userStore,
+    resourcesStore
   } = announcePiniaStores()
 
   app.provide('$router', router)
@@ -160,7 +161,7 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
 
   app.mount('#owncloud')
 
-  setViewOptions({ store })
+  setViewOptions({ resourcesStore })
 
   const applications = Array.from(applicationStore.values())
   applications.forEach((application) => application.mounted(app))
@@ -195,7 +196,7 @@ export const bootstrapApp = async (configurationPath: string): Promise<void> =>
 
       // Register SSE event listeners
       if (capabilityStore.supportSSE) {
-        registerSSEEventListeners({ store, clientService, configStore })
+        registerSSEEventListeners({ resourcesStore, clientService, configStore })
       }
 
       // Load spaces to make them available across the application
diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index 8b91ca771a6..7437898b9fa 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -151,8 +151,8 @@ import {
   useConfigStore,
   useMessages,
   useModals,
+  useResourcesStore,
   useSpacesStore,
-  useStore,
   useUserStore
 } from '@ownclouders/web-pkg'
 import { useTask } from 'vue-concurrency'
@@ -173,19 +173,20 @@ export default defineComponent({
     ThemeSwitcher
   },
   setup() {
-    const store = useStore()
     const { showMessage, showErrorMessage } = useMessages()
     const userStore = useUserStore()
     const authStore = useAuthStore()
     const language = useGettext()
     const { $gettext } = language
     const clientService = useClientService()
+    const resourcesStore = useResourcesStore()
+
     const valuesList = ref<SettingsValue[]>()
     const graphUser = ref<User>()
     const accountBundle = ref<SettingsBundle>()
     const selectedLanguageValue = ref<LanguageOption>()
     const disableEmailNotificationsValue = ref<boolean>()
-    const viewOptionWebDavDetailsValue = ref<boolean>(store.getters['Files/areWebDavDetailsShown'])
+    const viewOptionWebDavDetailsValue = ref<boolean>(resourcesStore.areWebDavDetailsShown)
     const { dispatchModal } = useModals()
     const spacesStore = useSpacesStore()
     const capabilityStore = useCapabilityStore()
@@ -392,7 +393,7 @@ export default defineComponent({
 
     const updateViewOptionsWebDavDetails = (option: boolean) => {
       try {
-        store.commit('Files/SET_FILE_WEB_DAV_DETAILS_VISIBILITY', option)
+        resourcesStore.setAreWebDavDetailsShown(option)
         viewOptionWebDavDetailsValue.value = option
         showMessage({ title: $gettext('Preference saved.') })
       } catch (e) {
diff --git a/packages/web-runtime/src/store/ancestorMetaData.ts b/packages/web-runtime/src/store/ancestorMetaData.ts
deleted file mode 100644
index 69fc5426f4c..00000000000
--- a/packages/web-runtime/src/store/ancestorMetaData.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import {
-  SpaceResource,
-  extractStorageId,
-  isMountPointSpaceResource,
-  isProjectSpaceResource
-} from '@ownclouders/web-client/src/helpers'
-import { DavProperty } from '@ownclouders/web-client/src/webdav/constants'
-import { getParentPaths } from '@ownclouders/web-pkg'
-import { AncestorMetaData } from '@ownclouders/web-pkg'
-
-const state = {
-  ancestorMetaData: {}
-}
-
-const getters = {
-  ancestorMetaData: (state) => {
-    return state.ancestorMetaData
-  }
-}
-
-const mutations = {
-  SET_ANCESTOR_META_DATA(state, value) {
-    state.ancestorMetaData = value
-  },
-
-  UPDATE_ANCESTOR_FIELD(state, params) {
-    const resource = state.ancestorMetaData[params.path] ?? null
-    if (resource) {
-      resource[params.field] = params.value
-    }
-  }
-}
-
-const actions = {
-  loadAncestorMetaData(
-    { commit, state },
-    { folder, space, client, userStore, spacesStore, configStore }
-  ) {
-    const ancestorMetaData: AncestorMetaData = {
-      [folder.path]: {
-        id: folder.fileId,
-        shareTypes: folder.shareTypes,
-        parentFolderId: folder.parentFolderId,
-        spaceId: space.id,
-        path: folder.path
-      }
-    }
-    const promises = []
-    const davProperties = [DavProperty.FileId, DavProperty.ShareTypes, DavProperty.FileParent]
-    const parentPaths = getParentPaths(folder.path)
-    const spaces = spacesStore.spaces as SpaceResource[]
-
-    const getMountPoints = () =>
-      spaces.filter(
-        (s) =>
-          isMountPointSpaceResource(s) && extractStorageId(s.root.remoteItem.rootId) === space.id
-      )
-
-    let fullyAccessibleSpace = true
-    if (configStore.options.routing.fullShareOwnerPaths) {
-      // keep logic in sync with "isResourceAccessible" from useGetMatchingSpace
-      const projectSpace = spaces.find((s) => isProjectSpaceResource(s) && s.id === space.id)
-      fullyAccessibleSpace = space.isOwner(userStore.user) || projectSpace?.isMember(userStore.user)
-    }
-
-    for (const path of parentPaths) {
-      const cachedData = state.ancestorMetaData[path] ?? null
-      if (cachedData?.spaceId === space.id) {
-        ancestorMetaData[path] = cachedData
-        continue
-      }
-
-      // keep logic in sync with "isResourceAccessible" from useGetMatchingSpace
-      if (
-        !fullyAccessibleSpace &&
-        !getMountPoints().find((m) => path.startsWith(m.root.remoteItem.path))
-      ) {
-        // no access to the parent resource
-        break
-      }
-
-      promises.push(
-        client.listFiles(space, { path }, { depth: 0, davProperties }).then(({ resource }) => {
-          ancestorMetaData[path] = {
-            id: resource.fileId,
-            shareTypes: resource.shareTypes,
-            parentFolderId: resource.parentFolderId,
-            spaceId: space.id,
-            path
-          }
-        })
-      )
-    }
-
-    return Promise.all(promises).then(() => {
-      commit('SET_ANCESTOR_META_DATA', ancestorMetaData)
-    })
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  actions,
-  mutations,
-  getters
-}
diff --git a/packages/web-runtime/src/store/index.ts b/packages/web-runtime/src/store/index.ts
index 3fa7b3b3df3..6f9f5875e28 100644
--- a/packages/web-runtime/src/store/index.ts
+++ b/packages/web-runtime/src/store/index.ts
@@ -1,10 +1,6 @@
-import ancestorMetaData from './ancestorMetaData'
-
 const runtime = {
   namespaced: true,
-  modules: {
-    ancestorMetaData
-  }
+  modules: {}
 }
 
 export default {
diff --git a/packages/web-runtime/tests/unit/components/Account/GdprExport.spec.ts b/packages/web-runtime/tests/unit/components/Account/GdprExport.spec.ts
index 7c38e7153bc..1c1fd1ed299 100644
--- a/packages/web-runtime/tests/unit/components/Account/GdprExport.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Account/GdprExport.spec.ts
@@ -1,11 +1,5 @@
 import GdprExport from 'web-runtime/src/components/Account/GdprExport.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, shallowMount } from 'web-test-helpers'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { ClientService } from '@ownclouders/web-pkg'
 import { Resource } from '@ownclouders/web-client/src'
@@ -80,14 +74,14 @@ function getWrapper(resource = undefined) {
   }
   const mocks = defaultComponentMocks()
   mocks.$clientService = clientService
-  const store = createStore(defaultStoreMockOptions)
+
   return {
     mocks,
     wrapper: shallowMount(GdprExport, {
       global: {
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-runtime/tests/unit/components/Avatar.spec.ts b/packages/web-runtime/tests/unit/components/Avatar.spec.ts
index be925b23db6..4b1e2030bdf 100644
--- a/packages/web-runtime/tests/unit/components/Avatar.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Avatar.spec.ts
@@ -1,11 +1,5 @@
 import Avatar from 'web-runtime/src/components/Avatar.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, shallowMount } from 'web-test-helpers'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { CapabilityStore, ClientService } from '@ownclouders/web-pkg'
 import { AxiosResponse } from 'axios'
@@ -98,8 +92,6 @@ function getShallowWrapper(loading = false, clientService = undefined) {
     clientService.httpAuthenticated.get.mockResolvedValue(mock<AxiosResponse>({ status: 200 }))
   }
   mocks.$clientService = clientService
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const capabilities = {
     files_sharing: { user: { profile_picture: true } }
   } satisfies Partial<CapabilityStore['capabilities']>
@@ -114,7 +106,7 @@ function getShallowWrapper(loading = false, clientService = undefined) {
       },
       global: {
         mocks,
-        plugins: [...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } }), store]
+        plugins: [...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } })]
       }
     })
   }
diff --git a/packages/web-runtime/tests/unit/components/MobileNav.spec.ts b/packages/web-runtime/tests/unit/components/MobileNav.spec.ts
index 3f27a464d72..b6ab0952506 100644
--- a/packages/web-runtime/tests/unit/components/MobileNav.spec.ts
+++ b/packages/web-runtime/tests/unit/components/MobileNav.spec.ts
@@ -1,11 +1,5 @@
 import MobileNav from '../../../src/components/MobileNav.vue'
-import {
-  createStore,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  defaultComponentMocks,
-  mount
-} from 'web-test-helpers'
+import { defaultPlugins, defaultComponentMocks, mount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { NavItem } from 'web-runtime/src/helpers/navItems'
 
@@ -35,17 +29,14 @@ function getWrapper() {
   const mocks = {
     ...defaultComponentMocks()
   }
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  const store = createStore(storeOptions)
+
   return {
     wrapper: mount(MobileNav, {
       props: {
         navItems
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks
       }
     })
diff --git a/packages/web-runtime/tests/unit/components/ModalWrapper.spec.ts b/packages/web-runtime/tests/unit/components/ModalWrapper.spec.ts
index 50c42e46628..9e7268e6353 100644
--- a/packages/web-runtime/tests/unit/components/ModalWrapper.spec.ts
+++ b/packages/web-runtime/tests/unit/components/ModalWrapper.spec.ts
@@ -2,13 +2,7 @@ import { Modal, useModals } from '@ownclouders/web-pkg'
 import { mock } from 'jest-mock-extended'
 import { PropType, defineComponent } from 'vue'
 import ModalWrapper from 'web-runtime/src/components/ModalWrapper.vue'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount, defaultComponentMocks } from 'web-test-helpers'
 
 const CustomModalComponent = defineComponent({
   name: 'CustomModalComponent',
@@ -134,15 +128,12 @@ describe('ModalWrapper', () => {
 })
 
 function getShallowWrapper({ modals = [] } = {}) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
-
   const mocks = defaultComponentMocks()
 
   return {
     wrapper: shallowMount(ModalWrapper, {
       global: {
-        plugins: [...defaultPlugins({ piniaOptions: { modalsState: { modals } } }), store],
+        plugins: [...defaultPlugins({ piniaOptions: { modalsState: { modals } } })],
         renderStubDefaultSlot: true,
         mocks,
         provide: mocks,
diff --git a/packages/web-runtime/tests/unit/components/SidebarNav/SidebarNavItem.spec.ts b/packages/web-runtime/tests/unit/components/SidebarNav/SidebarNavItem.spec.ts
index cee6f9cdb17..96d544ddf23 100644
--- a/packages/web-runtime/tests/unit/components/SidebarNav/SidebarNavItem.spec.ts
+++ b/packages/web-runtime/tests/unit/components/SidebarNav/SidebarNavItem.spec.ts
@@ -1,6 +1,6 @@
 import SidebarNavItem from 'web-runtime/src/components/SidebarNav/SidebarNavItem.vue'
 import sidebarNavItemFixtures from '../../../__fixtures__/sidebarNavItems'
-import { createStore, defaultPlugins, mount, defaultStoreMockOptions } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 
 const exampleNavItem = sidebarNavItemFixtures[0]
 
@@ -26,8 +26,6 @@ describe('OcSidebarNav', () => {
 })
 
 function getWrapper(collapsed) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   return {
     wrapper: mount(SidebarNavItem, {
       props: {
@@ -35,7 +33,7 @@ function getWrapper(collapsed) {
         collapsed
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         stubs: { 'router-link': true }
       }
     })
diff --git a/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
index 5632d02a6fc..41198236d65 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Topbar/ApplicationsMenu.spec.ts
@@ -1,10 +1,8 @@
 import ApplicationsMenu from 'web-runtime/src/components/Topbar/ApplicationsMenu.vue'
 import {
   RouteLocation,
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   shallowMount
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
@@ -38,11 +36,6 @@ describe('ApplicationsMenu component', () => {
 })
 
 function getWrapper(applicationsList = []) {
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: { ...defaultStoreMockOptions.modules, user: { state: { id: 'alice', uuid: 1 } } }
-  }
-  const store = createStore(storeOptions)
   const mocks = {
     ...defaultComponentMocks({
       currentRoute: mock<RouteLocation>({ query: { app: 'admin-settings' } })
@@ -59,7 +52,7 @@ function getWrapper(applicationsList = []) {
         renderStubDefaultSlot: true,
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-runtime/tests/unit/components/Topbar/NotificationBell.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/NotificationBell.spec.ts
index 8317ab47a97..f8632090fff 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/NotificationBell.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Topbar/NotificationBell.spec.ts
@@ -1,11 +1,5 @@
 import NotificationBell from 'web-runtime/src/components/Topbar/NotificationBell.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  defaultStoreMockOptions,
-  mount
-} from 'web-test-helpers/src'
+import { defaultComponentMocks, defaultPlugins, mount } from 'web-test-helpers/src'
 
 describe('NotificationBell', () => {
   it('should match snapshot', () => {
@@ -42,17 +36,13 @@ describe('NotificationBell', () => {
 })
 function getWrapper({ mountType = mount, mocks = {} } = {}) {
   const localMocks = { ...defaultComponentMocks(), ...mocks }
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  const store = createStore(storeOptions)
+
   return {
     mocks: localMocks,
-    storeOptions,
     wrapper: mountType(NotificationBell, {
       global: {
         renderStubDefaultSlot: true,
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks: localMocks,
         stubs: { 'oc-icon': true }
       }
diff --git a/packages/web-runtime/tests/unit/components/Topbar/Notifications.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/Notifications.spec.ts
index 2b8f42b425b..67e55e07b51 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/Notifications.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Topbar/Notifications.spec.ts
@@ -1,13 +1,7 @@
 import Notifications from 'web-runtime/src/components/Topbar/Notifications.vue'
 import { Notification, NotificationAction } from 'web-runtime/src/helpers/notifications'
 import { mock, mockDeep } from 'jest-mock-extended'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, shallowMount } from 'web-test-helpers'
 import { OwnCloudSdk } from '@ownclouders/web-client/src/types'
 import { SpaceResource } from '@ownclouders/web-client'
 
@@ -240,15 +234,12 @@ function getWrapper({ mocks = {}, notifications = [], spaces = [] } = {}) {
   clientMock.requests.ocs.mockResolvedValue(mockDeep<Response>(jsonResponse))
   localMocks.$clientService.owncloudSdk = clientMock
 
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   return {
     mocks: localMocks,
-    storeOptions,
     wrapper: shallowMount(Notifications, {
       global: {
         renderStubDefaultSlot: true,
-        plugins: [...defaultPlugins({ piniaOptions: { spacesState: { spaces } } }), store],
+        plugins: [...defaultPlugins({ piniaOptions: { spacesState: { spaces } } })],
         mocks: localMocks,
         provide: localMocks,
         stubs: { 'avatar-image': true, OcButton: false }
diff --git a/packages/web-runtime/tests/unit/components/Topbar/SidebarToggle.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/SidebarToggle.spec.ts
index b5919497c2a..377dff585ff 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/SidebarToggle.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Topbar/SidebarToggle.spec.ts
@@ -1,12 +1,6 @@
 import SidebarToggle from '../../../../src/components/Topbar/SideBarToggle.vue'
 import { eventBus } from '@ownclouders/web-pkg/src/services'
-import {
-  createStore,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, mount, defaultComponentMocks } from 'web-test-helpers'
 
 const selectors = {
   toggleSidebarBtn: '#files-toggle-sidebar'
@@ -30,17 +24,14 @@ describe('SidebarToggle component', () => {
 })
 
 function getWrapper({ isSideBarOpen = false } = {}) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks()
   return {
-    storeOptions,
     mocks,
     wrapper: mount(SidebarToggle, {
       props: { isSideBarOpen },
       global: {
         mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-runtime/tests/unit/components/UploadInfo.spec.ts b/packages/web-runtime/tests/unit/components/UploadInfo.spec.ts
index 34ed720245a..3b516c64608 100644
--- a/packages/web-runtime/tests/unit/components/UploadInfo.spec.ts
+++ b/packages/web-runtime/tests/unit/components/UploadInfo.spec.ts
@@ -1,11 +1,5 @@
 import UploadInfo from '../../../src/components/UploadInfo.vue'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions,
-  defaultComponentMocks
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount, defaultComponentMocks } from 'web-test-helpers'
 
 const selectors = {
   overlay: '#upload-info',
@@ -231,13 +225,9 @@ function getShallowWrapper({
   const mocks = {
     ...defaultComponentMocks()
   }
-  const storeOptions = {
-    ...defaultStoreMockOptions
-  }
-  const store = createStore(storeOptions)
+
   return {
     mocks,
-    storeOptions,
     wrapper: shallowMount(UploadInfo, {
       data() {
         return {
@@ -254,7 +244,7 @@ function getShallowWrapper({
         }
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         mocks
       }
     })
diff --git a/packages/web-runtime/tests/unit/pages/accessDenied.spec.ts b/packages/web-runtime/tests/unit/pages/accessDenied.spec.ts
index 16c86f5ceb7..d3b0e9131d6 100644
--- a/packages/web-runtime/tests/unit/pages/accessDenied.spec.ts
+++ b/packages/web-runtime/tests/unit/pages/accessDenied.spec.ts
@@ -1,11 +1,5 @@
 import accessDenied from '../../../src/pages/accessDenied.vue'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultPlugins,
-  mount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultComponentMocks, defaultPlugins, mount } from 'web-test-helpers'
 
 const selectors = {
   logInAgainButton: '#exitAnchor'
@@ -35,19 +29,12 @@ function getWrapper({ loginUrl = '' } = {}) {
   const mocks = {
     ...defaultComponentMocks()
   }
-  const storeOptions = { ...defaultStoreMockOptions }
-
-  const store = createStore(storeOptions)
 
   return {
-    storeOptions,
     mocks,
     wrapper: mount(accessDenied, {
       global: {
-        plugins: [
-          ...defaultPlugins({ piniaOptions: { configState: { options: { loginUrl } } } }),
-          store
-        ],
+        plugins: [...defaultPlugins({ piniaOptions: { configState: { options: { loginUrl } } } })],
         mocks,
         provide: mocks
       }
diff --git a/packages/web-runtime/tests/unit/pages/account.spec.ts b/packages/web-runtime/tests/unit/pages/account.spec.ts
index bba947bf982..665f427a460 100644
--- a/packages/web-runtime/tests/unit/pages/account.spec.ts
+++ b/packages/web-runtime/tests/unit/pages/account.spec.ts
@@ -1,16 +1,14 @@
 import account from '../../../src/pages/account.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
   mockAxiosResolve,
   shallowMount,
-  defaultStoreMockOptions,
   mockAxiosReject
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { AxiosResponse } from 'axios'
-import { useMessages } from '@ownclouders/web-pkg'
+import { useMessages, useResourcesStore } from '@ownclouders/web-pkg'
 import { SettingsBundle, SettingsValue } from 'web-runtime/src/helpers/settings'
 import { User } from '@ownclouders/web-client/src/generated'
 
@@ -160,7 +158,6 @@ describe('account page', () => {
         await wrapper.vm.loadValuesListTask.last
         await wrapper.vm.loadGraphUserTask.last
 
-        console.log(wrapper.html())
         const editPasswordButton = wrapper.find(selectors.editPasswordButton)
         expect(editPasswordButton.exists()).toBeTruthy()
       })
@@ -243,7 +240,7 @@ describe('account page', () => {
 
   describe('Method "updateViewOptionsWebDavDetails', () => {
     it('should show a message on success', async () => {
-      const { wrapper, storeOptions } = getWrapper({})
+      const { wrapper } = getWrapper({})
 
       await wrapper.vm.loadAccountBundleTask.last
       await wrapper.vm.loadValuesListTask.last
@@ -252,9 +249,9 @@ describe('account page', () => {
       await wrapper.vm.updateViewOptionsWebDavDetails(true)
       const { showMessage } = useMessages()
       expect(showMessage).toHaveBeenCalled()
-      expect(
-        storeOptions.modules.Files.mutations.SET_FILE_WEB_DAV_DETAILS_VISIBILITY
-      ).toHaveBeenCalled()
+
+      const { setAreWebDavDetailsShown } = useResourcesStore()
+      expect(setAreWebDavDetailsShown).toHaveBeenCalled()
     })
   })
 })
@@ -267,9 +264,6 @@ function getWrapper({
   isPublicLinkContext = false,
   isUserContext = true
 } = {}) {
-  const storeOptions = { ...defaultStoreMockOptions }
-  const store = createStore(storeOptions)
-
   const mocks = {
     ...defaultComponentMocks(),
     $route
@@ -292,7 +286,6 @@ function getWrapper({
   )
 
   return {
-    storeOptions,
     mocks,
     wrapper: shallowMount(account, {
       global: {
@@ -313,8 +306,7 @@ function getWrapper({
                 }
               }
             }
-          }),
-          store
+          })
         ],
         mocks,
         provide: mocks,
diff --git a/packages/web-runtime/tests/unit/pages/resolvePrivateLink.spec.ts b/packages/web-runtime/tests/unit/pages/resolvePrivateLink.spec.ts
index 6023cc44f85..c04daa4daad 100644
--- a/packages/web-runtime/tests/unit/pages/resolvePrivateLink.spec.ts
+++ b/packages/web-runtime/tests/unit/pages/resolvePrivateLink.spec.ts
@@ -1,11 +1,5 @@
 import resolvePrivateLink from '../../../src/pages/resolvePrivateLink.vue'
-import {
-  defaultPlugins,
-  defaultComponentMocks,
-  createStore,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultPlugins, defaultComponentMocks, shallowMount } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { queryItemAsString, useGetResourceContext } from '@ownclouders/web-pkg'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
@@ -142,8 +136,6 @@ function getWrapper({
   })
 
   const mocks = { ...defaultComponentMocks() }
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   return {
     mocks,
@@ -152,8 +144,7 @@ function getWrapper({
         plugins: [
           ...defaultPlugins({
             piniaOptions: { configState: { options: { openLinksWithDefaultApp } } }
-          }),
-          store
+          })
         ],
         mocks,
         provide: mocks
diff --git a/packages/web-runtime/tests/unit/pages/resolvePublicLink.spec.ts b/packages/web-runtime/tests/unit/pages/resolvePublicLink.spec.ts
index e9d786b1b7f..9908c146b0e 100644
--- a/packages/web-runtime/tests/unit/pages/resolvePublicLink.spec.ts
+++ b/packages/web-runtime/tests/unit/pages/resolvePublicLink.spec.ts
@@ -1,11 +1,5 @@
 import ResolvePublicLink from '../../../src/pages/resolvePublicLink.vue'
-import {
-  defaultPlugins,
-  defaultComponentMocks,
-  createStore,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultPlugins, defaultComponentMocks, shallowMount } from 'web-test-helpers'
 import { mockDeep } from 'jest-mock-extended'
 import { CapabilityStore, ClientService } from '@ownclouders/web-pkg'
 import { Resource } from '@ownclouders/web-client'
@@ -78,8 +72,6 @@ function getWrapper({ passwordRequired = false } = {}) {
   $clientService.owncloudSdk.shares.getProtectedTokenInfo.mockResolvedValue(tokenInfo)
   const mocks = { ...defaultComponentMocks(), $clientService }
 
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const capabilities = {
     files_sharing: { federation: { incoming: true, outgoing: true } }
   } satisfies Partial<CapabilityStore['capabilities']>
@@ -87,10 +79,7 @@ function getWrapper({ passwordRequired = false } = {}) {
   return {
     wrapper: shallowMount(ResolvePublicLink, {
       global: {
-        plugins: [
-          ...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } }),
-          store
-        ],
+        plugins: [...defaultPlugins({ piniaOptions: { capabilityState: { capabilities } } })],
         mocks,
         provide: mocks
       }
diff --git a/packages/web-test-helpers/src/helpers.ts b/packages/web-test-helpers/src/helpers.ts
index beb8aad178b..5d2c1caefca 100644
--- a/packages/web-test-helpers/src/helpers.ts
+++ b/packages/web-test-helpers/src/helpers.ts
@@ -1,4 +1,3 @@
-import { createStore as _createStore, StoreOptions } from 'vuex'
 import { mount } from '@vue/test-utils'
 import { defineComponent } from 'vue'
 import { defaultPlugins, DefaultPluginsOptions } from './defaultPlugins'
@@ -9,22 +8,16 @@ export { mount, shallowMount } from '@vue/test-utils'
 
 jest.spyOn(console, 'warn').mockImplementation(() => undefined)
 
-export const createStore = <T>(storeOptions: StoreOptions<T>) => {
-  return _createStore(storeOptions)
-}
-
 export const getComposableWrapper = <T>(
   setup: any,
   {
     mocks = undefined,
     provide = undefined,
-    store = undefined,
     template = undefined,
     pluginOptions = undefined
   }: {
     mocks?: Record<string, unknown>
     provide?: Record<string, unknown>
-    store?: StoreOptions<T>
     template?: string
     pluginOptions?: DefaultPluginsOptions
   } = {}
@@ -36,7 +29,7 @@ export const getComposableWrapper = <T>(
     }),
     {
       global: {
-        plugins: [...defaultPlugins(pluginOptions), store],
+        plugins: [...defaultPlugins(pluginOptions)],
         ...(mocks && { mocks }),
         ...(provide && { provide })
       }
diff --git a/packages/web-test-helpers/src/index.ts b/packages/web-test-helpers/src/index.ts
index 64be67127ae..9150ca3515c 100644
--- a/packages/web-test-helpers/src/index.ts
+++ b/packages/web-test-helpers/src/index.ts
@@ -1,5 +1,4 @@
 export * from './mocks/defaultComponentMocks'
-export * from './mocks/store/defaultStoreMockOptions'
 export * from './mocks/defaultStubs'
 export * from './mocks'
 export * from './defaultPlugins'
diff --git a/packages/web-test-helpers/src/mocks/pinia.ts b/packages/web-test-helpers/src/mocks/pinia.ts
index 1c70cca8e21..6c7122ccb3f 100644
--- a/packages/web-test-helpers/src/mocks/pinia.ts
+++ b/packages/web-test-helpers/src/mocks/pinia.ts
@@ -7,7 +7,11 @@ import { mock } from 'jest-mock-extended'
 import { SpaceResource } from '../../../web-client/src'
 import { OptionsConfig } from '../../../web-pkg/src/composables/piniaStores/config/types'
 import { Resource, Share } from '../../../web-client/src/helpers'
-import { ApplicationFileExtension, ClipboardActions } from '../../../web-pkg/types'
+import {
+  AncestorMetaData,
+  ApplicationFileExtension,
+  ClipboardActions
+} from '../../../web-pkg/types'
 
 export { createTestingPinia }
 
@@ -28,6 +32,13 @@ export type PiniaMockOptions = {
   }
   messagesState?: { messages?: Message[] }
   modalsState?: { modals?: Modal[] }
+  resourcesStore?: {
+    resources?: Resource[]
+    currentFolder?: Resource
+    ancestorMetaData?: AncestorMetaData
+    selectedIds?: string[]
+    areFileExtensionsShown?: boolean
+  }
   sharesState?: { shares?: Share[]; loading?: boolean }
   spacesState?: { spaces?: SpaceResource[]; spaceMembers?: Share[] }
   userState?: { user?: User }
@@ -46,6 +57,7 @@ export function createMockStore({
   themeState = {},
   messagesState = {},
   modalsState = {},
+  resourcesStore = {},
   sharesState = {},
   spacesState = {},
   userState = {},
@@ -91,6 +103,7 @@ export function createMockStore({
         availableThemes: defaultOwnCloudTheme.themes,
         ...themeState
       },
+      resources: { resources: [], ...resourcesStore },
       shares: { shares: [], ...sharesState },
       spaces: { spaces: [], spaceMembers: [], ...spacesState },
       user: { user: { ...mock<User>({ id: '1' }), ...(userState?.user && { ...userState.user }) } },
diff --git a/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts b/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts
deleted file mode 100644
index 4fb9a6d6337..00000000000
--- a/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { filesModuleMockOptions } from './filesModuleMockOptions'
-import { runtimeModuleMockOptions } from './runtimeModuleMockOptions'
-
-export const defaultStoreMockOptions = {
-  commit: jest.fn(),
-  modules: {
-    ...filesModuleMockOptions,
-    ...runtimeModuleMockOptions,
-    External: {
-      getters: {
-        mimeTypes: jest.fn(() => ({}))
-      }
-    }
-  }
-} // FIXME: when we switch to TypeScript 4.9: satisfies StoreOptionsExtended<any>
diff --git a/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts b/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts
deleted file mode 100644
index 8e2df981574..00000000000
--- a/packages/web-test-helpers/src/mocks/store/filesModuleMockOptions.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export const filesModuleMockOptions = {
-  Files: {
-    namespaced: true,
-    state: {
-      currentFolder: undefined,
-      latestSelectedId: undefined,
-      areFileExtensionsShown: undefined
-    },
-    getters: {
-      currentFolder: jest.fn(),
-      files: jest.fn(() => []),
-      activeFiles: jest.fn(),
-      selectedFiles: jest.fn(() => [])
-    },
-    mutations: {
-      SET_FILE_SELECTION: jest.fn(),
-      ADD_FILE_SELECTION: jest.fn(),
-      SET_SELECTED_IDS: jest.fn(),
-      RENAME_FILE: jest.fn(),
-      SET_HIDDEN_FILES_VISIBILITY: jest.fn(),
-      SET_FILE_EXTENSIONS_VISIBILITY: jest.fn(),
-      SET_FILE_WEB_DAV_DETAILS_VISIBILITY: jest.fn(),
-      UPSERT_RESOURCE: jest.fn(),
-      CLEAR_CURRENT_FILES_LIST: jest.fn(),
-      SET_CURRENT_FOLDER: jest.fn(),
-      LOAD_FILES: jest.fn(),
-      UPDATE_RESOURCE_FIELD: jest.fn(),
-      REMOVE_FILE: jest.fn(),
-      REMOVE_FILES: jest.fn(),
-      RESET_SELECTION: jest.fn(),
-      SET_LATEST_SELECTED_FILE_ID: jest.fn()
-    },
-    actions: {
-      deleteFiles: jest.fn(),
-      loadIndicators: jest.fn(),
-      clearTrashBin: jest.fn(),
-      removeFilesFromTrashbin: jest.fn(),
-      resetFileSelection: jest.fn(),
-      toggleFileSelection: jest.fn()
-    }
-  }
-}
diff --git a/packages/web-test-helpers/src/mocks/store/runtimeModuleMockOptions.ts b/packages/web-test-helpers/src/mocks/store/runtimeModuleMockOptions.ts
deleted file mode 100644
index ed0c6a5dd29..00000000000
--- a/packages/web-test-helpers/src/mocks/store/runtimeModuleMockOptions.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export const runtimeModuleMockOptions = {
-  runtime: {
-    namespaced: true,
-    modules: {
-      ancestorMetaData: {
-        namespaced: true,
-        getters: {
-          ancestorMetaData: jest.fn(() => ({}))
-        }
-      }
-    }
-  }
-}