diff --git a/postfix/files/mapping.j2 b/postfix/files/mapping.j2
index 5045b1f..fac8e7f 100644
--- a/postfix/files/mapping.j2
+++ b/postfix/files/mapping.j2
@@ -3,8 +3,9 @@
 {%- macro format_value(key, value) %}
   {#- Some settings, like virtual_alias_maps can take multiple values. Handle this case. -#}
   {%- if value is iterable and value is not string -%}
-    {%- for item in value %}
-{{ key }}	{{ item }}
+{{ key }}	{% for item in value -%}
+    {{ item }}
+    {%- if not loop.last %}, {% endif %}
     {%- endfor %}
   {%- else -%}
 {{ key }}	{{ value }}