diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 8feb43e..8668628 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -56,7 +56,6 @@ class ServerController extends Controller
 
     public function store(Request $request)
     {
-        $rootPassword = Str::random(32);
         $sudoPassword = Str::random(32);
         $providerService = app(GetProviderService::class)->execute($request->provider);
 
@@ -69,7 +68,6 @@ class ServerController extends Controller
             serverType: $request->server_type,
             location: $request->location,
             image: $request->image,
-            rootPassword: $rootPassword,
         );
 
         $organisation = Organisation::findOrFail($request->route('organisation'));
@@ -90,7 +88,7 @@ class ServerController extends Controller
 
         dispatch(new WaitForServerToConnect(
             server: $server,
-            rootPassword: $rootPassword,
+            rootPassword: $createdServer->rootPassword,
             sudoPassword: $sudoPassword,
         ))->delay(now()->addSeconds(30));
 
diff --git a/app/Http/Integrations/Requests/Hetzner/Servers/CreateServerRequest.php b/app/Http/Integrations/Requests/Hetzner/Servers/CreateServerRequest.php
index 3c85401..cdc1f83 100644
--- a/app/Http/Integrations/Requests/Hetzner/Servers/CreateServerRequest.php
+++ b/app/Http/Integrations/Requests/Hetzner/Servers/CreateServerRequest.php
@@ -18,7 +18,6 @@ class CreateServerRequest extends Request implements HasBody
         protected ?string $name = null,
         protected ?string $serverType = null,
         protected ?string $location = null,
-        protected ?string $rootPassword = null,
     ) {}
 
     protected function defaultBody(): array
@@ -28,7 +27,6 @@ class CreateServerRequest extends Request implements HasBody
             'name' => $this->name,
             'server_type' => $this->serverType,
             'location' => $this->location,
-            'root_password' => $this->rootPassword,
         ];
     }
 
diff --git a/app/Services/ServerProviders/HetznerService.php b/app/Services/ServerProviders/HetznerService.php
index 767f2a8..4cfbb65 100644
--- a/app/Services/ServerProviders/HetznerService.php
+++ b/app/Services/ServerProviders/HetznerService.php
@@ -26,14 +26,12 @@ class HetznerService extends ServerProviderService
         string $serverType,
         string $location,
         string $image,
-        string $rootPassword,
     ): CreatedServer {
         $response = $this->connector->send(new CreateServerRequest(
             image: $image,
             name: $name,
             serverType: $serverType,
             location: $location,
-            rootPassword: $rootPassword,
         ));
 
         if ($response->status() !== 201) {
@@ -43,7 +41,7 @@ class HetznerService extends ServerProviderService
         return new CreatedServer(
             id: $response->json('server.id'),
             name: $name,
-            rootPassword: $rootPassword,
+            rootPassword: $response->json('root_password'),
             status: $response->json('server.status'),
             ipv4: $response->json('server.public_net.ipv4.ip'),
             ipv6: $response->json('server.public_net.ipv6.ip'),
diff --git a/app/Services/ServerProviders/ServerProviderService.php b/app/Services/ServerProviders/ServerProviderService.php
index c55e785..f4ae1f6 100644
--- a/app/Services/ServerProviders/ServerProviderService.php
+++ b/app/Services/ServerProviders/ServerProviderService.php
@@ -15,7 +15,6 @@ abstract class ServerProviderService
         string $serverType,
         string $location,
         string $image,
-        string $rootPassword,
     ): CreatedServer;
 
     abstract public function getServerTypes(): Collection;