diff --git a/tasks/main.yml b/tasks/main.yml
index 95a9d68ee663074eebb891246b0a1022b507c677..3f76f4543cab6c634cb69381f87a22b5e0e8672c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,11 +7,11 @@
 
 - name: install packages
   ansible.builtin.import_tasks: "install_packages.yml"
-  tags: [apt]
+  tags: [apt, package, packages]
 
 - name: create users and groups
   ansible.builtin.import_tasks: "create_users_groups.yml"
-  tags: [users]
+  tags: [user, users, group, groups]
 
 - name: configure local mounts
   ansible.builtin.import_tasks: "configure_local_mounts.yml"
@@ -27,11 +27,11 @@
 
 - name: install Callas PDF Engine SDK
   ansible.builtin.import_tasks: "install_callas_pdf_engine.yml"
-  tags: [callaspdf]
+  tags: [callas, callaspdf, callassdk]
 
 - name: compile Callas binaries
   ansible.builtin.import_tasks: "compile_callas_binaries.yml"
-  tags: [callaspdf]
+  tags: [callas, callaspdf, callassdk]
 
 - name: install fonts
   ansible.builtin.import_tasks: "install_fonts.yml"
@@ -51,4 +51,4 @@
 
 - name: configure iptables
   ansible.builtin.import_tasks: "configure_iptables.yml"
-  tags: [iptables]
+  tags: [firewall, iptables]