diff --git a/host_vars/qnap.yml b/host_vars/qnap.yml
index 3eedf19..8352531 100644
--- a/host_vars/qnap.yml
+++ b/host_vars/qnap.yml
@@ -13,7 +13,11 @@ mounts:
 # these directories will be backed up to s3.
 backup_directories:
   - path: /mnt/mergerfs/photoprism/originals
-    s3_name: photos
+    s3_name: photoprism_photos
+  - path: /mnt/mergerfs/photoprism/import
+    s3_name: photoprism_import
+  - path: /mnt/mergerfs/photoprism/storage
+    s3_name: photoprism_storage
   - path: /mnt/mergerfs/documents/media/documents/originals
     s3_name: paperless-docs
 
@@ -102,6 +106,8 @@ services:
   - name: photoprism
     template_vars:
       default_network: mariadb_net
+      image: photoprism/photoprism
+      tag: 230615
   - name: olivetin
   - name: pihole
   - name: paperless
diff --git a/roles/backup_directory/tasks/main.yml b/roles/backup_directory/tasks/main.yml
index 38167f6..6728828 100644
--- a/roles/backup_directory/tasks/main.yml
+++ b/roles/backup_directory/tasks/main.yml
@@ -18,3 +18,8 @@
     region: "{{ docker_backup_aws_s3_region }}"
     mode: put
     permission: "{{ docker_backup_aws_s3_permissions }}"
+
+- name: Remove local backup.
+  file:
+    path: /tmp/backup.tar.gz
+    state: absent
diff --git a/roles/setup_hosted_services/templates/photoprism.j2 b/roles/setup_hosted_services/templates/photoprism.j2
index 9fbe64c..ac60519 100644
--- a/roles/setup_hosted_services/templates/photoprism.j2
+++ b/roles/setup_hosted_services/templates/photoprism.j2
@@ -2,7 +2,7 @@
 version: '3.5'
 services:
   photoprism:
-    image: photoprism/photoprism:latest
+    image: "{{ template_vars.image }}:{{ template_vars.tag }}"
     container_name: photoprism
     restart: unless-stopped
     security_opt: