diff --git a/handlers/main.yml b/handlers/main.yml
index 236af4cd249d376e06112552b720fca5e152424d..3ed7b349eb6aeaeda9c789e60c7c682d717c3993 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,5 @@
 ---
 # file: roles/letsencrypt/handler/main.yml
 
-- import_tasks: '../../haproxy/handlers/main.yml'
+- include_tasks: '../../haproxy/handlers/main.yml'
+  tags: 'always'
diff --git a/tasks/main.yml b/tasks/main.yml
index 2df762b543fdadd8ec3ea188463c0104ae216c7b..1fbb40ff85ad99a9f6d9ee9211205ae0751e0e2e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,7 +3,7 @@
 
 - name: "LetsEncrypt Role"
   set_fact: role_letsencrypt_started=true
-  tags: always
+  tags: 'always'
 
 - block:
 
@@ -20,14 +20,16 @@
     changed_when: false
     tags: 'always'
 
-  - import_tasks: install.yml
+  - include_tasks: install.yml
+    tags: 'always'
 
   - include_tasks: cert.yml
     with_items: '{{ letsencrypt_certificates|default([]) }}'
     loop_control:
       loop_var: domain
+    tags: 'always'
 
-  - import_tasks: renew.yml
+  - include_tasks: renew.yml
     when: letsencrypt_certs_available is defined and letsencrypt_certs_available.stat.exists and (proxy_active is not defined or proxy_active)
     tags: 'renew'
 
diff --git a/tasks/renew.yml b/tasks/renew.yml
index b5583b248a23dbd068d2f3b25bf49f568f3cc78c..fac4aef8237d9f918c55ff8e64352491cf5a981c 100644
--- a/tasks/renew.yml
+++ b/tasks/renew.yml
@@ -34,7 +34,8 @@
     state: 'absent'
 
 - name: "Build HaProxy Certs"
-  import_tasks: '../../haproxy/tasks/buildcerts.yml'
+  include_tasks: '../../haproxy/tasks/buildcerts.yml'
+  tags: 'always'
 
 - name: "Start services"
   service: