diff --git a/spacewalk/setup/bin/spacewalk-setup-cobbler b/spacewalk/setup/bin/spacewalk-setup-cobbler
index 707a5f111170..8d9cca655337 100755
--- a/spacewalk/setup/bin/spacewalk-setup-cobbler
+++ b/spacewalk/setup/bin/spacewalk-setup-cobbler
@@ -75,6 +75,7 @@ def manipulate_cobbler_settings(config_dir: str, settings_yaml: str, fqdn: str):
 
     filecontent["pxe_just_once"] = True
     filecontent["redhat_management_server"] = fqdn or socket.getfqdn()
+    filecontent["client_use_localhost"] = True
     yaml_dump = yaml.safe_dump(filecontent)
     with open(full_path, "w") as settings_file:
         settings_file.write(yaml_dump)
diff --git a/spacewalk/setup/spacewalk-setup.changes.cbosdo.tag-cleanup b/spacewalk/setup/spacewalk-setup.changes.cbosdo.tag-cleanup
new file mode 100644
index 000000000000..1519aef90799
--- /dev/null
+++ b/spacewalk/setup/spacewalk-setup.changes.cbosdo.tag-cleanup
@@ -0,0 +1 @@
+- Use localhost for Cobbler client to avoid hairpins