diff --git a/templates/ceph.conf b/templates/ceph.conf
index 5ea82d18..e168f54a 100644
--- a/templates/ceph.conf
+++ b/templates/ceph.conf
@@ -22,6 +22,13 @@ public network = {{ ceph_public_network }}
 cluster network = {{ ceph_cluster_network }}
 {%- endif %}
 
+{% if public_addr %}
+public addr = {{ public_addr }}
+{% endif %}
+{% if cluster_addr %}
+cluster addr = {{ cluster_addr }}
+{%- endif %}
+
 [mon]
 keyring = /var/lib/ceph/mon/$cluster-$id/keyring
 
@@ -33,9 +40,3 @@ keyring = /var/lib/ceph/osd/$cluster-$id/keyring
 osd journal size = {{ osd_journal_size }}
 filestore xattr use omap = true
 
-{% if public_addr %}
-public addr = {{ public_addr }}
-{% endif %}
-{% if cluster_addr %}
-cluster addr = {{ cluster_addr }}
-{%- endif %}