diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php
index cd1c05de4..bc137ad98 100644
--- a/app/Models/InstanceSettings.php
+++ b/app/Models/InstanceSettings.php
@@ -35,7 +35,7 @@ class InstanceSettings extends Model
     protected static function booted(): void
     {
         static::updated(function ($settings) {
-            if ($settings->wasChanged('helper_version')) {
+            if ($settings->wasChanged('helper_version') || $settings->wasChanged('dev_helper_version')) {
                 Server::chunkById(100, function ($servers) {
                     foreach ($servers as $server) {
                         PullHelperImageJob::dispatch($server);
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 246e5f212..68813cec2 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -2907,7 +2907,8 @@ function getHelperVersion(): string
         return $settings->dev_helper_version;
     }
 
-    return config('constants.coolify.helper_version');
+    // In production or when dev_helper_version is not set, use the configured helper_version
+    return $settings->helper_version ?? config('constants.coolify.helper_version');
 }
 
 function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
@@ -3155,17 +3156,18 @@ function generateDockerComposeServiceName(mixed $services, int $pullRequestId =
     return $collection;
 }
 
-function formatBytes(?int $bytes = 0, int $precision = 2): string
+function formatBytes(int $bytes, int $precision = 2): string
 {
-    if (is_null($bytes) || $bytes <= 0) {
+    if ($bytes === 0) {
         return '0 B';
     }
 
     $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
-    $pow = floor(($bytes ? log($bytes) : 0) / log(1024));
-    $pow = min($pow, count($units) - 1);
+    $base = 1024;
+    $exponent = floor(log($bytes) / log($base));
+    $exponent = min($exponent, count($units) - 1);
 
-    $bytes /= (1024 ** $pow);
+    $value = $bytes / pow($base, $exponent);
 
-    return round($bytes, $precision).' '.$units[$pow];
+    return round($value, $precision).' '.$units[$exponent];
 }