diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0087c1fc7..ad5019efc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - omid: init at 1.1.0 ([#493]).
-- hadoop: Allow datanodes to override their registration addresses ([#506]).
+- hadoop: Allow datanodes to override their registration addresses ([#506], [#544]).
 - nifi: Add Apache Iceberg extensions ([#529]).
 - testing-tools: Add krb5-user library for Kerberos tests ([#531]).
 - testing-tools: Add the Python library Beautiful Soup 4 ([#536]).
@@ -36,6 +36,7 @@ All notable changes to this project will be documented in this file.
 [#538]: https://github.com/stackabletech/docker-images/pull/538
 [#539]: https://github.com/stackabletech/docker-images/pull/539
 [#542]: https://github.com/stackabletech/docker-images/pull/542
+[#544]: https://github.com/stackabletech/docker-images/pull/544
 
 ## [23.11.0] - 2023-11-30
 
diff --git a/hadoop/stackable/patches/3.3.4/002-datanode-registration-override-3.3.4.patch b/hadoop/stackable/patches/3.3.4/002-datanode-registration-override-3.3.4.patch
index db97dba26..2acdc9610 100644
--- a/hadoop/stackable/patches/3.3.4/002-datanode-registration-override-3.3.4.patch
+++ b/hadoop/stackable/patches/3.3.4/002-datanode-registration-override-3.3.4.patch
@@ -234,7 +234,7 @@ index c1507a45120..d253779e70d 100644
 +    }
 +
 +    DatanodeID dnId = new DatanodeID(registeredHostname,
-+                                     hostName,
++                                     registeredHostname,
 +                                     storage.getDatanodeUuid(),
 +                                     registeredDataPort,
 +                                     registeredHttpPort,
diff --git a/hadoop/stackable/patches/3.3.6/002-datanode-registration-override-3.3.6.patch b/hadoop/stackable/patches/3.3.6/002-datanode-registration-override-3.3.6.patch
index 475a5b756..9e08b9227 100644
--- a/hadoop/stackable/patches/3.3.6/002-datanode-registration-override-3.3.6.patch
+++ b/hadoop/stackable/patches/3.3.6/002-datanode-registration-override-3.3.6.patch
@@ -234,7 +234,7 @@ index 96c4ad9ae28..fdb8e631dc8 100644
 +    }
 +
 +    DatanodeID dnId = new DatanodeID(registeredHostname,
-+                                     hostName,
++                                     registeredHostname,
 +                                     storage.getDatanodeUuid(),
 +                                     registeredDataPort,
 +                                     registeredHttpPort,