diff --git a/roles/mysql/database/tasks/main.yml b/roles/mysql/database/tasks/main.yml
index 9326852..5126128 100644
--- a/roles/mysql/database/tasks/main.yml
+++ b/roles/mysql/database/tasks/main.yml
@@ -23,5 +23,14 @@
   register: create_database
 
 - name: Import SQL database template on creation
-  include_tasks: import.yml
-  when: create_database.changed and database_template is defined
+  include_tasks:
+    file: import.yml
+    apply:
+      tags:
+        - mysql_database
+  when:
+    - create_database is defined
+    - create_database.changed
+    - database_template is defined
+  tags:
+    - always