diff --git a/src/BoardSelector.vue b/src/BoardSelector.vue
index ac9e65e36..11cb3449f 100644
--- a/src/BoardSelector.vue
+++ b/src/BoardSelector.vue
@@ -72,8 +72,8 @@
 </style>
 <script>
 /* global OC */
-import { Modal } from 'nextcloud-vue/dist/Components/Modal'
-import { Avatar } from 'nextcloud-vue/dist/Components/Avatar'
+import { Modal } from '@nextcloud/vue/dist/Components/Modal'
+import { Avatar } from '@nextcloud/vue/dist/Components/Avatar'
 import axios from 'nextcloud-axios'
 
 export default {
diff --git a/src/CardSelector.vue b/src/CardSelector.vue
index 99aead5e7..b70a162e7 100644
--- a/src/CardSelector.vue
+++ b/src/CardSelector.vue
@@ -37,8 +37,8 @@
 </template>
 
 <script>
-import { Modal } from 'nextcloud-vue/dist/Components/Modal'
-import { Multiselect } from 'nextcloud-vue/dist/Components/Multiselect'
+import { Modal } from '@nextcloud/vue/dist/Components/Modal'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
 import axios from 'nextcloud-axios'
 
 export default {
diff --git a/src/components/board/BoardSidebar.vue b/src/components/board/BoardSidebar.vue
index 57a02c9b0..f8589ae5d 100644
--- a/src/components/board/BoardSidebar.vue
+++ b/src/components/board/BoardSidebar.vue
@@ -51,7 +51,8 @@ import SharingTabSidebar from './SharingTabSidebar'
 import TagsTabSidebar from './TagsTabSidebar'
 import DeletedTabSidebar from './DeletedTabSidebar'
 import TimelineTabSidebar from './TimelineTabSidebar'
-import { AppSidebar, AppSidebarTab } from '@nextcloud/vue'
+import { AppSidebar } from '@nextcloud/vue/dist/Components/AppSidebar'
+import { AppSidebarTab } from '@nextcloud/vue/dist/Components/AppSidebarTab'
 
 export default {
 	name: 'BoardSidebar',
diff --git a/src/components/board/SharingTabSidebar.vue b/src/components/board/SharingTabSidebar.vue
index 98df78b7a..85d0088a7 100644
--- a/src/components/board/SharingTabSidebar.vue
+++ b/src/components/board/SharingTabSidebar.vue
@@ -46,7 +46,11 @@
 </template>
 
 <script>
-import { Avatar, Multiselect, Actions, ActionButton, ActionCheckbox } from '@nextcloud/vue'
+import { Avatar } from '@nextcloud/vue/dist/Components/Avatar'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
+import { Actions } from '@nextcloud/vue/dist/Components/Actions'
+import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
+import { ActionCheckbox } from '@nextcloud/vue/dist/Components/ActionCheckbox'
 import { CollectionList } from 'nextcloud-vue-collections'
 import { mapGetters } from 'vuex'
 
diff --git a/src/components/boards/BoardItem.vue b/src/components/boards/BoardItem.vue
index aecfdb5b2..7f2b1f733 100644
--- a/src/components/boards/BoardItem.vue
+++ b/src/components/boards/BoardItem.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { Avatar } from '@nextcloud/vue'
+import { Avatar } from '@nextcloud/vue/dist/Components/Avatar'
 
 export default {
 	name: 'BoardItem',
diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index 1141096e2..557a28bd5 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -95,7 +95,11 @@
 </template>
 
 <script>
-import { AppSidebar, AppSidebarTab, Multiselect, DatetimePicker, Avatar } from '@nextcloud/vue'
+import { Avatar } from '@nextcloud/vue/dist/Components/Avatar'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
+import { AppSidebar } from '@nextcloud/vue/dist/Components/AppSidebar'
+import { AppSidebarTab } from '@nextcloud/vue/dist/Components/AppSidebarTab'
+import { DatetimePicker } from '@nextcloud/vue/dist/Components/DatetimePicker'
 import { mapState } from 'vuex'
 import VueEasymde from 'vue-easymde/dist/VueEasyMDE.common'
 import { Actions } from '@nextcloud/vue/dist/Components/Actions'
diff --git a/src/components/cards/CardBadges.vue b/src/components/cards/CardBadges.vue
index 0ea48fe7e..606ad443a 100644
--- a/src/components/cards/CardBadges.vue
+++ b/src/components/cards/CardBadges.vue
@@ -1,5 +1,3 @@
-cardbadges
-
 <!--
   - @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
   -
@@ -40,7 +38,7 @@ cardbadges
 	</div>
 </template>
 <script>
-import { Avatar } from '@nextcloud/vue'
+import { Avatar } from '@nextcloud/vue/dist/Components/Avatar'
 import AvatarList from './AvatarList'
 
 export default {
diff --git a/src/components/navigation/AppNavigation.vue b/src/components/navigation/AppNavigation.vue
index e60f91427..8e96de49b 100644
--- a/src/components/navigation/AppNavigation.vue
+++ b/src/components/navigation/AppNavigation.vue
@@ -63,7 +63,7 @@
 import axios from 'nextcloud-axios'
 import { mapGetters } from 'vuex'
 import ClickOutside from 'vue-click-outside'
-import { Multiselect } from '@nextcloud/vue'
+import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
 
 import AppNavigationAddBoard from './AppNavigationAddBoard'
 import AppNavigationBoard from './AppNavigationBoard'
diff --git a/src/components/navigation/AppNavigationBoard.vue b/src/components/navigation/AppNavigationBoard.vue
index 841c7bb35..6ecaaba2e 100644
--- a/src/components/navigation/AppNavigationBoard.vue
+++ b/src/components/navigation/AppNavigationBoard.vue
@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import { PopoverMenu } from '@nextcloud/vue'
+import { PopoverMenu } from '@nextcloud/vue/dist/Components/PopoverMenu'
 import ClickOutside from 'vue-click-outside'
 import ColorPicker from '../ColorPicker'
 
diff --git a/src/components/navigation/AppNavigationBoardCategory.vue b/src/components/navigation/AppNavigationBoardCategory.vue
index 468feae3e..231414a50 100644
--- a/src/components/navigation/AppNavigationBoardCategory.vue
+++ b/src/components/navigation/AppNavigationBoardCategory.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { PopoverMenu } from '@nextcloud/vue'
+import { PopoverMenu } from '@nextcloud/vue/dist/Components/PopoverMenu'
 import ClickOutside from 'vue-click-outside'
 import AppNavigationBoard from './AppNavigationBoard'