diff --git a/handlers/main.yml b/handlers/main.yml
index 3ed7b349eb6aeaeda9c789e60c7c682d717c3993..cafbeb477cd41ff9830faabc7b653dbc967ec7ca 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,4 @@
 ---
 # file: roles/letsencrypt/handler/main.yml
 
-- include_tasks: '../../haproxy/handlers/main.yml'
-  tags: 'always'
+- include: '../../haproxy/handlers/main.yml'
diff --git a/tasks/main.yml b/tasks/main.yml
index 1fbb40ff85ad99a9f6d9ee9211205ae0751e0e2e..be72d2014fa1945b621a83c29cafa044b4574b88 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -20,16 +20,14 @@
     changed_when: false
     tags: 'always'
 
-  - include_tasks: install.yml
-    tags: 'always'
+  - include: install.yml
 
-  - include_tasks: cert.yml
+  - include: cert.yml
     with_items: '{{ letsencrypt_certificates|default([]) }}'
     loop_control:
       loop_var: domain
-    tags: 'always'
 
-  - include_tasks: renew.yml
+  - include: 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'