diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index 26aa920..78c25f6 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -300,6 +300,13 @@ secret_pia_pass: !vault |
           62313265633338356436393033353438666634363536613266346139666364613238396338363731
           6633666366353538300a613965633766653332613465326137396562313230343161346162343762
           37643164663466343166346534303932613763643965623066353336363238643266
+samba_user_salt_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          37653638663161373330616137323239633039653739623833663035303533333265336531313731
+          3936356261323432653132323537333664353361353939360a313161626436373837653930316463
+          39343937636261653033393734643739343936323465356531623836646334653362653935623338
+          3966343739353864630a306564656362386534666663346238666664326531303364343937623134
+          39333564313166356239386233646431313464346563323239366432363931303338
 
 # For Steam games
 steam_username: !vault |
diff --git a/playbooks/home_media.yml b/playbooks/home_media.yml
index 772214e..9f2672b 100755
--- a/playbooks/home_media.yml
+++ b/playbooks/home_media.yml
@@ -111,3 +111,18 @@
         nfs_exports:
           - "/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 ]
+    - role: bertvv.samba
+      vars:
+        samba_users:
+          - name: salt
+            password: "{{ samba_user_salt_password }}"
+        samba_shares:
+          - name: media
+            browseable: yes
+            comment: 'Media downloaded by that one Pi'
+            group: 911
+            guest_ok: yes
+            owner: 911
+            public: yes
+            path: /data/shared/media
+      tags: [ pis, storage, samba, smb ]
diff --git a/requirements.yml b/requirements.yml
index b6d8337..1f9bfa0 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -4,6 +4,9 @@
 collections:
   - netbox.netbox
 roles:
+  # Upstream: https://github.com/bertvv/ansible-role-samba
+  - src: bertvv.samba
+    version: v2.7.1
   # Upstream: https://github.com/geerlingguy/ansible-role-docker
   - src: geerlingguy.docker
     version: 3.0.0