diff --git a/playbooks/device_roles_workstation.yml b/playbooks/device_roles_workstation.yml
index eab2192..21f5466 100755
--- a/playbooks/device_roles_workstation.yml
+++ b/playbooks/device_roles_workstation.yml
@@ -4,11 +4,11 @@
   # Home desktops
 - hosts: device_roles_workstation
   tasks:
-    - name: assure pi-storage-1 nfs mountpoint
-      file: path=/nfs/pi-storage-1.desu.ltd state=directory owner=root mode=0755
+    - name: assure pi-media-1 nfs mountpoint
+      file: path=/nfs/pi-media-1.desu.ltd state=directory owner=root mode=0755
       tags: [ desktop, nfs ]
-    - name: assure pi-storage-1 nfs mount
-      mount: path=/nfs/pi-storage-1.desu.ltd src=pi-storage-1.desu.ltd:/srv/nfs fstype=nfs4 opts="rsize=10248576,wsize=1048576,soft,timeo=600,retrans=2,_netdev" state=mounted
+    - name: assure pi-media-1 nfs mount
+      mount: path=/nfs/pi-media-1.desu.ltd src=pi-media-1.desu.ltd:/data/shared/media fstype=nfs4 opts="rsize=10248576,wsize=1048576,soft,timeo=600,retrans=2,_netdev" state=mounted
       tags: [ desktop, nfs ]
   roles:
     - role: udev
diff --git a/playbooks/home_media.yml b/playbooks/home_media.yml
index 228a321..1743030 100755
--- a/playbooks/home_media.yml
+++ b/playbooks/home_media.yml
@@ -136,8 +136,5 @@
     - role: nfs
       vars:
         nfs_exports:
-          - "/srv/nfs              192.168.0.0/16(ro,no_root_squash,sync) 172.23.0.0/16(ro,no_root_squash,sync)"
-          - "/srv/nfs/bulk         192.168.0.0/16(rw,no_root_squash,sync) 172.23.0.0/16(rw,no_root_squash,sync)"
-          - "/srv/nfs/bulk/media   192.168.0.0/16(rw,no_root_squash,sync) 172.23.0.0/16(rw,no_root_squash,sync)"
-          - "/srv/nfs/k8s          192.168.0.0/16(rw,no_root_squash,sync) 172.23.0.0/16(ro,no_root_squash,sync)"
+          - "/data/shared/media    192.168.0.0/16(ro,no_root_squash,sync) 172.23.0.0/16(ro,no_root_squash,sync)"
       tags: [ pis, storage, nfs ]