diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index e4d053e..f6593b2 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -29,8 +29,8 @@
 - name: Configure amavis
   template: src={{ item }}.j2 dest=/etc/{{ item }}
   with_items:
-  - amavis/15-content_filter_mode
-  - amavis/50-user
+  - amavis/conf.d/15-content_filter_mode
+  - amavis/conf.d/50-user
   notify: Restart amavis
 
 - name: Create dovecot ssl directory
diff --git a/roles/mail/templates/amavis/15-content_filter_mode.j2 b/roles/mail/templates/amavis/conf.d/15-content_filter_mode.j2
similarity index 100%
rename from roles/mail/templates/amavis/15-content_filter_mode.j2
rename to roles/mail/templates/amavis/conf.d/15-content_filter_mode.j2
diff --git a/roles/mail/templates/amavis/50-user.j2 b/roles/mail/templates/amavis/conf.d/50-user.j2
similarity index 100%
rename from roles/mail/templates/amavis/50-user.j2
rename to roles/mail/templates/amavis/conf.d/50-user.j2