diff --git a/capella2polarion/converters/element_converter.py b/capella2polarion/converters/element_converter.py
index 82c11d5..ba2afa9 100644
--- a/capella2polarion/converters/element_converter.py
+++ b/capella2polarion/converters/element_converter.py
@@ -558,6 +558,11 @@ def _add_custom_diagrams(
                 650,
                 "additional-attributes-diagram",
                 cd_config.render_params,
+                (
+                    ("Figure", f"Context Diagram of {diagram.target.name}")
+                    if self.generate_figure_captions
+                    else None
+                ),
             )
             if attachment:
                 self._add_attachment(converter_data.work_item, attachment)