diff --git a/postgresql/tasks/postgresql-config.yml b/postgresql/tasks/postgresql-config.yml
index fa17baf9..b27fcc0e 100644
--- a/postgresql/tasks/postgresql-config.yml
+++ b/postgresql/tasks/postgresql-config.yml
@@ -25,7 +25,7 @@
   become: True
   become_user: postgres
   action: configfile path={{ psql_conf_dir }}/postgresql.conf key={{ item.name }} value="{{ item.value }}"
-  with_items: '{{ psql_log_parameters }}'
+  with_items: '{{ psql_log_configuration }}'
   when: item.set == 'True'
   notify: Reload postgresql
   tags: [ 'postgresql', 'postgres', 'pg_conf', 'pg_conf_log' ]
@@ -34,8 +34,8 @@
   become: True
   become_user: postgres
   action: configfile path={{ psql_conf_dir }}/postgresql.conf key={{ item.name }} value="{{ item.value }}"
-  with_items: '{{ psql_autovacuum_parameters }}'
+  with_items: '{{ psql_autovacuum_configuration }}'
   when: item.set == 'True'
   notify: Reload postgresql
-  tags: [ 'postgresql', 'postgres', 'pg_conf', 'pg_autovacuum_log' ]
+  tags: [ 'postgresql', 'postgres', 'pg_conf', 'pg_conf_autovacuum' ]