diff --git a/papermerge/rootfs/etc/cont-init.d/50-mounts.sh b/papermerge/rootfs/etc/cont-init.d/50-mounts.sh
deleted file mode 100644
index 0bb2a5c57..000000000
--- a/papermerge/rootfs/etc/cont-init.d/50-mounts.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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 /share/$disk && \
-            if [ ! -d /share/$disk ]; then
-              echo "Creating /share/$disk"
-              mkdir -p /share/$disk
-              chown -R abc:abc /share/$disk
-            fi
-            mount /dev/$disk /share/$disk && \
-            bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
-fi
\ No newline at end of file
diff --git a/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.1 b/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.1
new file mode 100644
index 000000000..30c677477
--- /dev/null
+++ b/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.1
@@ -0,0 +1,33 @@
+#!/usr/bin/with-contenv bashio
+
+####################
+# MOUNT SMB SHARES #
+####################
+if bashio::config.has_value 'networkdisks'; then
+    # Mount CIFS Share if configured and if Protection Mode is active
+    bashio::log.info 'Mounting smb share(s)...'
+
+    # Define variables 
+    MOREDISKS=$(bashio::config 'networkdisks')
+    CIFS_USERNAME=$(bashio::config 'cifsusername')
+    CIFS_PASSWORD=$(bashio::config 'cifspassword')
+
+    # Allow SMB1
+    if bashio::config.true 'smbv1'; then
+      SMBVERS=",vers=1.0"
+    else
+      SMBVERS=",vers=2.1"
+    fi
+
+    # Mounting disks
+    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
+    do
+      disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+      diskname=${disk//\\//} #replace \ with /
+      diskname=${diskname##*/} # Get only last part of the name
+      mkdir -p /mnt/$diskname  # Create dir
+      chown -R root:root /mnt/$diskname  # Permissions
+      mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD$SMBVERS $disk /mnt/$diskname && \
+      bashio::log.info "... $disk successfully mounted to /mnt/$diskname" || bashio::log.error "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD" # Mount share
+    done || true
+fi