diff --git a/tasks/configure_mail.yml b/tasks/configure_mail.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9176577460530a974051893bc0eb6bbb7fd50ace
--- /dev/null
+++ b/tasks/configure_mail.yml
@@ -0,0 +1,12 @@
+---
+- name: Install and configure Exim MTA.
+  ansible.builtin.import_tasks: "mail/configure_exim.yml"
+  when: ansible_distribution == "Debian"
+  tags: [exim, mail]
+
+- name: Install and configure Postfix MTA.
+  ansible.builtin.import_tasks: "mail/configure_postfix.yml"
+  when: (( ansible_os_family == "RedHat" ) or (
+         ( ansible_distribution == "Ubuntu" ))
+  tags: [postfix, mail]
+
diff --git a/tasks/configure_exim.yml b/tasks/mail/configure_exim.yml
similarity index 93%
rename from tasks/configure_exim.yml
rename to tasks/mail/configure_exim.yml
index bf3b5befa682d51920638cb6c290a0c83e579f2c..45e6dd5d0401ecb1da586a8ed7647369246bb389 100644
--- a/tasks/configure_exim.yml
+++ b/tasks/mail/configure_exim.yml
@@ -1,5 +1,10 @@
 ---
-- name: Configure exim4
+- name: Install Exim4 MTA.
+  ansible.builtin.package:
+    name: "exim4"
+    state: latest
+
+- name: Configure Exim4.
   ansible.builtin.template:
     src: 'update-exim4.conf.conf'
     dest: "/etc/exim4/update-exim4.conf.conf"
diff --git a/tasks/configure_postfix.yml b/tasks/mail/configure_postfix.yml
similarity index 81%
rename from tasks/configure_postfix.yml
rename to tasks/mail/configure_postfix.yml
index 67ff4796876d0f33de409a0c2558b245f79a4041..f727be2acd25684bca56bd2d60c59b7a9817177f 100644
--- a/tasks/configure_postfix.yml
+++ b/tasks/mail/configure_postfix.yml
@@ -1,5 +1,10 @@
 ---
-- name: configure Postfix
+- name: Install Postfix MTA.
+  ansible.builtin.package:
+    name: "postfix"
+    state: latest
+
+- name: Configure Postfix MTA.
   ansible.builtin.blockinfile:
     path: "/etc/postfix/main.cf"
     owner: "root"
diff --git a/tasks/main.yml b/tasks/main.yml
index 23134a8099478e0d2297c28219b4794ad21d03b0..970025c6101ea317ed3541cae586287828ad2b59 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -118,15 +118,9 @@
   ansible.builtin.import_tasks: "configure_sar.yml"
   tags: [sar, sysstat]
 
-- name: Exim konfigurieren
-  ansible.builtin.import_tasks: "configure_exim.yml"
-  when: ansible_os_family == "Debian"
-  tags: [exim, mail]
-
-- name: Postfix konfigurieren
-  ansible.builtin.import_tasks: "configure_postfix.yml"
-  when: ansible_os_family == "RedHat"
-  tags: [postfix, mail]
+- name: Configure Mail Transfer Agent (MTA)
+  ansible.builtin.import_tasks: "configure_mail.yml"
+  tags: [exim, postfix, mail, mta]
 
 # - name: Glances-Server abschalten
 #   ansible.builtin.import_tasks: "configure_glances.yml"