diff --git a/_layouts/spotlight.html b/_layouts/spotlight.html
index ddd075e44ca775f2d1af9bd759000321a63b2d1b..87f8dbdf7d7449a13a89a3e11a56588ca7259acb 100644
--- a/_layouts/spotlight.html
+++ b/_layouts/spotlight.html
@@ -19,13 +19,13 @@
             <div class="alert alert-success spotlight-info">
                 <h3>Centres</h3>
                 {% for center in page.hgf_centers %}
-                <span>{{ center }}</span>
+                <span>{{ center }}{% unless forloop.last %},{% endunless %}</span>
                 {% endfor %}
 
                 {% if page.contributing_organisations %}
                 <h3>Contributing organisations</h3>
                 {% for org in page.contributing_organisations %}
-                <span>{{ org }}</span>
+                <span>{{ org }}{% unless forloop.last %},{% endunless %}</span>
                 {% endfor %}
                 {% endif %}
 
@@ -40,7 +40,7 @@
                 {% if page.scientific_community %}
                 <h3>Scientific community</h3>
                 {% for obj in page.scientific_community %}
-                <span>{{ obj }}</span>
+                <span>{{ obj }}{% unless forloop.last %},{% endunless %}</span>
                 {% endfor %}
                 {% endif %}
 
@@ -56,7 +56,7 @@
                 {% if page.programming_languages %}
                 <h3><i class="fas fa-code"></i> Programming Languages</h3>
                 {% for obj in page.programming_languages %}
-                <span>{{ obj }}</span>
+                <span>{{ obj }}{% unless forloop.last %},{% endunless %}</span>
                 {% endfor %}
                 {% endif %}