diff --git a/CHANGELOG.md b/CHANGELOG.md
index e54372b7..ad5eecd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 ### Fixed
 
 * Enforce String notation for mode
+* postgresql: fix nested loop for Munin plugins
 
 ### Removed
 
diff --git a/postgresql/tasks/munin.yml b/postgresql/tasks/munin.yml
index ed2cc883..227304c8 100644
--- a/postgresql/tasks/munin.yml
+++ b/postgresql/tasks/munin.yml
@@ -30,7 +30,15 @@
     dest: '/etc/munin/plugins/{{item[0]}}{{item[1]}}'
   loop: "{{ _plugins | product(_databases) | list }}"
   vars:
-    _plugins: ['postgres_cache_', 'postgres_connections_', 'postgres_locks_', 'postgres_querylength_', 'postgres_scans_', 'postgres_size_', 'postgres_transactions_', 'postgres_tuples_']
-    _databases: postgresql_databases
+    _plugins:
+      - 'postgres_cache_'
+      - 'postgres_connections_'
+      - 'postgres_locks_'
+      - 'postgres_querylength_'
+      - 'postgres_scans_'
+      - 'postgres_size_'
+      - 'postgres_transactions_'
+      - 'postgres_tuples_'
+    _databases: "{{ postgresql_databases }}"
   notify: restart munin-node
   when: etc_munin_plugins.stat.exists and usr_share_munin_plugins.stat.exists