diff --git a/samba/CHANGELOG.md b/samba/CHANGELOG.md
index 63dbca4..07d85de 100644
--- a/samba/CHANGELOG.md
+++ b/samba/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 9.3.0
+
+- Support new media folder
+- Update Samba to 4.12.6
+- Upgrade Alpine Linux to 3.12
+
 ## 9.2.0
 
 - Pin base image version
diff --git a/samba/build.json b/samba/build.json
index 460c6cd..8b1f9c0 100644
--- a/samba/build.json
+++ b/samba/build.json
@@ -1,9 +1,9 @@
 {
   "build_from": {
-    "aarch64": "homeassistant/aarch64-base:3.11",
-    "amd64": "homeassistant/amd64-base:3.11",
-    "armhf": "homeassistant/armhf-base:3.11",
-    "armv7": "homeassistant/armv7-base:3.11",
-    "i386": "homeassistant/i386-base:3.11"
+    "aarch64": "homeassistant/aarch64-base:3.12",
+    "amd64": "homeassistant/amd64-base:3.12",
+    "armhf": "homeassistant/armhf-base:3.12",
+    "armv7": "homeassistant/armv7-base:3.12",
+    "i386": "homeassistant/i386-base:3.12"
   }
 }
diff --git a/samba/config.json b/samba/config.json
index f3810cd..a1cb38f 100644
--- a/samba/config.json
+++ b/samba/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Samba share",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "slug": "samba",
   "description": "Expose Home Assistant folders with SMB/CIFS",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/samba",
@@ -9,7 +9,7 @@
   "boot": "auto",
   "init": false,
   "host_network": true,
-  "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"],
+  "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw", "media:rw"],
   "options": {
     "workgroup": "WORKGROUP",
     "username": "homeassistant",
diff --git a/samba/rootfs/etc/samba/smb.conf b/samba/rootfs/etc/samba/smb.conf
index 2c02525..563bf72 100644
--- a/samba/rootfs/etc/samba/smb.conf
+++ b/samba/rootfs/etc/samba/smb.conf
@@ -70,3 +70,14 @@
    force group = root
    veto files = %%VETO_FILES%%
    delete veto files = %%DELETE_VETO_FILES%%
+
+[media]
+   browseable = yes
+   writeable = yes
+   path = /media
+
+   valid users = %%USERNAME%%
+   force user = root
+   force group = root
+   veto files = %%VETO_FILES%%
+   delete veto files = %%DELETE_VETO_FILES%%
diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index 345c9a6..d20dc2b 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.8.1
+
+- Support new media folder
+
 ## 8.8.0
 
 - Update Home Assistant CLI to 4.4.1
diff --git a/ssh/config.json b/ssh/config.json
index 1696657..1715591 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Terminal & SSH",
-  "version": "8.8.0",
+  "version": "8.8.1",
   "slug": "ssh",
   "description": "Allow logging in remotely to Home Assistant using SSH",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/ssh",
@@ -19,7 +19,7 @@
   "ports": {
     "22/tcp": null
   },
-  "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"],
+  "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw", "media:rw"],
   "options": {
     "authorized_keys": [],
     "password": "",