diff --git a/ansible_playbooks/ansible_hosts.yml b/ansible_playbooks/ansible_hosts.yml
index a4b448e..023304c 100644
--- a/ansible_playbooks/ansible_hosts.yml
+++ b/ansible_playbooks/ansible_hosts.yml
@@ -22,17 +22,6 @@ all:
               group: "bin"
               mode: "0755"
               read_only: false
-            # Moxy shared volumes
-            - name: nzbget-config
-              path: /srv/volumes/moxy/nzbget
-              owner: "nobody"
-              group: "bin"
-              read_only: false
-            - name: photoprism-storage
-              path: /srv/volumes/moxy/photoprism-storage
-              owner: "nobody"
-              group: "bin"
-              read_only: false
         n2.thefij:
           nfs_mounts:
             - src: 10.50.250.2:/srv/volumes
@@ -59,19 +48,6 @@ all:
               group: "bin"
               mode: "0755"
               read_only: false
-            # Moxy shared volumes
-            - name: nzbget-config
-              path: /srv/volumes/moxy/nzbget
-              owner: "nobody"
-              group: "bin"
-              mode: "0755"
-              read_only: false
-            - name: photoprism-storage
-              path: /srv/volumes/moxy/photoprism-storage
-              owner: "nobody"
-              group: "bin"
-              mode: "0755"
-              read_only: false
         # n3.thefij:
         #   nomad_node_class: ingress
         #   nomad_node_role: both
diff --git a/ansible_playbooks/setup-cluster.yml b/ansible_playbooks/setup-cluster.yml
index e79b41f..ede9cdc 100644
--- a/ansible_playbooks/setup-cluster.yml
+++ b/ansible_playbooks/setup-cluster.yml
@@ -205,6 +205,10 @@
         path: /srv/volumes/photos
         opts: proto=tcp,port=2049,rw
 
+      - src: 192.168.2.10:/Container
+        path: /srv/volumes/nas-container
+        opts: proto=tcp,port=2049,rw
+
   tasks:
     - name: Install nfs
       package:
@@ -245,12 +249,12 @@
       - name: photoprism-media
         path: /srv/volumes/photos/Photoprism
         read_only: false
-      # - name: tv-sonarr
-      #   path: "/srv/volumes/media-write/TV Shows"
-      #   owner: 1001
-      #   group: 100
-      #   mode: "0755"
-      #   read_only: false
+      - name: photoprism-storage
+        path: /srv/volumes/nas-container/photoprism
+        read_only: false
+      - name: nzbget-config
+        path: /srv/volumes/nas-container/nzbget
+        read_only: false
       - name: all-volumes
         path: /srv/volumes
         owner: "root"
diff --git a/services/backups/jobs/nzbget.hcl b/services/backups/jobs/nzbget.hcl
index c12c801..9c9e9e3 100644
--- a/services/backups/jobs/nzbget.hcl
+++ b/services/backups/jobs/nzbget.hcl
@@ -9,7 +9,7 @@ job "nzbget" {
   backup {
     paths = [
       # Configuration
-      "/data/nzbget",
+      "/data/nas-container/nzbget",
       # Queued nzb files
       "/data/media-write/Downloads/nzb",
     ]
diff --git a/services/backups/jobs/photoprism.hcl b/services/backups/jobs/photoprism.hcl
index 6495069..533a9fb 100644
--- a/services/backups/jobs/photoprism.hcl
+++ b/services/backups/jobs/photoprism.hcl
@@ -27,14 +27,7 @@ job "photoprism" {
   backup {
     paths = [
       "/local/photoprism",
-      # NOTE: Right now the cache and sidecar files are stored in the task local
-      # storage and not in a volume that can be backed up. This was done to allow
-      # Photoprism to be moved between hosts. If this directory becomes large and
-      # costly to move between hosts or regenerate, then it may be worth putting it
-      # on a host volume so it can be backed up as well. Possibly once I get NFS
-      # shares running from the Proxmox host available to the VMs for faster shared
-      # storage.
-      "/data/moxy/photoprism-storage",
+      "/data/nas-container/photoprism",
     ]
     # Because path is absolute
     restore_opts {
diff --git a/services/ip-dvr.nomad b/services/ip-dvr.nomad
index d1adde9..4c38535 100644
--- a/services/ip-dvr.nomad
+++ b/services/ip-dvr.nomad
@@ -95,10 +95,10 @@ job "ipdvr" {
       }
     }
 
-    volume "nzbget-data" {
+    volume "nzbget-config" {
       type = "host"
       read_only = false
-      source = "nzbget-data"
+      source = "nzbget-config"
     }
 
     volume "media-downloads" {