diff --git a/app/Filament/Resources/Learning/Assignments/Pages/CreateAssignment.php b/app/Filament/Resources/Learning/Assignments/Pages/CreateAssignment.php
index d0d3b20..069bac0 100644
--- a/app/Filament/Resources/Learning/Assignments/Pages/CreateAssignment.php
+++ b/app/Filament/Resources/Learning/Assignments/Pages/CreateAssignment.php
@@ -79,7 +79,6 @@ public function handleRecordCreation(array $data): Model
                 $filePath = is_array($pdf) ? reset($pdf) : $pdf;
 
                 $assignment->addMediaFromDisk($filePath, config('filesystems.default'))
-                    ->preservingOriginal()
                     ->withCustomProperties([
                         'feature' => 'assignments',
                         'date' => now()->toDateString(),
diff --git a/app/Filament/Resources/Learning/Assignments/Pages/EditAssignment.php b/app/Filament/Resources/Learning/Assignments/Pages/EditAssignment.php
index 3c329ea..6f14598 100644
--- a/app/Filament/Resources/Learning/Assignments/Pages/EditAssignment.php
+++ b/app/Filament/Resources/Learning/Assignments/Pages/EditAssignment.php
@@ -102,7 +102,6 @@ public function handleRecordUpdate(Model $record, array $data): Model
 
                 if (! empty($filePath)) {
                     $record->addMediaFromDisk($filePath, config('filesystems.default'))
-                        ->preservingOriginal()
                         ->withCustomProperties([
                             'feature' => 'assignments',
                             'date' => now()->toDateString(),
diff --git a/app/Filament/Resources/Learning/Assignments/Pages/SubmitAssignmentPage.php b/app/Filament/Resources/Learning/Assignments/Pages/SubmitAssignmentPage.php
index 1fd1103..2289bb5 100644
--- a/app/Filament/Resources/Learning/Assignments/Pages/SubmitAssignmentPage.php
+++ b/app/Filament/Resources/Learning/Assignments/Pages/SubmitAssignmentPage.php
@@ -264,6 +264,11 @@ public function submit(): void
             if ($state['file']) {
                 $existingSubmission->clearMediaCollection('submission');
                 $existingSubmission->addMediaFromDisk($state['file'], config('filesystems.default'))
+                    ->withCustomProperties([
+                        'feature' => 'assignments',
+                        'date' => now()->toDateString(),
+                        'doc_type' => 'submission',
+                    ])
                     ->toMediaCollection('submission');
             }
 
@@ -283,6 +288,11 @@ public function submit(): void
 
             if ($state['file']) {
                 $submission->addMediaFromDisk($state['file'], config('filesystems.default'))
+                    ->withCustomProperties([
+                        'feature' => 'assignments',
+                        'date' => now()->toDateString(),
+                        'doc_type' => 'submission',
+                    ])
                     ->toMediaCollection('submission');
             }
 
diff --git a/app/Filament/Resources/Learning/Assignments/Schemas/AssignmentForm.php b/app/Filament/Resources/Learning/Assignments/Schemas/AssignmentForm.php
index 943a7d7..3a2cfb7 100644
--- a/app/Filament/Resources/Learning/Assignments/Schemas/AssignmentForm.php
+++ b/app/Filament/Resources/Learning/Assignments/Schemas/AssignmentForm.php
@@ -121,7 +121,7 @@ public static function configure(Schema $schema): Schema
                             ->disk(config('filesystems.default'))
                             ->acceptedFileTypes(['application/pdf'])
                             ->maxSize(1024 * 5)
-                            ->directory('assignments/'.now()->toDateString())
+                            ->directory('assignments-tmp/'.now()->toDateString())
                             ->nullable()
                             ->columnSpanFull(),
                     ])
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/storage/app/public/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore