diff --git a/ironic/files/pike/ironic.conf b/ironic/files/pike/ironic.conf
index abd8737..86b4d95 100644
--- a/ironic/files/pike/ironic.conf
+++ b/ironic/files/pike/ironic.conf
@@ -3858,7 +3858,11 @@
 
 # IP address of ironic-conductor node's TFTP server. (string
 # value)
+{%- if conductor.get('tftp_server') %}
+tftp_server = {{ conductor.tftp_server }}
+{%- else %}
 #tftp_server = $my_ip
+{%- endif %}
 
 # ironic-conductor node's TFTP root path. The ironic-conductor
 # must have read/write access to this path. (string value)
diff --git a/ironic/files/queens/ironic.conf b/ironic/files/queens/ironic.conf
index 8a7a949..668e9c1 100644
--- a/ironic/files/queens/ironic.conf
+++ b/ironic/files/queens/ironic.conf
@@ -2383,7 +2383,11 @@
 
 # IP address of ironic-conductor node's TFTP server. (string
 # value)
+{%- if conductor.get('tftp_server') %}
+tftp_server = {{ conductor.tftp_server }}
+{%- else %}
 #tftp_server = $my_ip
+{%- endif %}
 
 # ironic-conductor node's TFTP root path. The ironic-conductor
 # must have read/write access to this path. (string value)