diff --git a/tasks/main.yml b/tasks/main.yml
index 93b2d736d94817e11b494be33263b7e7c0a5fb8d..477bd2195b26ea53021de880bc592ca0e2c2f2c6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,12 +3,13 @@
 
 - name: "HaProxy Role"
   set_fact: role_haproxy_started=true
-  tags: always
+  tags: 'always'
 
 - block:
 
-  - import_tasks: install.yml
-  - import_tasks: configure.yml
+  - include_tasks: install.yml
+    tags: 'always'
+  - include_tasks: configure.yml
     tags: Config
 
   when: '"haproxy" not in excluded_roles'
@@ -21,12 +22,15 @@
     loop_control:
       loop_var: domain
     when: domain.letsencrypt|default(false) and domain.active|default(true)
+    tags: 'always'
 
   - name: "Renew Existing Cert"
-    import_tasks: '../../letsencrypt/tasks/renew.yml'
+    include_tasks: '../../letsencrypt/tasks/renew.yml'
+    tags: 'always'
 
   - name: "Build HaCerts"
-    import_tasks: 'buildcerts.yml'
+    include_tasks: 'buildcerts.yml'
+    tags: 'always'
 
   - name: "Set directory permissions to current user"
     file:
@@ -42,9 +46,9 @@
 - block:
 
   - name: "Pull Certs from active Proxy"
-    import_tasks: 'pullcerts.yml'
+    include_tasks: 'pullcerts.yml'
+    tags: Certs
 
-  tags: Certs
   when: 'not proxy_active and "letsencrypt" not in excluded_roles'
 
 - name: "Set directory permissions to root"