diff --git a/tasks/main.yml b/tasks/main.yml
index 8d86977e23dcb2db8e26c7e577d8f108dda515fd..dd942e0d8046ee17b7503707a3c85d9ac5b33af5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,17 +29,17 @@
     Configure Apache webserver. Converters and validators run as Apache cgi-bin
     scripts and should be reachable via HTTPS only.
   ansible.builtin.import_tasks: "configure_apache.yml"
-  tags: [apache]
+  tags: [apache, web, webserver]
 
 - name: >
     Install Callas PDF Engine SDK. This is a prerequisite to run any
     PDF-related services.
   ansible.builtin.import_tasks: "install_callas_pdf_engine.yml"
-  tags: [callas, callaspdf, callassdk]
+  tags: [converters, validators, callas, callaspdf, callassdk]
 
 - name: Compile Callas binaries.
   ansible.builtin.import_tasks: "compile_callas_binaries.yml"
-  tags: [callas, callaspdf, callassdk]
+  tags: [converters, validators, callas, callaspdf, callassdk]
 
 - name: Install fonts. Conversion requires installed fonts to work.
   ansible.builtin.import_tasks: "install_fonts.yml"
@@ -47,11 +47,11 @@
 
 - name: Install validators.
   ansible.builtin.import_tasks: "install_validators.yml"
-  tags: [validators]
+  tags: [validators, callas, callaspdf, callassdk]
 
 - name: Install converters.
   ansible.builtin.import_tasks: "install_converters.yml"
-  tags: [converters]
+  tags: [converters, callas, callaspdf, callassdk]
 
 - name: >
     Configure Crontab for cleanup tasks in order to prevent clogging the