diff --git a/include/display/cfb.h b/include/display/cfb.h
index 9dbf2fb09c3..69eb82827c6 100644
--- a/include/display/cfb.h
+++ b/include/display/cfb.h
@@ -67,8 +67,7 @@ struct cfb_font {
  * @param _lc     Character mapped to last font element.
  */
 #define FONT_ENTRY_DEFINE(_name, _width, _height, _caps, _data, _fc, _lc)      \
-	static const struct cfb_font _name				       \
-	__attribute__ ((section(".font_entry."))) __attribute__((used)) =      \
+	static const Z_STRUCT_SECTION_ITERABLE(cfb_font, _name) =	       \
 	{								       \
 		.width = _width,					       \
 		.height = _height,					       \
diff --git a/include/linker/common-rom.ld b/include/linker/common-rom.ld
index e97a61f113c..71371bba22a 100644
--- a/include/linker/common-rom.ld
+++ b/include/linker/common-rom.ld
@@ -132,6 +132,6 @@
 	SECTION_DATA_PROLOGUE(font_entry_sections,,)
 	{
 		__font_entry_start = .;
-		KEEP(*(SORT_BY_NAME(".font_entry.*")))
+		KEEP(*(SORT_BY_NAME("._cfb_font.*")))
 		__font_entry_end = .;
 	} GROUP_LINK_IN(ROMABLE_REGION)