diff --git a/tasks/main.yml b/tasks/main.yml
index e579561..e6cf9bb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,4 +1,8 @@
 ---
+- name: Ensure configuration of UFW for dbmail
+  include_tasks: configure_ufw.yml
+  when: configure_ufw
+
 - name: Ensure installation of software
   include_tasks: install.yml
 
@@ -11,13 +15,9 @@
 - name: Ensure configuration of dbmail
   include_tasks: configure_dbmail.yml
 
-- name: Ensure configuration of UFW for dbmail
-  include_tasks: configure_ufw.yml
-  when: configure_ufw
-
 - name: Ensure certificates are configured
   include_tasks: configure_certificates.yml
   when: dbmail_configuration['POP']['tls_port'] > 0 or dbmail_configuration['IMAP']['tls_port'] > 0 or dbmail_configuration['SIEVE']['tls_port'] > 0
 
 - name: Ensure user's are configured in dbmail
-  include_tasks: configure_dbmail_users.yml
\ No newline at end of file
+  include_tasks: configure_dbmail_users.yml