diff --git a/rust/agama-manager/src/service.rs b/rust/agama-manager/src/service.rs
index 046dd14634..d63f926278 100644
--- a/rust/agama-manager/src/service.rs
+++ b/rust/agama-manager/src/service.rs
@@ -581,6 +581,7 @@ impl MessageHandler<message::RunAction> for Service {
             }
             Action::Install => {
                 let action = InstallAction {
+                    hostname: self.hostname.clone(),
                     l10n: self.l10n.clone(),
                     network: self.network.clone(),
                     software: self.software.clone(),
@@ -645,6 +646,7 @@ impl MessageHandler<software::message::SetResolvables> for Service {
 ///
 /// This action runs on a separate Tokio task to prevent the manager from blocking.
 struct InstallAction {
+    hostname: Handler<hostname::Service>,
     l10n: Handler<l10n::Service>,
     network: NetworkSystemClient,
     software: Handler<software::Service>,
@@ -717,6 +719,7 @@ impl InstallAction {
         self.l10n.call(l10n::message::Install).await?;
         self.software.call(software::message::Finish).await?;
         self.files.call(files::message::WriteFiles).await?;
+        self.hostname.call(hostname::message::Install).await?;
         self.storage.call(storage::message::Finish).await?;
 
         //
diff --git a/rust/agama-server/src/hostname.rs b/rust/agama-server/src/hostname.rs
deleted file mode 100644
index 1202c7853c..0000000000
--- a/rust/agama-server/src/hostname.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) [2025] SUSE LLC
-//
-// All Rights Reserved.
-//
-// This program is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 2 of the License, or (at your option)
-// any later version.
-//
-// This program is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-// more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, contact SUSE LLC.
-//
-// To contact SUSE LLC about this file by physical or electronic mail, you may
-// find current contact information at www.suse.com.
-
-pub mod web;