diff --git a/tasks/main.yml b/tasks/main.yml
index d83ffcd..5b47086 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,6 +6,7 @@
 - name: Database
   ansible.builtin.import_tasks: database.yml
   when: grafana_db_type != "sqlite3"
+  tags: database
   delegate_to: "{{ database_host }}"
 
 - name: Configuration
@@ -14,4 +15,5 @@
 
 - name: Webserver
   ansible.builtin.import_tasks: webserver.yml
+  when: grafana_webserver is defined
   tags: webserver