diff --git a/app/Filament/Resources/NodeResource/Pages/CreateNode.php b/app/Filament/Resources/NodeResource/Pages/CreateNode.php
index bd21dc558..0dbf4c2b4 100644
--- a/app/Filament/Resources/NodeResource/Pages/CreateNode.php
+++ b/app/Filament/Resources/NodeResource/Pages/CreateNode.php
@@ -239,7 +239,7 @@ class CreateNode extends CreateRecord
                                 ->default(256)
                                 ->minValue(1)
                                 ->maxValue(1024)
-                                ->suffix('MiB'),
+                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
                             Forms\Components\TextInput::make('daemon_sftp')
                                 ->columnSpan(1)
                                 ->label('SFTP Port')
@@ -275,7 +275,7 @@ class CreateNode extends CreateRecord
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                         ->label('Memory Limit')->inlineLabel()
-                                        ->suffix('MiB')
+                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(0)
@@ -316,7 +316,7 @@ class CreateNode extends CreateRecord
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                         ->label('Disk Limit')->inlineLabel()
-                                        ->suffix('MiB')
+                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(0)
diff --git a/app/Filament/Resources/NodeResource/Pages/EditNode.php b/app/Filament/Resources/NodeResource/Pages/EditNode.php
index 4b7f90ad1..dded9ffd2 100644
--- a/app/Filament/Resources/NodeResource/Pages/EditNode.php
+++ b/app/Filament/Resources/NodeResource/Pages/EditNode.php
@@ -214,7 +214,7 @@ class EditNode extends EditRecord
                                 ->numeric()->required()
                                 ->minValue(1)
                                 ->maxValue(1024)
-                                ->suffix('MiB'),
+                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
                             Forms\Components\TextInput::make('daemon_sftp')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
                                 ->label('SFTP Port')
@@ -274,7 +274,7 @@ class EditNode extends EditRecord
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                         ->label('Memory Limit')->inlineLabel()
-                                        ->suffix('MiB')
+                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->required()
                                         ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
                                         ->numeric()
@@ -314,7 +314,7 @@ class EditNode extends EditRecord
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                         ->label('Disk Limit')->inlineLabel()
-                                        ->suffix('MiB')
+                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->required()
                                         ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
                                         ->numeric()
diff --git a/app/Filament/Resources/NodeResource/Pages/ListNodes.php b/app/Filament/Resources/NodeResource/Pages/ListNodes.php
index 1496e7aee..81dd52fb0 100644
--- a/app/Filament/Resources/NodeResource/Pages/ListNodes.php
+++ b/app/Filament/Resources/NodeResource/Pages/ListNodes.php
@@ -42,15 +42,15 @@ class ListNodes extends ListRecords
                     ->visibleFrom('sm')
                     ->icon('tabler-device-desktop-analytics')
                     ->numeric()
-                    ->suffix(' GiB')
-                    ->formatStateUsing(fn ($state) => number_format($state / 1024, 2))
+                    ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
+                    ->formatStateUsing(fn ($state) => number_format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), 2))
                     ->sortable(),
                 Tables\Columns\TextColumn::make('disk')
                     ->visibleFrom('sm')
                     ->icon('tabler-file')
                     ->numeric()
-                    ->suffix(' GiB')
-                    ->formatStateUsing(fn ($state) => number_format($state / 1024, 2))
+                    ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
+                    ->formatStateUsing(fn ($state) => number_format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), 2))
                     ->sortable(),
                 Tables\Columns\TextColumn::make('cpu')
                     ->visibleFrom('sm')
diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php
index d61c141fe..9d55bcaed 100644
--- a/app/Filament/Resources/ServerResource/Pages/CreateServer.php
+++ b/app/Filament/Resources/ServerResource/Pages/CreateServer.php
@@ -488,7 +488,7 @@ class CreateServer extends CreateRecord
                                                 ->dehydratedWhenHidden()
                                                 ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                                 ->label('Memory Limit')->inlineLabel()
-                                                ->suffix('MiB')
+                                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                 ->default(0)
                                                 ->required()
                                                 ->columnSpan(2)
@@ -519,7 +519,7 @@ class CreateServer extends CreateRecord
                                                 ->dehydratedWhenHidden()
                                                 ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                                 ->label('Disk Space Limit')->inlineLabel()
-                                                ->suffix('MiB')
+                                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                 ->default(0)
                                                 ->required()
                                                 ->columnSpan(2)
@@ -599,7 +599,7 @@ class CreateServer extends CreateRecord
                                                 })
                                                 ->label('Swap Memory')
                                                 ->default(0)
-                                                ->suffix('MiB')
+                                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                 ->minValue(-1)
                                                 ->columnSpan(2)
                                                 ->inlineLabel()
diff --git a/app/Filament/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Resources/ServerResource/Pages/EditServer.php
index c7a3ae4e5..c51a9a569 100644
--- a/app/Filament/Resources/ServerResource/Pages/EditServer.php
+++ b/app/Filament/Resources/ServerResource/Pages/EditServer.php
@@ -220,7 +220,7 @@ class EditServer extends EditRecord
                                                     ->dehydratedWhenHidden()
                                                     ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                                     ->label('Memory Limit')->inlineLabel()
-                                                    ->suffix('MiB')
+                                                    ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                     ->required()
                                                     ->columnSpan(2)
                                                     ->numeric()
@@ -250,7 +250,7 @@ class EditServer extends EditRecord
                                                     ->dehydratedWhenHidden()
                                                     ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                                     ->label('Disk Space Limit')->inlineLabel()
-                                                    ->suffix('MiB')
+                                                    ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                     ->required()
                                                     ->columnSpan(2)
                                                     ->numeric()
@@ -331,7 +331,7 @@ class EditServer extends EditRecord
                                                         default => false,
                                                     })
                                                     ->label('Swap Memory')->inlineLabel()
-                                                    ->suffix('MiB')
+                                                    ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                     ->minValue(-1)
                                                     ->columnSpan(2)
                                                     ->required()
diff --git a/app/Services/Servers/ServerConfigurationStructureService.php b/app/Services/Servers/ServerConfigurationStructureService.php
index 43fd9f76c..d9d0f7fe6 100644
--- a/app/Services/Servers/ServerConfigurationStructureService.php
+++ b/app/Services/Servers/ServerConfigurationStructureService.php
@@ -51,12 +51,12 @@ class ServerConfigurationStructureService
             'invocation' => $server->startup,
             'skip_egg_scripts' => $server->skip_scripts,
             'build' => [
-                'memory_limit' => $server->memory,
-                'swap' => $server->swap,
+                'memory_limit' => config('panel.use_binary_prefix') ? $server->memory : $server->memory / 1.048576,
+                'swap' => config('panel.use_binary_prefix') ? $server->swap : $server->swap / 1.048576,
                 'io_weight' => $server->io,
                 'cpu_limit' => $server->cpu,
                 'threads' => $server->threads,
-                'disk_space' => $server->disk,
+                'disk_space' => config('panel.use_binary_prefix') ? $server->disk : $server->disk / 1.048576,
                 'oom_killer' => $server->oom_killer,
             ],
             'container' => [
diff --git a/config/panel.php b/config/panel.php
index ea408008e..7b049f145 100644
--- a/config/panel.php
+++ b/config/panel.php
@@ -175,4 +175,6 @@ return [
     'filament' => [
         'top-navigation' => env('FILAMENT_TOP_NAVIGATION', false),
     ],
+
+    'use_binary_prefix' => env('PANEL_USE_BINARY_PREFIX', true),
 ];