diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
index f132e33866..76f6aa8c1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
@@ -173,22 +173,22 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import AgreementPeriods from './AgreementPeriods.vue'
 import AgreementUserRoles from './AgreementUserRoles.vue'
 import AgreementLicenses from './AgreementLicenses.vue'
 import AgreementRelationships from './AgreementRelationships.vue'
 import AgreementDocuments from './AgreementDocuments.vue'
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
 import { setMessage, setError, setWarning } from "../../messages"
 import { fetchAgreement } from '../../fetch'
 import { storeToRefs } from "pinia"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore()
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
-        const AVStore = useAVStore()
+
+        const AVStore = inject('AVStore')
         const {
             av_agreement_statuses,
             av_agreement_closure_reasons,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
index 7ef575d46b..432ed92ba9 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
@@ -34,19 +34,18 @@
 <script>
 import flatPickr from 'vue-flatpickr-component'
 import Toolbar from "./AgreementsToolbar.vue"
-import { createVNode, render } from 'vue'
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
+import { inject, createVNode, render } from 'vue'
 import { storeToRefs } from "pinia"
 import { fetchAgreements } from "../../fetch"
 import { useDataTable, build_url } from "../../composables/datatables"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore()
+
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av, map_av_dt_filter } = AVStore
 
         const table_id = "agreement_list"
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
index a1f1441096..dc41214f61 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
@@ -299,7 +299,7 @@
 </template>
 
 <script>
-import { useAVStore } from "../../stores/authorised_values"
+import { inject } from 'vue'
 import { fetchAgreement } from "../../fetch"
 
 export default {
@@ -307,7 +307,7 @@ export default {
         const format_date = $date
         const patron_to_html = $patron_to_html
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av } = AVStore
 
         return {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Dialog.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Dialog.vue
index 58198f534c..829cea3b76 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Dialog.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Dialog.vue
@@ -15,11 +15,11 @@
 </template>
 
 <script>
+import { inject } from "vue"
 import { storeToRefs } from "pinia"
-import { useMainStore } from "../../stores/main"
 export default {
     setup() {
-        const mainStore = useMainStore()
+        const mainStore = inject("mainStore")
         const { message, error, warning } = storeToRefs(mainStore)
         const { removeMessages } = mainStore
         return { message, error, warning, removeMessages }
@@ -42,4 +42,4 @@ export default {
     float: right;
     cursor: pointer;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
index 39bcb047ae..f256be8464 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue
@@ -59,14 +59,13 @@
 
 <script>
 
-import { createVNode, render } from 'vue'
-import { useAVStore } from "../../stores/authorised_values"
+import { inject, createVNode, render } from 'vue'
 import { storeToRefs } from "pinia"
 import { useDataTable } from "../../composables/datatables"
 
 export default {
     setup() {
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { av_title_publication_types } = storeToRefs(AVStore)
         const { get_lib_from_av, map_av_dt_filter } = AVStore
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
index 0512555312..d460fdde49 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue
@@ -60,19 +60,17 @@
 </template>
 
 <script>
-import { createVNode, render } from 'vue'
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
+import { inject, createVNode, render } from 'vue'
 import { storeToRefs } from "pinia"
 import { fetchCountLocalPackages } from './../../fetch'
 import { useDataTable, build_url_params, build_url } from "../../composables/datatables"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore() // FIXME We only need that for 'manual'
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { av_package_types, av_package_content_types } = storeToRefs(AVStore)
         const { get_lib_from_av, map_av_dt_filter } = AVStore
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
index c4271092dd..007d84530d 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue
@@ -103,16 +103,16 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import EHoldingsPackageAgreements from "./EHoldingsEBSCOPackageAgreements.vue"
 import EHoldingsPackageTitlesList from "./EHoldingsEBSCOPackageTitlesList.vue"
-import { useAVStore } from "../../stores/authorised_values"
 import { fetchEBSCOPackage, checkError } from "../../fetch"
 
 export default {
     setup() {
         const format_date = $date
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av } = AVStore
 
         return {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue
index 766a402a31..ea0b98acbf 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue
@@ -112,8 +112,8 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import { fetchEBSCOResource } from "../../fetch"
-import { useVendorStore } from "../../stores/vendors"
 import { storeToRefs } from "pinia"
 import { checkError } from '../../fetch.js'
 
@@ -121,7 +121,7 @@ export default {
     setup() {
         const format_date = $date
 
-        const vendorStore = useVendorStore()
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
         return {
             format_date,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
index 15d5707d94..3ef70843e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue
@@ -66,19 +66,17 @@
 </template>
 
 <script>
-import { createVNode, render } from 'vue'
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
+import { inject, createVNode, render } from 'vue'
 import { storeToRefs } from "pinia"
 import { fetchCountLocalTitles } from "./../../fetch"
 import { useDataTable, build_url_params, build_url } from "../../composables/datatables"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore()
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { av_title_publication_types } = storeToRefs(AVStore)
         const { get_lib_from_av } = AVStore
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue
index 89671eac46..c551b831c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue
@@ -243,12 +243,12 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import EHoldingsTitlePackagesList from "./EHoldingsEBSCOTitlePackagesList.vue"
 import { fetchEBSCOTitle } from "../../fetch"
-import { useAVStore } from "../../stores/authorised_values"
 export default {
     setup() {
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av } = AVStore
 
         return {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue
index ace4ea64ef..ca5e598a39 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue
@@ -6,13 +6,12 @@
 
 <script>
 
-import { createVNode, render } from 'vue'
-import { useAVStore } from "../../stores/authorised_values"
+import { inject, createVNode, render } from 'vue'
 import { useDataTable } from "../../composables/datatables"
 
 export default {
     setup() {
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av, map_av_dt_filter } = AVStore
 
         const table_id = "title_list"
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
index 433c3e1a58..e775ab7cbe 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
@@ -85,18 +85,17 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import EHoldingsPackageAgreements from "./EHoldingsLocalPackageAgreements.vue"
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
 import { setMessage, setError, setWarning } from "../../messages"
 import { fetchLocalPackage, createPackage, editPackage } from '../../fetch'
 import { storeToRefs } from "pinia"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore()
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const {
             av_package_types,
             av_package_content_types,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
index 3994134886..e39197aa12 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue
@@ -15,19 +15,17 @@
 
 <script>
 import Toolbar from "./EHoldingsLocalPackagesToolbar.vue"
-import { createVNode, render } from 'vue'
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
+import { inject, createVNode, render } from 'vue'
 import { storeToRefs } from "pinia"
 import { fetchLocalPackages } from "../../fetch"
 import { useDataTable } from "../../composables/datatables"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore() // FIXME We only need that for 'manual'
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av, map_av_dt_filter } = AVStore
 
         const table_id = "package_list"
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
index 45e1ec0997..f6cbc55f93 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue
@@ -104,15 +104,15 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import EHoldingsPackageTitlesList from "./EHoldingsLocalPackageTitlesList.vue"
-import { useAVStore } from "../../stores/authorised_values"
 import { fetchLocalPackage } from "../../fetch"
 
 export default {
     setup() {
         const format_date = $date
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av } = AVStore
 
         return {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue
index 00b2c94dad..259dc8bf12 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue
@@ -95,14 +95,14 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import { fetchLocalResource } from "../../fetch"
-import { useVendorStore } from "../../stores/vendors"
 import { storeToRefs } from "pinia"
 export default {
     setup() {
         const format_date = $date
 
-        const vendorStore = useVendorStore()
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
         return {
             format_date,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue
index 8d8c993502..9afea2ef56 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue
@@ -379,8 +379,7 @@
 </template>
 
 <script>
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
+import { inject } from 'vue'
 import EHoldingsTitlesFormAddResources from "./EHoldingsLocalTitlesFormAddResources.vue"
 import { setMessage, setError, setWarning } from "../../messages"
 import { fetchLocalTitle } from '../../fetch'
@@ -388,10 +387,10 @@ import { storeToRefs } from "pinia"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore()
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { av_title_publication_types } = storeToRefs(AVStore)
         const { get_lib_from_av } = AVStore
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAddResources.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAddResources.vue
index 52c1877112..07a5529760 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAddResources.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAddResources.vue
@@ -92,14 +92,14 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import flatPickr from 'vue-flatpickr-component'
-import { useVendorStore } from "../../stores/vendors"
 import { storeToRefs } from "pinia"
 import { fetchLocalPackages } from "../../fetch"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore() // FIXME We only need that for 'manual'
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
         return { vendors }
     },
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
index 836dacb58c..bbd521b006 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue
@@ -15,15 +15,14 @@
 
 <script>
 import Toolbar from "./EHoldingsLocalTitlesToolbar.vue"
-import { createVNode, render } from 'vue'
-import { useAVStore } from "../../stores/authorised_values"
+import { inject, createVNode, render } from 'vue'
 import { storeToRefs } from "pinia"
 import { fetchLocalTitles } from "../../fetch"
 import { useDataTable } from "../../composables/datatables"
 
 export default {
     setup() {
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { av_title_publication_types } = storeToRefs(AVStore)
         const { get_lib_from_av, map_av_dt_filter } = AVStore
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue
index eca1586e22..cccd8ded8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue
@@ -256,12 +256,12 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import EHoldingsTitlePackagesList from "./EHoldingsLocalTitlePackagesList.vue"
 import { fetchLocalTitle } from "../../fetch"
-import { useAVStore } from "../../stores/authorised_values"
 export default {
     setup() {
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av } = AVStore
 
         return {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue
index eca92912ca..3ca071de8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/ERMMain.vue
@@ -116,17 +116,15 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import Breadcrumb from "./Breadcrumb.vue"
 import Dialog from "./Dialog.vue"
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
 import { fetchVendors } from "../../fetch"
 import "vue-select/dist/vue-select.css";
 
 export default {
     setup() {
-        const vendorStore = useVendorStore()
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         AVStore.av_agreement_statuses = agreement_statuses
         AVStore.av_agreement_closure_reasons = agreement_closure_reasons
         AVStore.av_agreement_renewal_priorities = agreement_renewal_priorities
@@ -139,6 +137,8 @@ export default {
         AVStore.av_package_content_types = package_content_types
         AVStore.av_title_publication_types = title_publication_types
 
+        const vendorStore = inject('vendorStore')
+
         return {
             vendorStore,
             erm_providers,
@@ -179,4 +179,4 @@ form .v-select {
     border-radius: 4px;
     min-width: 30%;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
index 62debfb0a3..3c152c74d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
@@ -125,9 +125,8 @@
 </template>
 
 <script>
+import { inject } from 'vue'
 import flatPickr from 'vue-flatpickr-component'
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
 import { setMessage, setError } from "../../messages"
 import { fetchLicense } from '../../fetch'
 import { storeToRefs } from "pinia"
@@ -135,9 +134,10 @@ import { storeToRefs } from "pinia"
 export default {
 
     setup() {
-        const vendorStore = useVendorStore()
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
-        const AVStore = useAVStore()
+
+        const AVStore = inject('AVStore')
         const {
             av_license_types,
             av_license_statuses,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
index 4044af3552..ccd7bc6b05 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
@@ -11,19 +11,17 @@
 
 <script>
 import Toolbar from "./LicensesToolbar.vue"
-import { createVNode, render } from 'vue'
-import { useVendorStore } from "../../stores/vendors"
-import { useAVStore } from "../../stores/authorised_values"
+import { inject, createVNode, render } from 'vue'
 import { storeToRefs } from "pinia"
 import { fetchLicenses } from "../../fetch"
 import { useDataTable } from "../../composables/datatables"
 
 export default {
     setup() {
-        const vendorStore = useVendorStore()
+        const vendorStore = inject('vendorStore')
         const { vendors } = storeToRefs(vendorStore)
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av, map_av_dt_filter } = AVStore
 
         const table_id = "license_list"
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
index 30f94a9bdc..601898cccc 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
@@ -81,14 +81,14 @@
 </template>
 
 <script>
-import { useAVStore } from "../../stores/authorised_values"
+import { inject } from 'vue'
 import { fetchLicense } from "../../fetch"
 
 export default {
     setup() {
         const format_date = $date
 
-        const AVStore = useAVStore()
+        const AVStore = inject('AVStore')
         const { get_lib_from_av } = AVStore
 
         return {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts b/koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts
index 7886104eef..ad259bc2e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/main-erm.ts
@@ -22,6 +22,8 @@ import { routes } from "./routes";
 const router = createRouter({ history: createWebHistory(), routes });
 
 import { useMainStore } from "./stores/main";
+import { useVendorStore } from "./stores/vendors";
+import { useAVStore } from "./stores/authorised_values";
 
 import { createI18n } from "vue-i18n";
 
@@ -34,17 +36,24 @@ const languages = { en, "de-DE": de_DE, "es-ES": es_ES, "fr-FR": fr_FR };
 const messages = Object.assign(languages);
 const i18n = createI18n({ locale: "en", messages });
 
+const pinia = createPinia();
 const app = createApp(App);
 
-const rootComponent = app.use(createPinia())
+const rootComponent = app
+    .use(pinia)
     .use(router)
     .use(i18n)
     .component("font-awesome-icon", FontAwesomeIcon)
     .component("v-select", vSelect);
 
 app.config.unwrapInjectedRef = true;
+app.provide("vendorStore", useVendorStore(pinia));
+const mainStore = useMainStore(pinia);
+app.provide("mainStore", mainStore);
+app.provide("AVStore", useAVStore(pinia));
+
 app.mount("#erm");
-const mainStore = useMainStore();
+
 const { removeMessages } = mainStore;
 router.beforeEach((to, from) => {
     removeMessages(); // This will actually flag the messages as displayed already