diff --git a/components/DocumentUpload.vue b/components/DocumentUpload.vue
index a7ba1bb..0acdf6d 100644
--- a/components/DocumentUpload.vue
+++ b/components/DocumentUpload.vue
@@ -13,15 +13,21 @@ const {type, elementId} = props
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
-const tags = dataStore.getDocumentTags
 
 const uploadModalOpen = ref(false)
 const uploadInProgress = ref(false)
 const fileUploadFormData = ref({
-  tags: ["Dokument"],
   project: null,
   tenant: profileStore.currentTenant
 })
+const availableTags = ref([])
+const selectedTags = ref([])
+const setup = async () => {
+  availableTags.value = await useSupabaseSelect("filetags")
+}
+
+setup()
+
 
 const openModal = () => {
   uploadModalOpen.value = true
@@ -33,7 +39,7 @@ const uploadFiles = async () => {
   let fileData = fileUploadFormData.value
   fileData[type] = elementId
 
-  await dataStore.uploadFiles(fileData,  document.getElementById("fileUploadInput").files,true)
+  await useFiles().uploadFiles(fileData,  document.getElementById("fileUploadInput").files,selectedTags.value,true)
 
   uploadModalOpen.value = false;
   uploadInProgress.value = false;
@@ -44,7 +50,7 @@ const uploadFiles = async () => {
   <USlideover
       v-model="uploadModalOpen"
   >
-    <UCard :ui="{ ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }">
+    <UCard :ui="{ ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }" class="h-full">
       <template #header>
         <div class="flex items-center justify-between">
           <h3 class="text-base font-semibold leading-6 text-gray-900 dark:text-white">
@@ -76,13 +82,15 @@ const uploadFiles = async () => {
       >
         <USelectMenu
             multiple
+            option-attribute="name"
+            value-attribute="id"
             searchable
             searchable-placeholder="Suchen..."
-            :options="tags"
-            v-model="fileUploadFormData.tags"
+            :options="availableTags"
+            v-model="selectedTags"
         >
           <template #label>
-            <span v-if="fileUploadFormData.tags.length > 0">{{fileUploadFormData.tags.join(", ")}}</span>
+            <span v-if="selectedTags.length > 0">{{selectedTags.map(i => availableTags.find(x => x.id === i).name).join(", ")}}</span>
             <span v-else>Keine Tags ausgewählt</span>
           </template>
         </USelectMenu>