diff --git a/tasks/main.yml b/tasks/main.yml
index 805c03a04a41ad1c53a977d46cc7e4929a6067a7..85d5ea3e879e4cf73e48d0a1f102ab923d67e045 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,6 +7,6 @@
 
 - block:
 
-  - include: spideroak.yml
+  - import_tasks: spideroak.yml
 
   when: '"spideroak" not in excluded_roles and spideroak_username is defined and spideroak_username != ""'
diff --git a/tasks/spideroak.yml b/tasks/spideroak.yml
index 1ee1599f1b956067900f81f801d39ab4675488dd..80a6fb35dc443d0b64032c2d5c75de1aab0d4bf1 100644
--- a/tasks/spideroak.yml
+++ b/tasks/spideroak.yml
@@ -24,9 +24,8 @@
     state='installed'
     update_cache=yes
 
-- include_tasks: register.yml
+- import_tasks: register.yml
   when: spideroak_available is defined and spideroak_available.stdout != '/usr/bin/SpiderOakONE'
-  tags: 'always'
 
 - name: "Stop SpiderOak"
   service: