diff --git a/roles/bookstack/tasks/archive_pre.yml b/roles/bookstack/tasks/archive_pre.yml
index 4597df7..b8d4a64 100644
--- a/roles/bookstack/tasks/archive_pre.yml
+++ b/roles/bookstack/tasks/archive_pre.yml
@@ -6,8 +6,8 @@
 
 - name: Archive current version
   synchronize:
-    src: "{{ root_dir }}/app"
-    dest: "{{ root_dir }}/archives/{{ version }}/"
+    src: "{{ bookstack_root_dir }}/app"
+    dest: "{{ bookstack_root_dir }}/archives/{{ bookstack_current_version }}/"
     compress: False
     delete: True
     rsync_opts:
@@ -19,7 +19,7 @@
   mysql_db:
     state: dump
     name: "{{ bookstack_db_name }}"
-    target: "{{ bookstack_root_dir }}/archives/{{ current_version }}/{{ bookstack_db_name }}.sql.xz"
+    target: "{{ bookstack_root_dir }}/archives/{{ bookstack_current_version }}/{{ bookstack_db_name }}.sql.xz"
     login_host: "{{ bookstack_db_server }}"
     login_user: "{{ bookstack_db_user }}"
     login_password: "{{ bookstack_db_pass }}"
diff --git a/roles/bookstack/tasks/conf.yml b/roles/bookstack/tasks/conf.yml
index b96a6d3..ae544b1 100644
--- a/roles/bookstack/tasks/conf.yml
+++ b/roles/bookstack/tasks/conf.yml
@@ -26,12 +26,19 @@
   template: src=env.j2 dest={{ bookstack_root_dir }}/app/.env group={{ bookstack_php_user }} mode=640
   tags: bookstack
 
-- name: Migrate the database
-  shell: echo yes | /bin/php{{ bookstack_php_version }} artisan migrate
-  args:
-    chdir: "{{ bookstack_root_dir }}/app"
+- when: bookstack_install_mode != 'none'
+  block:
+    - name: Migrate the database
+      shell: echo yes | /bin/php{{ bookstack_php_version }} {{ bookstack_root_dir }}/app/artisan migrate
+
+
+    - name: Clear cache
+      command: /bin/php{{ bookstack_php_version }} {{ bookstack_root_dir }}/app/artisan cache:clear
+
+    - name: Clear views
+      command: /bin/php{{ bookstack_php_version }} {{ bookstack_root_dir }}/app/artisan view:clear
+
   become_user: "{{ bookstack_php_user }}"
-  when: bookstack_install_mode != 'none'
   tags: bookstack
 
 - name: Deploy permission script