diff --git a/roles/common/tasks/firewall.yml b/roles/common/tasks/firewall.yml
new file mode 100644
index 0000000..372acb3
--- /dev/null
+++ b/roles/common/tasks/firewall.yml
@@ -0,0 +1,12 @@
+---
+- name: Configure firewall (Debian)
+  ansible.builtin.include_tasks: firewall_Debian.yml
+  when: ansible_distribution == 'Debian'
+  tags: firewall
+
+- name: Configure firewall (Ubuntu)
+  ansible.builtin.include_tasks: firewall_Ubuntu.yml
+  when: ansible_distribution == 'Ubuntu'
+  tags: firewall
+
+
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index f09ca17..6ead520 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -18,13 +18,7 @@
   tags: packages
 
 - name: Configure firewall
-  ansible.builtin.include_tasks: firewall_Debian.yml
-  when: ansible_distribution == 'Debian'
-  tags: firewall
-
-- name: Configure firewall
-  ansible.builtin.include_tasks: firewall_Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
+  ansible.builtin.import_tasks: firewall.yml
   tags: firewall
 
 - name: Configure secure shell daemon