diff --git a/tasks/install.yml b/tasks/install.yml
index d3a567a44235eec5dc7c7c224bdda30020bc1dba..76b3ee80487403efd32fbe43c55b93dfd3a94612 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -2,7 +2,8 @@
 # file: roles/discourse/tasks/install.yml
 
 - name: "Configure Apache"
-  import_tasks: apache.yml
+  include_tasks: apache.yml
+  tags: 'always'
 
 - name: "Clone Repository"
   git:
diff --git a/tasks/main.yml b/tasks/main.yml
index e634569aaf34f8e66a7e39a3edbdb117249e3ca0..a92be6eec4025e2a3004d8009ce72e28034bd743 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,7 +3,7 @@
 
 - name: "Docker Discourse"
   set_fact: role_discourse_started=true
-  tags: always
+  tags: 'always'
 
 - block:
   - name: "Install Certs"
@@ -13,12 +13,14 @@
     loop_control:
       loop_var: domain
     when: discourse_protocol|default("https") == "https" and discourse_letsencrypt|default(true)
+    tags: 'always'
 
   when: '"letsencrypt" not in excluded_roles and groups.proxyserver is not defined'
 
 - block:
 
   - name: "Install Discourse"
-    import_tasks: install.yml
+    include_tasks: install.yml
+    tags: 'always'
 
   when: '"discourse" not in excluded_roles'