diff --git a/emby/root/etc/cont-init.d/50-mounts b/emby/root/etc/cont-init.d/50-mounts
index 7547f24c6..d9a8a741a 100644
--- a/emby/root/etc/cont-init.d/50-mounts
+++ b/emby/root/etc/cont-init.d/50-mounts
@@ -1,9 +1,41 @@
 #!/usr/bin/with-contenv bashio
 
-if [ ! -d /share/storage ]; then
-  echo "Creating /share/storage"
-  mkdir -p /share/storage
-  chown -R abc:abc /share/storage
+#!/usr/bin/with-contenv bashio
+bashio::log.info 'Mounting external hdd...'
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+    MOREDISKS=$(bashio::config 'localdisks')
+    bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \
+    for disk in $MOREDISKS 
+    do
+        bashio::log.info "Mount ${disk}"
+        mkdir -p /$disk && \
+
+            if [ ! -d /share/storage ]; then
+              echo "Creating /share/storage"
+              mkdir -p /share/storage
+              chown -R abc:abc /share/storage
+            fi
+
+            mount $disk /share/storage && \
+            bashio::log.info "Success!"   
+    done || \
+    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
 fi
 
-mount /dev/sdb1 /share/storage
+# Mount CIFS Share if configured and if Protection Mode is active
+if bashio::config.has_value 'networkdisks'; then
+    MOREDISKS=$(bashio::config 'networkdisks')
+    CIFS_USERNAME=$(bashio::config 'cifsusername')
+    CIFS_PASSWORD=$(bashio::config 'cifspassword')
+    bashio::log.info "Network Disks mounting.. ${MOREDISKS}" && \
+    for disk in $MOREDISKS 
+    do
+        bashio::log.info "Mount ${disk}"
+        mkdir -p /$disk && \
+            mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /$disk && \
+            bashio::log.info "Success!"   
+    done || \
+    bashio::log.warning "Protection mode is ON. Unable to mount external drives!"
+fi