diff --git a/tasks/install-postfix_debian.yml b/tasks/install-postfix.debian.yml
similarity index 100%
rename from tasks/install-postfix_debian.yml
rename to tasks/install-postfix.debian.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index 11d98561884a4539610f12d3726cb76a19b8a213..31bb81b3f21192183611fd08edbfd6b010e8fb96 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,11 +3,11 @@
   loop_control:
     loop_var: task_file
   with_first_found:
-    - tasks/install-postfix_{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
-    - tasks/install-postfix_{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
-    - tasks/install-postfix_{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
-    - tasks/install-postfix_{{ ansible_distribution | lower }}.yml
-    - tasks/install-postfix_{{ ansible_os_family | lower }}.yml
+    - tasks/install-postfix.{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
+    - tasks/install-postfix.{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
+    - tasks/install-postfix.{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
+    - tasks/install-postfix.{{ ansible_distribution | lower }}.yml
+    - tasks/install-postfix.{{ ansible_os_family | lower }}.yml
 
 - name: Generate Postfix 'main.cf' configuration
   template: