diff --git a/tasks/install.yml b/tasks/install.yml
index 3a5b58d8c78f66e80fd19f2cc842ad9a0520dee8..d61c4cfcc975da086b9ff01d7c82a0cd62f07eb2 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -24,5 +24,4 @@
   when: discourse_repository.changed
 
 - name: "Configure Apache"
-  include_tasks: apache.yml
-  tags: 'always'
+  import_tasks: apache.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index 261ce211ff8d3eeaf01e3983b4329fa12b43e467..79ba2bd5febf264c83809eab70c7aff7ee3ed289 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,7 +7,7 @@
 
 - block:
   - name: "Install Certs"
-    include: '../../letsencrypt/tasks/cert.yml'
+    include_tasks: '../../letsencrypt/tasks/cert.yml'
     with_items:
       - domain: '{{ discourse_domain }}'
     loop_control:
@@ -19,6 +19,6 @@
 - block:
 
   - name: "Install Discourse"
-    include: install.yml
+    import_tasks: install.yml
 
   when: '"discourse" not in excluded_roles'