diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index 03c4b3376..7801ed00a 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -453,6 +453,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    if ($http_basic_auth_enabled) {
+                        $middlewares->push($http_basic_auth_label);
+                    }
                     $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
                         $middlewares->push($middleware_name);
                     });
@@ -476,6 +479,9 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                         $labels = $labels->merge($redirect_to_www);
                         $middlewares->push($to_www_name);
                     }
+                    if ($http_basic_auth_enabled) {
+                        $middlewares->push($http_basic_auth_label);
+                    }
                     $middlewares_from_labels->each(function ($middleware_name) use ($middlewares) {
                         $middlewares->push($middleware_name);
                     });
@@ -772,6 +778,13 @@ function convertDockerRunToCompose(?string $custom_docker_run_options = null)
             $options[$option][] = $value;
             $options[$option] = array_unique($options[$option]);
         }
+        if ($option === '--hostname') {
+            $regexForParsingHostname = '/hostname=([^\s]+)/';
+            preg_match($regexForParsingHostname, $custom_docker_run_options, $hostname_matches);
+            $value = $hostname_matches[1] ?? null;
+            $options[$option][] = $value;
+            $options[$option] = array_unique($options[$option]);
+        }
         if (isset($match[2]) && $match[2] !== '') {
             $value = $match[2];
             $options[$option][] = $value;
diff --git a/tests/Feature/DockerCustomCommandsTest.php b/tests/Feature/DockerCustomCommandsTest.php
index e2e2cee05..21943b0b5 100644
--- a/tests/Feature/DockerCustomCommandsTest.php
+++ b/tests/Feature/DockerCustomCommandsTest.php
@@ -1,11 +1,11 @@
 <?php
 
 test('ConvertCapAdd', function () {
-    $input = '--cap-add=NET_ADMIN --cap-add=NET_RAW --cap-add SYS_ADMIN --hostname=test';
+    $input = '--cap-add=NET_ADMIN --cap-add=NET_RAW --cap-add SYS_ADMIN --hostname=my-super-host';
     $output = convertDockerRunToCompose($input);
     expect($output)->toBe([
         'cap_add' => ['NET_ADMIN', 'NET_RAW', 'SYS_ADMIN'],
-        'hostname' => 'test',
+        'hostname' => 'my-super-host',
     ]);
 });