diff --git a/src/viewmodels/admin/unit/damageReport.models.ts b/src/viewmodels/admin/unit/damageReport.models.ts
index 5544d00..461b316 100644
--- a/src/viewmodels/admin/unit/damageReport.models.ts
+++ b/src/viewmodels/admin/unit/damageReport.models.ts
@@ -24,8 +24,9 @@ export type DamageReportViewModel = {
   id: string;
   title: string;
   reportedAt: Date;
+  closedAt?: Date;
+  closedBy?: string;
   status: string;
-  done: boolean;
   description: string;
   location: string;
   noteByReporter: string;
diff --git a/src/viewmodels/admin/unit/inspection/inspection.models.ts b/src/viewmodels/admin/unit/inspection/inspection.models.ts
index dcd74b2..bf8f770 100644
--- a/src/viewmodels/admin/unit/inspection/inspection.models.ts
+++ b/src/viewmodels/admin/unit/inspection/inspection.models.ts
@@ -32,7 +32,8 @@ export type InspectionViewModel = {
   inspectionVersionedPlan: InspectionVersionedPlanViewModel;
   context: string;
   created: Date;
-  finished?: Date;
+  finishedAt?: Date;
+  finishedBy?: string;
   isOpen: boolean;
   nextInspection?: Date;
   checks: Array<InspectionPointResultViewModel>;
diff --git a/src/viewmodels/admin/unit/repair.models.ts b/src/viewmodels/admin/unit/repair.models.ts
index 24904e7..7d64743 100644
--- a/src/viewmodels/admin/unit/repair.models.ts
+++ b/src/viewmodels/admin/unit/repair.models.ts
@@ -25,6 +25,7 @@ export type RepairViewModel = {
   id: string;
   createdAt: Date;
   finishedAt?: Date;
+  finishedBy?: string;
   status: string;
   responsible: string;
   title: string;
diff --git a/src/views/admin/unit/damageReport/Overview.vue b/src/views/admin/unit/damageReport/Overview.vue
index 110e03f..a24aa2e 100644
--- a/src/views/admin/unit/damageReport/Overview.vue
+++ b/src/views/admin/unit/damageReport/Overview.vue
@@ -16,7 +16,7 @@
         ></textarea>
       </div>
       <button
-        v-if="!editStatus && !activeDamageReportObj.done"
+        v-if="!editStatus && activeDamageReportObj.closedAt == undefined"
         primary
         class="w-fit! self-end"
         :disabled="!can('update', 'unit', 'damage_report')"
@@ -24,7 +24,7 @@
       >
         Status ändern
       </button>
-      <div v-else-if="!activeDamageReportObj.done" class="flex flex-row gap-2 justify-end">
+      <div v-else-if="activeDamageReportObj.closedAt == undefined" class="flex flex-row gap-2 justify-end">
         <button primary-outline class="w-fit!" @click="saveStatus(true)">speichern und abschließen</button>
         <button primary class="w-fit!" @click="saveStatus(false)">Status speichern</button>
       </div>
@@ -122,7 +122,7 @@ export default defineComponent({
       };
       this.updateDamageReport(update)
         .then((res) => {
-          this.activeDamageReportObj!.done = update.done;
+          this.activeDamageReportObj!.closedAt = update.done ? new Date() : undefined;
           this.activeDamageReportObj!.status = update.status;
           this.activeDamageReportObj!.noteByWorker = update.noteByWorker;
           this.loading = "success";
diff --git a/src/views/admin/unit/equipment/DamageReport.vue b/src/views/admin/unit/equipment/DamageReport.vue
index 4523ef6..790bd11 100644
--- a/src/views/admin/unit/equipment/DamageReport.vue
+++ b/src/views/admin/unit/equipment/DamageReport.vue
@@ -13,7 +13,7 @@
           class="flex flex-col h-fit w-full border border-primary rounded-md"
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
-            <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
+            <PencilSquareIcon v-if="row.closedAt == undefined" class="w-5 h-5" />
             <p class="grow">{{ row.title }} - {{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}</p>
             <div class="flex flex-row gap-2">
               <div v-if="row.images.length != 0" class="cursor-pointer">
diff --git a/src/views/admin/unit/equipment/Inspection.vue b/src/views/admin/unit/equipment/Inspection.vue
index 5d2444f..b0632af 100644
--- a/src/views/admin/unit/equipment/Inspection.vue
+++ b/src/views/admin/unit/equipment/Inspection.vue
@@ -14,7 +14,7 @@
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="row.isOpen" class="w-5 h-5" />
-            <p>{{ row.inspectionPlan.title }} - {{ row.finished ?? "in Arbeit" }}</p>
+            <p>{{ row.inspectionPlan.title }} - {{ row.finishedAt ?? "in Arbeit" }}</p>
           </div>
           <div v-if="row.context || row.nextInspection" class="p-2">
             <p v-if="row.context">Kontext: {{ row.context }}</p>
diff --git a/src/views/admin/unit/vehicle/DamageReport.vue b/src/views/admin/unit/vehicle/DamageReport.vue
index 0533151..4de2f5d 100644
--- a/src/views/admin/unit/vehicle/DamageReport.vue
+++ b/src/views/admin/unit/vehicle/DamageReport.vue
@@ -13,7 +13,7 @@
           class="flex flex-col h-fit w-full border border-primary rounded-md"
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
-            <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
+            <PencilSquareIcon v-if="row.closedAt == undefined" class="w-5 h-5" />
             <p class="grow">{{ row.title }} - {{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}</p>
             <div class="flex flex-row gap-2">
               <div v-if="row.images.length != 0" class="cursor-pointer">
diff --git a/src/views/admin/unit/vehicle/Inspection.vue b/src/views/admin/unit/vehicle/Inspection.vue
index a9e89ff..a539f27 100644
--- a/src/views/admin/unit/vehicle/Inspection.vue
+++ b/src/views/admin/unit/vehicle/Inspection.vue
@@ -14,7 +14,7 @@
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="row.isOpen" class="w-5 h-5" />
-            <p>{{ row.inspectionPlan.title }} - {{ row.finished ?? "in Arbeit" }}</p>
+            <p>{{ row.inspectionPlan.title }} - {{ row.finishedAt ?? "in Arbeit" }}</p>
           </div>
           <div v-if="row.context || row.nextInspection" class="p-2">
             <p v-if="row.context">Kontext: {{ row.context }}</p>
diff --git a/src/views/admin/unit/wearable/DamageReport.vue b/src/views/admin/unit/wearable/DamageReport.vue
index 5c679b3..3449e6d 100644
--- a/src/views/admin/unit/wearable/DamageReport.vue
+++ b/src/views/admin/unit/wearable/DamageReport.vue
@@ -13,7 +13,7 @@
           class="flex flex-col h-fit w-full border border-primary rounded-md"
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
-            <PencilSquareIcon v-if="!row.done" class="w-5 h-5" />
+            <PencilSquareIcon v-if="row.closedAt == undefined" class="w-5 h-5" />
             <p class="grow">{{ row.title }} - {{ new Date(row.reportedAt).toLocaleString("de") }} - {{ row.status }}</p>
             <div class="flex flex-row gap-2">
               <div v-if="row.images.length != 0" class="cursor-pointer">
diff --git a/src/views/admin/unit/wearable/Inspection.vue b/src/views/admin/unit/wearable/Inspection.vue
index f11bdbc..1b934d1 100644
--- a/src/views/admin/unit/wearable/Inspection.vue
+++ b/src/views/admin/unit/wearable/Inspection.vue
@@ -14,7 +14,7 @@
         >
           <div class="bg-primary p-2 text-white flex flex-row gap-2 items-center">
             <PencilSquareIcon v-if="row.isOpen" class="w-5 h-5" />
-            <p>{{ row.inspectionPlan.title }} - {{ row.finished ?? "in Arbeit" }}</p>
+            <p>{{ row.inspectionPlan.title }} - {{ row.finishedAt ?? "in Arbeit" }}</p>
           </div>
           <div v-if="row.context || row.nextInspection" class="p-2">
             <p v-if="row.context">Kontext: {{ row.context }}</p>