diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8adddb6eb9..ddeb8d7c366 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Fix the hostname rename page for containers in Troubleshooting of
+  Administration Guide (bsc#1229825)
 - Fixed upgrade procedure for server and proxy in Installation and
   Upgrade Guide (bsc#1247084)
 - Added revision date to metadata for tracking document changes
diff --git a/modules/administration/pages/troubleshooting/tshoot-hostname-rename.adoc b/modules/administration/pages/troubleshooting/tshoot-hostname-rename.adoc
index 5d8c3025d17..8bf1c9734ec 100644
--- a/modules/administration/pages/troubleshooting/tshoot-hostname-rename.adoc
+++ b/modules/administration/pages/troubleshooting/tshoot-hostname-rename.adoc
@@ -37,39 +37,55 @@ This is because the changes have not been made in the database, which prevents t
 
 == Rename Server
 
-
-If you need to change the hostname of the {productname} Server, you can do so using the [command]``spacewalk-hostname-rename`` script.
-This script updates the settings in the {postgresql} database and the internal structures of {productname}.
+If you need to change the hostname of the {productname} Server, you can do so using the [command]``mgradm server rename`` command.
+This command updates the settings in the {postgresql} database and the internal structures of {productname}.
 
 
 
 === Server Configuration
 
-The [command]``spacewalk-hostname-rename`` script is part of the [package]``spacewalk-utils`` package.
+The command takes no mandatory parameter, but can take the new hostname if it is not the one from the container host.
 
-The only mandatory parameter for the script is the newly configured IP address of the {productname} Server.
 
+In case any SSL certificate needs to be generated to match the new hostname, the SSL CA password needs to be provided.
+This is safely achieved using a configuration file
 
+.Procedure: Prepare the configuration file for the SSL CA password
+. Write a [path]``config.yaml`` file with content like the following:
++
+[source,shell]
+----
+ssl:
+  password: "<THE CA PASSWORD>"
+----
 
 .Procedure: Renaming {productname} Server
 . Change the network settings of the server on the system level locally and remotely at the DNS server.
     You also need to provide configuration settings for reverse name resolution.
     Changing network settings is done in the same way as with renaming any other system.
 . Reboot the {productname} Server to use the new network configuration and to ensure the hostname has changed.
-. On the container host, from the command line, execute the following command to configure the public IP address of the server:
+. On the container host, from the command line, execute the following command. Add [command]``-c config.yaml`` if you created the file to store the SSL CA password:
 
 +
 
 [source,shell]
 ----
-mgrctl exec -ti -- spacewalk-hostname-rename <PUBLIC_IP_ADDRESS>
+mgradm server rename
 ----
 
 +
 
-If the server is not using the new hostname, the script fails.
-  Be aware that this script refreshes the pillar data for all {salt} clients: the time it takes to run depends on the number of registered clients.
+If the new hostname is not resolvable, the command fails.
+
+The renaming procedure also takes place during the restart of the server container.
+The logs can be found by running this command:
+
+[source,shell]
+----
+mgrctl exec -ti -- journalctl -u uyuni-update-config
+----
 
+Be aware that this command triggers a refresh of the pillar data for all {salt} clients when restarting the server container: the time it takes to run depends on the number of registered clients.
 
 
 === Directly Managed Clients Reconfiguration