diff --git a/roles/calibre-web/tasks/main.yml b/roles/calibre-web/tasks/main.yml
index 04f4a2d0d..9a47ce905 100644
--- a/roles/calibre-web/tasks/main.yml
+++ b/roles/calibre-web/tasks/main.yml
@@ -47,7 +47,12 @@
     - { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service', mode: '0644' }
     - { src: 'calibre-web.conf.j2', dest: '/etc/apache2/sites-available/calibre-web.conf', mode: '0644' }
 
-- name: Provision calibre-web default metadata
+- name: Does /library/calibre-web/metadata.db exist?
+  stat:
+    path: /library/calibre-web/metadata.db
+  register: metadatadb
+
+- name: Provision/Copy both default metadata files into /library/calibre-web IF metadata.db did not exist
   copy:
     src: "{{ item }}"
     dest: "{{ calibreweb_home }}"
@@ -58,9 +63,10 @@
   with_items:
     - roles/calibre-web/files/metadata.db
     - roles/calibre-web/files/metadata_db_prefs_backup.json
-  when: calibreweb_provision
+  when: not metadatadb.stat.exists
+  #when: calibreweb_provision
 
-- name: Provision calibre-web with default administration settings
+- name: Provision/Copy default admin settings to /library/calibre-web/config/app.db IF metadata.db did not exist
   copy:
     src: roles/calibre-web/files/app.db
     dest: "{{ calibreweb_config }}"
@@ -68,7 +74,8 @@
     group: "{{ apache_user }}"
     mode: 0644
     backup: yes
-  when: calibreweb_provision
+  when: not metadatadb.stat.exists
+  #when: calibreweb_provision
 
 - name: Enable and restart calibre-web service
   systemd:
@@ -130,5 +137,5 @@
       value: "{{ calibreweb_database }}"
     - option: calibreweb_enabled
       value: "{{ calibreweb_enabled }}"
-    - option: calibreweb_provision
-      value: "{{ calibreweb_provision }}"
+#   - option: calibreweb_provision
+#     value: "{{ calibreweb_provision }}"