diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php
index 6b144a9f3..a19129202 100644
--- a/app/Filament/Resources/ServerResource/Pages/CreateServer.php
+++ b/app/Filament/Resources/ServerResource/Pages/CreateServer.php
@@ -683,9 +683,10 @@ class CreateServer extends CreateRecord
                                     ->placeholder('Enter a custom Image')
                                     ->columnSpan(1),
 
-                                Forms\Components\TagsInput::make('docker_labels')
-                                    ->label('Labels')
-                                    ->placeholder('Enter custom Docker container labels')
+                                Forms\Components\KeyValue::make('docker_labels')
+                                    ->label('Container Labels')
+                                    ->keyLabel('Title')
+                                    ->valueLabel('Description')
                                     ->columnSpan(1),
                             ]),
                     ]),
diff --git a/app/Filament/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Resources/ServerResource/Pages/EditServer.php
index 56a245291..c047301a1 100644
--- a/app/Filament/Resources/ServerResource/Pages/EditServer.php
+++ b/app/Filament/Resources/ServerResource/Pages/EditServer.php
@@ -511,10 +511,11 @@ class EditServer extends EditRecord
                                     ->placeholder('Enter a custom Image')
                                     ->columnSpan(1),
 
-                                Forms\Components\TagsInput::make('docker_labels')
-                                    ->label('Labels')
-                                    ->placeholder('Enter custom Docker container labels')
-                                    ->columnSpan(1),
+                                Forms\Components\KeyValue::make('docker_labels')
+                                    ->label('Container Labels')
+                                    ->keyLabel('Label Name')
+                                    ->valueLabel('Label Description')
+                                    ->columnSpanFull(),
                             ]),
                     ]),
             ]);