diff --git a/tasks/main.yml b/tasks/main.yml
index cb135b8a0a90d38e008554b164f1333ff7d94f34..fbf9ac0f7e39f866a9f6923d58dfd57b28b6a31f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,7 +3,7 @@
 
 - name: "Oracle Role"
   set_fact: role_oracle_started=true
-  tags: always
+  tags: 'always'
 
 - block:
 
@@ -22,9 +22,11 @@
     register: last_result
     ignore_errors: yes
 
-  - import_tasks: prepare.yml
+  - include_tasks: prepare.yml
     when: "last_result is defined and last_result.stdout != oracle_version"
+    tags: 'always'
 
-  - import_tasks: configure.yml
+  - include_tasks: configure.yml
+    tags: 'always'
 
   when: '"oracle" not in excluded_roles'