diff --git a/templates/field/field--paragraph--field-service-links--popular-service-item.html.twig b/templates/field/field--paragraph--field-service-links--popular-service-item.html.twig
index 673e76b1b..f4aad0dfe 100644
--- a/templates/field/field--paragraph--field-service-links--popular-service-item.html.twig
+++ b/templates/field/field--paragraph--field-service-links--popular-service-item.html.twig
@@ -1,7 +1,7 @@
{% if items is not empty %}
-
- {% for item in items %}
- - {{ item.content }}
- {% endfor %}
-
+ {% embed "@hdbt/misc/popular-service-links.twig" with { items: items } %}
+ {% block link %}
+ {{ item.content }}
+ {% endblock %}
+ {% endembed %}
{% endif %}
diff --git a/templates/misc/popular-service-item.twig b/templates/misc/popular-service-item.twig
new file mode 100644
index 000000000..e085330c7
--- /dev/null
+++ b/templates/misc/popular-service-item.twig
@@ -0,0 +1,6 @@
+
+
{{ title }}
+ {% block links %}
+ {{ content }}
+ {% endblock %}
+
diff --git a/templates/misc/popular-service-links.twig b/templates/misc/popular-service-links.twig
new file mode 100644
index 000000000..2dbbd549f
--- /dev/null
+++ b/templates/misc/popular-service-links.twig
@@ -0,0 +1,11 @@
+{% if items is not empty %}
+
+ {% for item in items %}
+ -
+ {% block link %}
+ {{ link }}
+ {% endblock %}
+
+ {% endfor %}
+
+{% endif %}
diff --git a/templates/paragraphs/paragraph--popular-service-item.html.twig b/templates/paragraphs/paragraph--popular-service-item.html.twig
index f2eab0dce..57c8f5706 100644
--- a/templates/paragraphs/paragraph--popular-service-item.html.twig
+++ b/templates/paragraphs/paragraph--popular-service-item.html.twig
@@ -1,4 +1,5 @@
-
-
{{ content.field_service_title }}
- {{ content.field_service_links }}
-
+{% embed "@hdbt/misc/popular-service-item.twig" with { title: content.field_service_title } %}
+ {% block links %}
+ {{ content.field_service_links }}
+ {% endblock links %}
+{% endembed %}