diff --git a/README.md b/README.md
index c8e0a4076..781c3aaf5 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,9 @@ The MIT License (MIT). Please see [License File](LICENSE.md) for more informatio
   - Bug-fix: Ticket content field (required)
 - **Release 1.1.5**
   - Add comment field to ticket hours logging
+- **Release 1.1.6**
+  - Edit ticket epic details
+  - PR #13 made by @mihaisolomon
 
 ## Support us
 
diff --git a/app/Filament/Resources/TicketResource.php b/app/Filament/Resources/TicketResource.php
index 9094bac67..c24e62619 100644
--- a/app/Filament/Resources/TicketResource.php
+++ b/app/Filament/Resources/TicketResource.php
@@ -4,6 +4,7 @@
 
 use App\Filament\Resources\TicketResource\Pages;
 use App\Filament\Resources\TicketResource\RelationManagers;
+use App\Models\Epic;
 use App\Models\Project;
 use App\Models\Ticket;
 use App\Models\TicketPriority;
@@ -82,7 +83,13 @@ public static function form(Form $form): Form
                                     )
                                     ->default(fn() => request()->get('project'))
                                     ->required(),
-
+                                Forms\Components\Select::make('epic_id')
+                                    ->label(__('Epic'))
+                                    ->searchable()
+                                    ->reactive()
+                                    ->options(function ($get, $set) {
+                                        return Epic::where('project_id', $get('project_id'))->pluck('name', 'id')->toArray();
+                                    }),
                                 Forms\Components\Grid::make()
                                     ->columns(12)
                                     ->columnSpan(2)
diff --git a/docs/installation.md b/docs/installation.md
index a68246f2b..b1291f48d 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -133,13 +133,13 @@ php artisan db:seed
 > 
 > This user has **all permissions** link to it's account
 
-And voilà! You can now serve the platform as a **Laravel** application by running this command `php artisan serve` or use your favorite **WEB** server to serve it.
-
-> By default the `helper-dev.zip` contains the assets `public/build` folder, but if you want you can use the following command to generate it:
+> Last thing before you can server the project you need to use the following command to generate vite assets:
 > 
 > - Generate assets for production: `npm run build`
 > - Generate assets for development: `npm run dev` or `vite`
 
+And voilà! You can now serve the platform as a **Laravel** application by running this command `php artisan serve` or use your favorite **WEB** server to serve it.
+
 Last thing to do, run the below command to clear all caches:
 
 ```bash
diff --git a/resources/views/filament/resources/tickets/view.blade.php b/resources/views/filament/resources/tickets/view.blade.php
index d5a1c6ea1..4743383da 100644
--- a/resources/views/filament/resources/tickets/view.blade.php
+++ b/resources/views/filament/resources/tickets/view.blade.php
@@ -74,6 +74,19 @@ class="flex items-center gap-1 text-gray-500 hover:text-gray-700 font-medium tex
                 </div>
             </div>
 
+            <div class="w-full flex flex-col gap-1 pt-3">
+                <span class="text-gray-500 text-sm font-medium">
+                    {{ __('Epic') }}
+                </span>
+                <div class="w-full flex items-center gap-1 text-gray-500">
+                    @if($record->epic)
+                        {{ $record->epic->name }}
+                    @else
+                        -
+                    @endif
+                </div>
+            </div>
+
             <div class="w-full flex flex-col gap-1 pt-3">
                 <span class="text-gray-500 text-sm font-medium">
                     {{ __('Estimation') }}