diff --git a/apps/dashboard/js/dashboard.js b/apps/dashboard/js/dashboard.js
index e59bbb178fb129f0140f2e0a6548a298278ddb42..87b8f3e43942e55dd32161b8ca897339e2c9a86c 100644
Binary files a/apps/dashboard/js/dashboard.js and b/apps/dashboard/js/dashboard.js differ
diff --git a/apps/dashboard/js/dashboard.js.map b/apps/dashboard/js/dashboard.js.map
index fdb9090b2f7314ce7acf5b381be1b04598bff792..ff844a78260900268587b3d3799198e0862ae5b6 100644
Binary files a/apps/dashboard/js/dashboard.js.map and b/apps/dashboard/js/dashboard.js.map differ
diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/App.vue
index 86dff02af3766b3cf48aa76ba30a81cb4b0de296..a327bc3467c898ce3e693159588aa07cadfa87c2 100644
--- a/apps/dashboard/src/App.vue
+++ b/apps/dashboard/src/App.vue
@@ -90,7 +90,7 @@
 import Vue from 'vue'
 import { loadState } from '@nextcloud/initial-state'
 import { getCurrentUser } from '@nextcloud/auth'
-import { Modal } from '@nextcloud/vue'
+import Modal from '@nextcloud/vue/dist/Components/Modal'
 import Draggable from 'vuedraggable'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
diff --git a/apps/settings/js/vue-settings-admin-security.js b/apps/settings/js/vue-settings-admin-security.js
index 0e30ac0fc6d0513afa947bb722bc914462093cfc..4480fd28b3464d98bcf813a4250bdb2234ed034a 100644
Binary files a/apps/settings/js/vue-settings-admin-security.js and b/apps/settings/js/vue-settings-admin-security.js differ
diff --git a/apps/settings/js/vue-settings-admin-security.js.map b/apps/settings/js/vue-settings-admin-security.js.map
index b128e3b20ff1f5459925e9ff02642e57df0d392e..6e10f63aff1724489115e3c4623946dc6b22a5f2 100644
Binary files a/apps/settings/js/vue-settings-admin-security.js.map and b/apps/settings/js/vue-settings-admin-security.js.map differ
diff --git a/apps/settings/js/vue-settings-apps-98ec4567df60dcf246a8.js b/apps/settings/js/vue-settings-apps-e124b7f066e28c0a9747.js
similarity index 66%
rename from apps/settings/js/vue-settings-apps-98ec4567df60dcf246a8.js
rename to apps/settings/js/vue-settings-apps-e124b7f066e28c0a9747.js
index 35b30c43e86c5145a329489d1091691e9bb18206..1e6b5594db34996f0b78268840872cf199ede3b0 100644
Binary files a/apps/settings/js/vue-settings-apps-98ec4567df60dcf246a8.js and b/apps/settings/js/vue-settings-apps-e124b7f066e28c0a9747.js differ
diff --git a/apps/settings/js/vue-settings-apps-98ec4567df60dcf246a8.js.map b/apps/settings/js/vue-settings-apps-e124b7f066e28c0a9747.js.map
similarity index 80%
rename from apps/settings/js/vue-settings-apps-98ec4567df60dcf246a8.js.map
rename to apps/settings/js/vue-settings-apps-e124b7f066e28c0a9747.js.map
index 4e0f0b11ebcdba526f0480960cba9d0c5ebcda63..cf0ef95fc6d6850d3a7eb8d62bf3a87c6085f283 100644
Binary files a/apps/settings/js/vue-settings-apps-98ec4567df60dcf246a8.js.map and b/apps/settings/js/vue-settings-apps-e124b7f066e28c0a9747.js.map differ
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
index 4417d485416abd7866c99a6a2b77f2952c6b685b..1252f6eb926a3c66bea0ccb61c95a19b47eb6fe7 100644
Binary files a/apps/settings/js/vue-settings-apps-users-management.js and b/apps/settings/js/vue-settings-apps-users-management.js differ
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
index cc09f230ae0a664c3a083ffb40984b731e3885bb..22bee095c50864a4686758814632a9e6c0745436 100644
Binary files a/apps/settings/js/vue-settings-apps-users-management.js.map and b/apps/settings/js/vue-settings-apps-users-management.js.map differ
diff --git a/apps/settings/js/vue-settings-nextcloud-pdf.js b/apps/settings/js/vue-settings-nextcloud-pdf.js
index 72bdd898e3283e67554b156fdf334268c0fc1c14..31f239e01ba1423434b3a0497c105c73af2db877 100644
Binary files a/apps/settings/js/vue-settings-nextcloud-pdf.js and b/apps/settings/js/vue-settings-nextcloud-pdf.js differ
diff --git a/apps/settings/js/vue-settings-nextcloud-pdf.js.map b/apps/settings/js/vue-settings-nextcloud-pdf.js.map
index 4c699ea97a55fa4b664ce871870f14c6928034ee..3ed537316c63647de3e873c348801bc815dc101b 100644
Binary files a/apps/settings/js/vue-settings-nextcloud-pdf.js.map and b/apps/settings/js/vue-settings-nextcloud-pdf.js.map differ
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
index 436316e453aa5c519c510cf656f731da1a75899f..30040d1f1042a7eccce038bcf3c08150def15dba 100644
Binary files a/apps/settings/js/vue-settings-personal-security.js and b/apps/settings/js/vue-settings-personal-security.js differ
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
index 4cadb8ee50ca1e7e7a95341c5a9842ac79870b9f..441a32343731d8d94b6ca11c074ba2dcdab603cf 100644
Binary files a/apps/settings/js/vue-settings-personal-security.js.map and b/apps/settings/js/vue-settings-personal-security.js.map differ
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js b/apps/settings/js/vue-settings-personal-webauthn.js
index dfe252d6f04943a1c8ecd0970f484d8fd1aaf03b..90cbe00c5032e1a2fa5397287a66a529a3a59f03 100644
Binary files a/apps/settings/js/vue-settings-personal-webauthn.js and b/apps/settings/js/vue-settings-personal-webauthn.js differ
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js.map b/apps/settings/js/vue-settings-personal-webauthn.js.map
index 60f7a4673f0e76685e790764ccfd705089700ab2..57a0c4c2d32072dcaff4f10a816f6b3489a23a09 100644
Binary files a/apps/settings/js/vue-settings-personal-webauthn.js.map and b/apps/settings/js/vue-settings-personal-webauthn.js.map differ
diff --git a/apps/settings/js/vue-settings-users-0cb1d350c2a52bd76abc.js b/apps/settings/js/vue-settings-users-0cb1d350c2a52bd76abc.js
new file mode 100644
index 0000000000000000000000000000000000000000..be2ffe76c9054b861d14f9c6ad8db414b03e0b70
Binary files /dev/null and b/apps/settings/js/vue-settings-users-0cb1d350c2a52bd76abc.js differ
diff --git a/apps/settings/js/vue-settings-users-0cb1d350c2a52bd76abc.js.map b/apps/settings/js/vue-settings-users-0cb1d350c2a52bd76abc.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..be7d9c1ef34416fd833e342ce2032a4951b5673b
Binary files /dev/null and b/apps/settings/js/vue-settings-users-0cb1d350c2a52bd76abc.js.map differ
diff --git a/apps/settings/js/vue-settings-users-2d8ad52251f6a5fde634.js b/apps/settings/js/vue-settings-users-2d8ad52251f6a5fde634.js
deleted file mode 100644
index a7c0b7c20dd21d532690e64d9edda48d9553a533..0000000000000000000000000000000000000000
Binary files a/apps/settings/js/vue-settings-users-2d8ad52251f6a5fde634.js and /dev/null differ
diff --git a/apps/settings/js/vue-settings-users-2d8ad52251f6a5fde634.js.map b/apps/settings/js/vue-settings-users-2d8ad52251f6a5fde634.js.map
deleted file mode 100644
index c98f6615be474376803389aa411e69e01b38e153..0000000000000000000000000000000000000000
Binary files a/apps/settings/js/vue-settings-users-2d8ad52251f6a5fde634.js.map and /dev/null differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-bb896ea7b7d65a6b3fdb.js b/apps/settings/js/vue-vendors-settings-apps-cbdb93c941428fff3107.js
similarity index 99%
rename from apps/settings/js/vue-vendors-settings-apps-bb896ea7b7d65a6b3fdb.js
rename to apps/settings/js/vue-vendors-settings-apps-cbdb93c941428fff3107.js
index f3e341e8ff596889a40ae656471f4b9c272e1ed5..af0cbf8ef754d6483dee30b2770e4cfa65c7310c 100644
Binary files a/apps/settings/js/vue-vendors-settings-apps-bb896ea7b7d65a6b3fdb.js and b/apps/settings/js/vue-vendors-settings-apps-cbdb93c941428fff3107.js differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-bb896ea7b7d65a6b3fdb.js.map b/apps/settings/js/vue-vendors-settings-apps-cbdb93c941428fff3107.js.map
similarity index 99%
rename from apps/settings/js/vue-vendors-settings-apps-bb896ea7b7d65a6b3fdb.js.map
rename to apps/settings/js/vue-vendors-settings-apps-cbdb93c941428fff3107.js.map
index aac8d5fd2ad8d30441a916c49d02c06209f0c47e..b2ba66a838667d5c8fdfd4ad0a7ebe5fa20584a0 100644
Binary files a/apps/settings/js/vue-vendors-settings-apps-bb896ea7b7d65a6b3fdb.js.map and b/apps/settings/js/vue-vendors-settings-apps-cbdb93c941428fff3107.js.map differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users-0d31487f0bb30b8b27bc.js b/apps/settings/js/vue-vendors-settings-apps-settings-users-0d31487f0bb30b8b27bc.js
deleted file mode 100644
index 39462c8d10efafdf3683c27551fd1563568d66eb..0000000000000000000000000000000000000000
Binary files a/apps/settings/js/vue-vendors-settings-apps-settings-users-0d31487f0bb30b8b27bc.js and /dev/null differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users-0d31487f0bb30b8b27bc.js.map b/apps/settings/js/vue-vendors-settings-apps-settings-users-0d31487f0bb30b8b27bc.js.map
deleted file mode 100644
index 3174da392a8c77c7cd56d2b02f6b397e5df9db12..0000000000000000000000000000000000000000
Binary files a/apps/settings/js/vue-vendors-settings-apps-settings-users-0d31487f0bb30b8b27bc.js.map and /dev/null differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users-23ee0e1113ebf7dfccad.js b/apps/settings/js/vue-vendors-settings-apps-settings-users-23ee0e1113ebf7dfccad.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5b7760435b37c72346fbcd055809573534f4e67
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-apps-settings-users-23ee0e1113ebf7dfccad.js differ
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users-23ee0e1113ebf7dfccad.js.map b/apps/settings/js/vue-vendors-settings-apps-settings-users-23ee0e1113ebf7dfccad.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..70cb4b36572c2dfd465937b434261032a193aa76
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-apps-settings-users-23ee0e1113ebf7dfccad.js.map differ
diff --git a/apps/settings/js/vue-vendors-settings-users-011d975a8475e3e78d37.js b/apps/settings/js/vue-vendors-settings-users-011d975a8475e3e78d37.js
deleted file mode 100644
index 379ad8bae50157d5b62fc10a1fb90a6806ce0333..0000000000000000000000000000000000000000
Binary files a/apps/settings/js/vue-vendors-settings-users-011d975a8475e3e78d37.js and /dev/null differ
diff --git a/apps/settings/js/vue-vendors-settings-users-011d975a8475e3e78d37.js.map b/apps/settings/js/vue-vendors-settings-users-011d975a8475e3e78d37.js.map
deleted file mode 100644
index 5ec756e75fb50a77929830bb7aa5af671b3e0049..0000000000000000000000000000000000000000
Binary files a/apps/settings/js/vue-vendors-settings-users-011d975a8475e3e78d37.js.map and /dev/null differ
diff --git a/apps/settings/js/vue-vendors-settings-users-8deec47e0af24a781687.js b/apps/settings/js/vue-vendors-settings-users-8deec47e0af24a781687.js
new file mode 100644
index 0000000000000000000000000000000000000000..863acdf01eca136806e2f126731dcb8066cb7725
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-users-8deec47e0af24a781687.js differ
diff --git a/apps/settings/js/vue-vendors-settings-users-8deec47e0af24a781687.js.map b/apps/settings/js/vue-vendors-settings-users-8deec47e0af24a781687.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..c26ac6853702bb7b15db78c1d3f001b99fc3c6d6
Binary files /dev/null and b/apps/settings/js/vue-vendors-settings-users-8deec47e0af24a781687.js.map differ
diff --git a/apps/settings/src/components/AdminTwoFactor.vue b/apps/settings/src/components/AdminTwoFactor.vue
index e05884d22f11b6d72f0aad9994fc0cfe2cf675d2..ea9d6f97fdeea333331f9a0b0bee9e37990725df 100644
--- a/apps/settings/src/components/AdminTwoFactor.vue
+++ b/apps/settings/src/components/AdminTwoFactor.vue
@@ -67,7 +67,7 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import { Multiselect } from '@nextcloud/vue'
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 import _ from 'lodash'
 import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 
diff --git a/apps/settings/src/components/AppDetails.vue b/apps/settings/src/components/AppDetails.vue
index d79f799fbb9e67425201f2da472d53a6b0eb7458..f4faa36eed450158c534ef1c746bb20b7e05d672 100644
--- a/apps/settings/src/components/AppDetails.vue
+++ b/apps/settings/src/components/AppDetails.vue
@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import { Multiselect } from '@nextcloud/vue'
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 
 import AppManagement from '../mixins/AppManagement'
 import PrefixMixin from './PrefixMixin'
diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue
index d1b4e6cbb2bdcd7f5409b53b98ae3fc3e4021c87..8c97bd10f2dfe38ba1234f71df6e2515f9db2746 100644
--- a/apps/settings/src/components/UserList/UserRowSimple.vue
+++ b/apps/settings/src/components/UserList/UserRowSimple.vue
@@ -84,7 +84,9 @@
 </template>
 
 <script>
-import { PopoverMenu, Actions, ActionButton } from '@nextcloud/vue'
+import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import ClickOutside from 'vue-click-outside'
 import { getCurrentUser } from '@nextcloud/auth'
 import UserRowMixin from '../../mixins/UserRowMixin'
diff --git a/apps/updatenotification/js/updatenotification.js b/apps/updatenotification/js/updatenotification.js
index 4fc54c135a813a67d935d09453aacef4664f666b..fb20fba1de403b9755d773f527caef2bdc22a1ca 100644
Binary files a/apps/updatenotification/js/updatenotification.js and b/apps/updatenotification/js/updatenotification.js differ
diff --git a/apps/updatenotification/js/updatenotification.js.map b/apps/updatenotification/js/updatenotification.js.map
index 3e1b22983461da49314a8a468018a47a6bc4f79c..5d7cfc6866c0b368a157ea1285f8f549d57100b6 100644
Binary files a/apps/updatenotification/js/updatenotification.js.map and b/apps/updatenotification/js/updatenotification.js.map differ
diff --git a/apps/updatenotification/src/components/UpdateNotification.vue b/apps/updatenotification/src/components/UpdateNotification.vue
index ac862ce1a24b59165f0fd5786eec7e4080b78294..d67d9d45beb7c478db05cc72b32f76033a5c3511 100644
--- a/apps/updatenotification/src/components/UpdateNotification.vue
+++ b/apps/updatenotification/src/components/UpdateNotification.vue
@@ -110,7 +110,8 @@
 
 <script>
 import { generateUrl, getRootUrl, generateOcsUrl } from '@nextcloud/router'
-import { PopoverMenu, Multiselect } from '@nextcloud/vue'
+import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
+import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
 import { VTooltip } from 'v-tooltip'
 import ClickOutside from 'vue-click-outside'