diff --git a/bazarr/CHANGELOG.md b/bazarr/CHANGELOG.md
index c0f55144b..127f77492 100644
--- a/bazarr/CHANGELOG.md
+++ b/bazarr/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
+
 ## 1.0.0 (13-10-2021)
 
 - Update to latest version from linuxserver/docker-bazarr
diff --git a/bazarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/bazarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/bazarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/bazarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/cloudcommander/CHANGELOG.md b/cloudcommander/CHANGELOG.md
index 2a2be2999..3fc27f26d 100644
--- a/cloudcommander/CHANGELOG.md
+++ b/cloudcommander/CHANGELOG.md
@@ -1,51 +1,65 @@
 - Allow uploads >16mb
 - Allow mounting local drives in protected mode
 - Allow mounting of devices up to sdg2
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 15.9.8 (10-08-2021)
+
 - Update to latest version from coderaiser/cloudcmd
 - Addition of ingress
 - Allow Dropbox token and custom options
 - Added access rw to HA folders
 
 ## 15.9.7 (28-06-2021)
+
 - Update to latest version from coderaiser/cloudcmd
 - Allow mounting SMB shares
 - Allow mounting local drives
 
 ## 15.9.6 (14-06-2021)
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.9.5 (09-06-2021)
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.9.4 (23-05-2021)
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.9.4
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.9.3
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.9.2
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.9.1
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.9.0
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.8.1
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.8.0
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.7.1
+
 - Update to latest version from coderaiser/cloudcmd
 
 ## 15.7.0
-- Update to latest version from coderaiser/cloudcmd
 
+- Update to latest version from coderaiser/cloudcmd
diff --git a/cloudcommander/rootfs/run.sh b/cloudcommander/rootfs/run.sh
index 1076affe4..c5e5ccbf0 100644
--- a/cloudcommander/rootfs/run.sh
+++ b/cloudcommander/rootfs/run.sh
@@ -64,70 +64,83 @@ if bashio::config.has_value 'localdisks'; then
     bashio::log.warning "Error, /dev/$disk couldn't be mounted. Is priviledged mode on?"
 fi || true
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
-    # Define variables 
-    MOREDISKS=$(bashio::config 'networkdisks')
-    CIFS_USERNAME=$(bashio::config 'cifsusername')
-    CIFS_PASSWORD=$(bashio::config 'cifspassword')
-    MOUNTED=false
-    SMBVERS=""
-    SECVERS=""
-    
-    # Dont execute if still default
-   [ ${MOREDISKS::1} == "<" ] && exit 0
+  # Define variables
+  MOREDISKS=$(bashio::config 'networkdisks')
+  CIFS_USERNAME=$(bashio::config 'cifsusername')
+  CIFS_PASSWORD=$(bashio::config 'cifspassword')
+  MOUNTED=false
+  SMBVERS=""
+  SECVERS=""
 
-    # Mount CIFS Share if configured and if Protection Mode is active
-    bashio::log.info 'Mounting smb share(s)...'
+  # Dont execute if still default
+  [ ${MOREDISKS::1} == "<" ] && exit 0
 
-    if bashio::config.has_value 'cifsdomain'; then 
-      DOMAIN=",domain=$(bashio::config 'cifsdomain')" 
-    else
-      DOMAIN=""
-    fi
- 
-    # Mounting disks
-    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
-    do
-      # Clean name of network share
-      disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
-      diskname=${disk//\\//} #replace \ with /
-      diskname=${diskname##*/} # Get only last part of the name
-      # Prepare mount point
-      mkdir -p /mnt/$diskname
-      chown -R root:root /mnt/$diskname
-      
-      #Tries to mount with default options
-      mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
-      
-      # if Fail test different smb and sec versions
-      if [ $MOUNTED = false ]; then
-        for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"
-        do
-           mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break  || MOUNTED=false
-           for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5"
-           do
-                mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
-           done
+  # Mount CIFS Share if configured and if Protection Mode is active
+  bashio::log.info 'Mounting smb share(s)...'
+
+  if bashio::config.has_value 'cifsdomain'; then
+    DOMAIN=",domain=$(bashio::config 'cifsdomain')"
+  else
+    DOMAIN=""
+  fi
+
+  # Mounting disks
+  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
+    # Clean name of network share
+    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+    diskname=${disk//\\//}            #replace \ with /
+    diskname=${diskname##*/}          # Get only last part of the name
+    # Prepare mount point
+    mkdir -p /mnt/$diskname
+    chown -R root:root /mnt/$diskname
+
+    #Tries to mount with default options
+    mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
+
+    # if Fail test different smb and sec versions
+    if [ $MOUNTED = false ]; then
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
+        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
+        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
+          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
         done
-      fi
+      done
+    fi
 
-      # Messages
-      if [ $MOUNTED = true ]; then
-        #Test write permissions
-        touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw" 
-      else
-        # message if still fail
-        bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-        bashio::log.fatal "Error read : $(<ERRORCODE)" # Mount share
-        rm ERRORCODE
-      fi
+    # Messages
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
+      #Test write permissions
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
+    else
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
+      rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
+    fi
+
+  done
+fi
 
-    done
-fi || true
 
 #################
 # NGINX SETTING #
diff --git a/doublecommander/CHANGELOG.md b/doublecommander/CHANGELOG.md
index 6ab26bf4a..b12ec0716 100644
--- a/doublecommander/CHANGELOG.md
+++ b/doublecommander/CHANGELOG.md
@@ -1,22 +1,30 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 0.8.2-1-ls54 (19-05-2021)
+
 - Update to latest version from linuxserver/docker-doublecommander
 
 ## 0.8.2-1-ls53 (05-05-2021)
+
 - Update to latest version from linuxserver/docker-doublecommander
 
 ## 0.8.2-1-ls52 (28-04-2021)
+
 - Update to latest version from linuxserver/docker-doublecommander
 
 ## 0.8.2-1-ls51
+
 - Update to latest version from linuxserver/docker-doublecommander
 
 ## 0.8.2-1-ls50
+
 - Update to latest version from linuxserver/docker-doublecommander
 
 ## 0.8.2-1-ls49
+
 - Update to latest version from linuxserver/docker-doublecommander
 
 ## 0.8.2-1-ls41
+
 - Update to latest version from linuxserver/docker-doublecommander
 - Enables PUID/GUID options
diff --git a/doublecommander/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/doublecommander/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/doublecommander/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/doublecommander/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md
index 6a6be8eda..362052ffb 100644
--- a/emby/CHANGELOG.md
+++ b/emby/CHANGELOG.md
@@ -1,118 +1,156 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 4.7.0.15 (23-10-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.7.0.14 (15-10-2021)
+
 - Update to latest version from linuxserver/docker-emby
-- Added watchdog feature 
+- Added watchdog feature
 
 ## 4.7.0.13 (02-10-2021)
+
 - Update to latest version from linuxserver/docker-emby
 - Allow optional silent emby output
 - Allow mounting disks > sdb1
 - Allow hardware acceleration
 
 ## 4.7.0.12 (21-09-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.7.0.11 (12-09-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.7.0.10 (10-09-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.7.0.9 (04-09-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.4.0 (02-07-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.3.0 (19-06-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.2.0 (04-06-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.1.0 (25-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.51 (23-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.51 (23-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.51 (23-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.51 (23-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.50 (20-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.48 (19-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.47 (18-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.46 (15-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 - Add banner to log
 
 ## 4.6.0.45 (13-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.44 (12-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.43 (04-05-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.41 (28-04-2021)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.40
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.39
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.38
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.37
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.36
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.35
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.34
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.33
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.32
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.31
+
 - Update to latest version from linuxserver/docker-emby
- 
+
 ## 4.6.0.30
+
 - Update to latest version from linuxserver/docker-emby
- 
+
 ## 4.6.0.29
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.6.0.28
+
 - Update to latest version from linuxserver/docker-emby
- 
+
 ## 4.6.0.26
+
 - Update to latest version from linuxserver/docker-emby
 - Enables PUID/GUID options
 - New feature : mount smb share in protected mode
diff --git a/emby/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/emby/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/emby/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/emby/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/filebrowser/CHANGELOG.md b/filebrowser/CHANGELOG.md
index 14ca1df92..84931589f 100644
--- a/filebrowser/CHANGELOG.md
+++ b/filebrowser/CHANGELOG.md
@@ -1,40 +1,51 @@
 - Allow mounting of devices up to sdg2
 - Allow uploads >16mb
-- Allow local mount in protected mode 
+- Allow local mount in protected mode
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 2.17.2 (28-08-2021)
+
 - Update to latest version from hurlenko/filebrowser-docker
 
 ## 2.17.1 (26-08-2021)
+
 - Update to latest version from hurlenko/filebrowser-docker
 
 ## 2.17.0 (24-08-2021)
+
 - Update to latest version from hurlenko/filebrowser-docker
 
 ## 2.16.1 (07-08-2021)
+
 - Update to latest version from hurlenko/filebrowser-docker
 - Ingress added
-- No auth option made more apparent 
+- No auth option made more apparent
 
 ## 2.16.0 (29-07-2021)
+
 - Update to latest version from hurlenko/filebrowser-docker
 - Add banner in log
 - Update smb mount code
-- Allow mount local drives (needs priviledged mode) 
+- Allow mount local drives (needs priviledged mode)
 
 ## 2.15.0
+
 - Update to latest version from hurlenko/filebrowser-docker
 
 ## 2.14.1
+
 - Update to latest version from hurlenko/filebrowser-docker
 
 ## 2.13.0
+
 - Update to latest version from hurlenko/filebrowser-docker
 
 ## 2.12.1
+
 - Update to latest version from hurlenko/filebrowser-docker
 
 ## 2.12.0
+
 - Update to latest version from hurlenko/filebrowser-docker
 - Allow mounting shares named \ip\share in addition to //ip/share
 
diff --git a/filebrowser/rootfs/run.sh b/filebrowser/rootfs/run.sh
index 07f55d064..80445c06a 100644
--- a/filebrowser/rootfs/run.sh
+++ b/filebrowser/rootfs/run.sh
@@ -63,12 +63,10 @@ if bashio::config.has_value 'localdisks'; then
   bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
 fi || true
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 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')
@@ -78,6 +76,12 @@ if bashio::config.has_value 'networkdisks'; then
   SMBVERS=""
   SECVERS=""
 
+  # Dont execute if still default
+  [ ${MOREDISKS::1} == "<" ] && exit 0
+
+  # Mount CIFS Share if configured and if Protection Mode is active
+  bashio::log.info 'Mounting smb share(s)...'
+
   if bashio::config.has_value 'cifsdomain'; then
     DOMAIN=",domain=$(bashio::config 'cifsdomain')"
   else
@@ -99,27 +103,43 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
-        mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
-        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5"; do
-          mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
+        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
+        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
+          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
         done
       done
     fi
 
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
-fi || true
+fi
+
 
 ###################
 # SSL CONFIG v1.0 #
diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md
index ba981dbc5..23d206078 100644
--- a/jellyfin/CHANGELOG.md
+++ b/jellyfin/CHANGELOG.md
@@ -1,23 +1,30 @@
 - Added watchdog feature
 - Allow mounting of devices up to sdg2
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 10.7.7-1-ls130 (06-09-2021)
+
 - Update to latest version from linuxserver/docker-jellyfin
 
 ## 10.7.6-1-ls118 (19-06-2021)
+
 - Update to latest version from linuxserver/docker-jellyfin
 
 ## 10.7.5-1-ls113 (20-05-2021)
+
 - Update to latest version from linuxserver/docker-jellyfin
 - Add banner to log
 
 ## 10.7.5-1-ls112 (14-05-2021)
+
 - Update to latest version from linuxserver/docker-jellyfin
 
 ## 10.7.5-1-ls111 (06-05-2021)
+
 - Update to latest version from linuxserver/docker-jellyfin
 
 ## 10.7.2-1-ls110 (30-04-2021)
+
 - Update to latest version from linuxserver/docker-jellyfin
 
 ## 10.7.2-1-ls109
diff --git a/jellyfin/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/jellyfin/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/jellyfin/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/jellyfin/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/lidarr/CHANGELOG.md b/lidarr/CHANGELOG.md
index 66f7e8b76..6af05428a 100644
--- a/lidarr/CHANGELOG.md
+++ b/lidarr/CHANGELOG.md
@@ -1 +1,2 @@
 - Initial release
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
diff --git a/lidarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/lidarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/lidarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/lidarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/papermerge/CHANGELOG.md b/papermerge/CHANGELOG.md
index e04c2f39a..ba36b0090 100644
--- a/papermerge/CHANGELOG.md
+++ b/papermerge/CHANGELOG.md
@@ -1,44 +1,59 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 2.0.1
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.1-ls36
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.1-ls35
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.1-ls34
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.1-ls33
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0-ls32
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0rc48-ls31
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0rc48-ls30
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0rc48-ls29
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0rc45-ls29
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0rc45-ls28
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0rc43-ls28
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0rc38-ls28
+
 - Update to latest version from linuxserver/docker-papermerge
 
 ## v2.0.0rc35-ls28
+
 - Update to latest version from linuxserver/docker-papermerge
 - Enables PUID/GUID options
 - Enables english/french OCR
diff --git a/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh b/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
index fa01b3b30..3fabe99e6 100644
--- a/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/papermerge/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,72 +1,78 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
-    # Define variables 
-    MOREDISKS=$(bashio::config 'networkdisks')
-    CIFS_USERNAME=$(bashio::config 'cifsusername')
-    CIFS_PASSWORD=$(bashio::config 'cifspassword')
-    MOUNTED=false
-    SMBVERS=""
-    SECVERS=""
-    
-    # Dont execute if still default
-   [ ${MOREDISKS::1} == "<" ] && exit 0
+  # Define variables
+  MOREDISKS=$(bashio::config 'networkdisks')
+  CIFS_USERNAME=$(bashio::config 'cifsusername')
+  CIFS_PASSWORD=$(bashio::config 'cifspassword')
+  MOUNTED=false
+  SMBVERS=""
+  SECVERS=""
 
-    # Mount CIFS Share if configured and if Protection Mode is active
-    bashio::log.info 'Mounting smb share(s)...'
+  # Dont execute if still default
+  [ ${MOREDISKS::1} == "<" ] && exit 0
 
-    if bashio::config.has_value 'cifsdomain'; then 
-      DOMAIN=",domain=$(bashio::config 'cifsdomain')" 
-    else
-      DOMAIN=""
-    fi
- 
-    # Mounting disks
-    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
-    do
-      # Clean name of network share
-      disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
-      diskname=${disk//\\//} #replace \ with /
-      diskname=${diskname##*/} # Get only last part of the name
-      # Prepare mount point
-      mkdir -p /mnt/$diskname
-      chown -R root:root /mnt/$diskname
-      
-      #Tries to mount with default options
-      mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
-      
-      # if Fail test different smb and sec versions
-      if [ $MOUNTED = false ]; then
-        for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"
-        do
-           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break  || MOUNTED=false
-           for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"
-           do
-                mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
-           done
+  # Mount CIFS Share if configured and if Protection Mode is active
+  bashio::log.info 'Mounting smb share(s)...'
+
+  if bashio::config.has_value 'cifsdomain'; then
+    DOMAIN=",domain=$(bashio::config 'cifsdomain')"
+  else
+    DOMAIN=""
+  fi
+
+  # Mounting disks
+  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
+    # Clean name of network share
+    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+    diskname=${disk//\\//}            #replace \ with /
+    diskname=${diskname##*/}          # Get only last part of the name
+    # Prepare mount point
+    mkdir -p /mnt/$diskname
+    chown -R root:root /mnt/$diskname
+
+    #Tries to mount with default options
+    mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
+
+    # if Fail test different smb and sec versions
+    if [ $MOUNTED = false ]; then
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
+        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
+        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
+          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
         done
-      fi
+      done
+    fi
 
-      # Test smbclient if not mounted yet
-      if [ $MOUNTED = false ]; then
-        smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-        bashio::log.info "Mounted with smbclient"
-      fi
+    # Messages
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
+      #Test write permissions
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
 
-      # Messages
-      if [ $MOUNTED = true ]; then
-        #Test write permissions
-        touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw" 
-      else
-        # message if still fail
-        bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-        bashio::log.fatal "Error read : $(<ERRORCODE)" # Mount share
-        rm ERRORCODE
-      fi
+    else
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
 
-    done
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
+      rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
+    fi
+
+  done
 fi
diff --git a/photoprism/CHANGELOG.md b/photoprism/CHANGELOG.md
index e82fdabc4..cb771a111 100644
--- a/photoprism/CHANGELOG.md
+++ b/photoprism/CHANGELOG.md
@@ -1,6 +1,8 @@
 - Allow mounting of devices up to sdg2
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 210217-49039368 (29-09-2021)
+
 - Update to latest version from photoprism/photoprism
 - Allow mounting smb and local disks
 - Allow custom paths from options
diff --git a/photoprism/rootfs/run.sh b/photoprism/rootfs/run.sh
index fbe509cad..62579ca66 100644
--- a/photoprism/rootfs/run.sh
+++ b/photoprism/rootfs/run.sh
@@ -65,12 +65,10 @@ if bashio::config.has_value 'localdisks'; then
   bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
 fi || true
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 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')
@@ -80,6 +78,12 @@ if bashio::config.has_value 'networkdisks'; then
   SMBVERS=""
   SECVERS=""
 
+  # Dont execute if still default
+  [ ${MOREDISKS::1} == "<" ] && exit 0
+
+  # Mount CIFS Share if configured and if Protection Mode is active
+  bashio::log.info 'Mounting smb share(s)...'
+
   if bashio::config.has_value 'cifsdomain'; then
     DOMAIN=",domain=$(bashio::config 'cifsdomain')"
   else
@@ -101,27 +105,43 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
-        mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
-        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5"; do
-          mount -t cifs -o rw,iocharset=utf8,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
+        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
+        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
+          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
         done
       done
     fi
 
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
-fi || true
+fi
+
 
 ##############
 # LAUNCH APP #
diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md
index 809c10e59..cacbb72ce 100644
--- a/plex/CHANGELOG.md
+++ b/plex/CHANGELOG.md
@@ -1,68 +1,90 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 1.24.4.5081-e362dc1ee-ls79 (13-10-2021)
+
 - Update to latest version from linuxserver/docker-plex
 - Allow mounting of devices up to sdg2
 
 ## 1.24.3.5033-757abe6b4-ls75 (21-09-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.24.2.4973-2b1b51db9-ls73 (09-09-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.24.1.4931-1a38e63c6-ls70 (24-08-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.24.0.4930-ab6e1a058-ls68 (14-08-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.6.4881-e2e58f321-ls65 (30-07-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.5.4862-0f739d462-ls64 (24-07-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.5.4841-549599676-ls63 (21-07-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.4.4805-186bae04e-ls61 (13-07-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.3.4707-ebb5fe9f3-ls58 (22-06-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## nightly-0.1.0.515-ls41 (22-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## 1.23.3.4707-ebb5fe9f3-ls58 (22-06-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## nightly-0.1.0.515-ls41 (22-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## 1.23.3.4707-ebb5fe9f3-ls57 (22-06-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.2.4656-85f0adf5b-ls54 (06-06-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.2.4625-a83d2d0f9-ls52 (03-06-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.1.4602-280ab6053-ls51 (28-05-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.23.1.4571-6119e8eed-ls50 (26-05-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.22.3.4523-d0ce30438-ls48 (19-05-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.22.3.4523-d0ce30438-ls47 (14-05-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.22.3.4392-d7c624def-ls46 (12-05-2021)
+
 - Update to latest version from linuxserver/docker-plex
 
 ## 1.22.3.4392-d7c624def-ls45 (05-05-2021)
-- Update to latest version from linuxserver/docker-plex
 
+- Update to latest version from linuxserver/docker-plex
diff --git a/plex/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/plex/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/plex/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/plex/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/prowlarr/CHANGELOG.md b/prowlarr/CHANGELOG.md
index 90281ea28..7c89a4197 100644
--- a/prowlarr/CHANGELOG.md
+++ b/prowlarr/CHANGELOG.md
@@ -1,172 +1,229 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## nightly-0.1.1.1029-ls161 (19-10-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.1006-ls157 (12-10-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.1005-ls156 (11-10-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.990-ls152 (09-10-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.981-ls151 (08-10-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.976-ls149 (06-10-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.966-ls148 (03-10-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.965-ls147 (02-10-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.953-ls146 (26-09-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.950-ls144 (24-09-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.946-ls143 (21-09-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.940-ls142 (16-09-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.927-ls141 (08-09-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.919-ls140 (03-09-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.913-ls139 (02-09-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.893-ls135 (31-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.885-ls134 (28-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.875-ls132 (26-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.1.868-ls130 (24-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.834-ls124 (21-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.826-ls121 (19-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.816-ls118 (17-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.783-ls107 (14-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.771-ls104 (11-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## develop-0.1.0.768-ls12 (08-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.767-ls102 (07-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.765-ls101 (07-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.749-ls96 (03-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.738-ls95 (02-08-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.725-ls90 (31-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.722-ls89 (30-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.718-ls88 (29-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.717-ls87 (29-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.712-ls84 (26-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.710-ls83 (25-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.702-ls81 (22-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.701-ls80 (21-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.688-ls79 (18-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.686-ls78 (16-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.679-ls76 (16-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.640-ls72 (14-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.624-ls70 (13-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.611-ls68 (11-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.608-ls67 (10-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.605-ls66 (09-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.599-ls65 (07-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.595-ls64 (05-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.575-ls60 (01-07-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.571-ls59 (30-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.568-ls58 (30-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.563-ls56 (29-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.554-ls53 (28-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.547-ls51 (27-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.530-ls46 (25-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.526-ls45 (24-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.521-ls43 (24-06-2021)
+
 - Update to latest version from linuxserver/docker-prowlarr
 
 ## nightly-0.1.0.515-ls41 (22-06-2021)
-- Update to latest version from linuxserver/docker-prowlarr
 
+- Update to latest version from linuxserver/docker-prowlarr
diff --git a/prowlarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/prowlarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/prowlarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/prowlarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md
index fed08536b..c05e44f2a 100644
--- a/qbittorrent/CHANGELOG.md
+++ b/qbittorrent/CHANGELOG.md
@@ -1,108 +1,138 @@
-- Improve smb mount error reporting
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 14.3.8.99202110120741-7429-1bae770b2ubuntu20.04.1-ls158 (13-10-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Added watchdog feature
 
 ## 14.3.8.99202110081405-7423-ac5c264e6ubuntu20.04.1-ls157 (08-10-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Allow mounting local drives. Set "localdisks" to your disk name such as sda1
 - Added auto stop, just set the run_duration optional setting
 
 ## 14.3.8.99202109100310-7422-338d9a084ubuntu20.04.1-ls154 (10-09-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.8.99202108291924-7418-9392ce436ubuntu20.04.1-ls152 (31-08-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.7.99202108230857-7410-fefce0337ubuntu20.04.1-ls151 (24-08-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.7.99202108032349-7395-0415c0c6fubuntu20.04.1-ls149 (05-08-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Improved smb mount code
 
 ## 14.3.6.99202107121017-7389-3ac8c97e6ubuntu20.04.1-ls145 (13-07-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.6.99202107050919-7388-ede42910dubuntu20.04.1-ls143 (05-07-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.6.99202106272003-7387-ac8105c30ubuntu20.04.1-ls141 (28-06-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.5.99202106211645-7376-e25948e73ubuntu20.04.1-ls140 (22-06-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.5.99202106201814-7376-e25948e73ubuntu20.04.1-ls139 (21-06-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.5.99202106191735-7376-e25948e73ubuntu20.04.1-ls138 (20-06-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.5.99202106151345-7374-667d4e421ubuntu20.04.1-ls137 (16-06-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.5.99202106080759-7366-33e090cfcubuntu20.04.1-ls136 (09-06-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Add banner in log
-- New option openvpn_alternative_mode, binds only ovpn to qbittorrent and not webui 
+- New option openvpn_alternative_mode, binds only ovpn to qbittorrent and not webui
 
 ## 14.3.5.99202105022253-7365-063844ed4ubuntu20.04.1-ls133 (11-05-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.5.99202105022253-7365-063844ed4ubuntu20.04.1-ls132 (04-05-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
-- New option : use specific DNS instead of the router ones to avoid spamming, especially useful if using adguard home/pihole. Keep blank to use the router dns. 
+- New option : use specific DNS instead of the router ones to avoid spamming, especially useful if using adguard home/pihole. Keep blank to use the router dns.
 
 ## 14.3.4.99202104300534-7354-9f8a6e8fbubuntu20.04.1-ls131 (01-05-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Robust the smb script to test for several common options
 - smbv1 bit is not used anymore
 
 ## 14.3.4.99202104281424-7353-7dd9e7343ubuntu20.04.1-ls130 (29-04-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.4.99202104250604-7352-b2a43eeffubuntu20.04.1-ls129 (27-04-2021)
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.4.99202104250604-7352-b2a43eeffubuntu20.04.1-ls128
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Clarified steps to check in case of smb mount fail
 - New option : set domain for smb share
-- Addition of openvpn support 
- 
+- Addition of openvpn support
+
 ## 14.3.4.99202104180633-7350-2c8f322afubuntu20.04.1-ls127
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.4.99202104090418-7349-789803700ubuntu20.04.1-ls126
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Addition of ingress
 - Viewtorrent as default ui
 
 ## 14.3.4.99202104031018-7348-2b6baa609ubuntu20.04.1-ls125
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.3.99202103251603-7345-332b173e0ubuntu20.04.1-ls122
+
 - Update to latest version from linuxserver/docker-qbittorrent ; Rebase to focal.
 
 ## 14.3.3.99202101191832-7248-da0b276d5ubuntu20.04.1-ls120
+
 - Update to latest version from linuxserver/docker-qbittorrent ; Stop creating /config/data directory on startup
 
 ## 14.3.3.99202101191832-7248-da0b276d5ubuntu20.04.1-ls119
+
 - Update to latest version from linuxserver/docker-qbittorrent ; Fix adding search engine plugin
 
 ## 14.3.3.99202101191832-7248-da0b276d5ubuntu20.04.1-ls118
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Allow mounting shares named \ip\share in addition to //ip/share
 
 ## 14.3.3.99202101191832-7248-da0b276d5ubuntu20.04.1-ls117
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.3.99202101191832-7248-da0b276d5ubuntu20.04.1-ls116
+
 - Correct VueTorrent link
 
 ## 14.3.3.99202101191832-7248-da0b276d5ubuntu20.04.1-ls115
+
 - New configuration option : set download path
 - New configuration option : set username for webUI
 - New feature : mount smb share in protected mode
@@ -114,9 +144,11 @@
 - Enabling of custom webUI from configuration
 
 ## 14.3.3.99202101191832-7248-da0b276d5ubuntu18.04.1-ls114
+
 - Update to latest version from linuxserver/docker-qbittorrent
 
 ## 14.3.3.99202101191832-7248-da0b276d5ubuntu18.04.1-ls113
+
 - Update to latest version from linuxserver/docker-qbittorrent
 - Whitelist option
 - Enables PUID/GUID options
diff --git a/radarr/CHANGELOG.md b/radarr/CHANGELOG.md
index 37df805d3..0385d8280 100644
--- a/radarr/CHANGELOG.md
+++ b/radarr/CHANGELOG.md
@@ -1,18 +1,23 @@
-- Improved cifs mount code to make it universal
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 - Breaking changes : multiple network disks must be separated by a "," and they are mounted to a folder with the name of the external share.
 
 ## 3.2.2.5080 (04-06-2021)
+
 - Update to latest version from linuxserver/docker-radarr
 
 ## 3.2.1.5070 (28-05-2021)
+
 - Update to latest version from linuxserver/docker-radarr
 
 ## 3.2.0.5048 (19-05-2021)
+
 - Update to latest version from linuxserver/docker-radarr
 
 ## 3.1.1.4954 (05-05-2021)
+
 - Update to latest version from linuxserver/docker-radarr
 
 ## 3.0.2.4552
+
 - Update to latest version from linuxserver/docker-radarr
 - Enables PUID/GUID options
diff --git a/radarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/radarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/radarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/radarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md
index 254702fe4..b9b046805 100644
--- a/readarr/CHANGELOG.md
+++ b/readarr/CHANGELOG.md
@@ -1,7 +1,10 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## nightly-0.1.0.997-ls19 (19-10-2021)
+
 - Update to latest version from linuxserver/docker-readarr
 
 ## nightly-0.1.0.991-ls16 (13-10-2021)
+
 - Update to latest version from linuxserver/docker-readarr
 - Initial release (nightly builds)
diff --git a/readarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/readarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/readarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/readarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/sonarr/CHANGELOG.md b/sonarr/CHANGELOG.md
index a18179e42..0885669b9 100644
--- a/sonarr/CHANGELOG.md
+++ b/sonarr/CHANGELOG.md
@@ -1,15 +1,20 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 3.0.6.1342 (02-10-2021)
+
 - Update to latest version from linuxserver/docker-sonarr
 
 ## 3.0.6.1335 (30-09-2021)
+
 - Update to latest version from linuxserver/docker-sonarr
 - Improved cifs mount code to make it universal
 - Breaking changes : multiple network disks must be separated by a "," and they are mounted to a folder with the name of the external share.
 
 ## 3.0.6.1265 (18-06-2021)
+
 - Update to latest version from linuxserver/docker-sonarr
 
 ## 3.0.2.4552
+
 - Update to latest version from linuxserver/docker-sonarr
 - Enables PUID/GUID options
diff --git a/sonarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh b/sonarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/sonarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/sonarr/root/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/transmission/CHANGELOG.md b/transmission/CHANGELOG.md
index e1bb41a46..eae29ae3a 100644
--- a/transmission/CHANGELOG.md
+++ b/transmission/CHANGELOG.md
@@ -1,29 +1,39 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 3.00-r2-ls87 (14-05-2021)
+
 - Update to latest version from linuxserver/docker-transmission
 
 ## 3.00-r2-ls86
+
 - Update to latest version from linuxserver/docker-transmission
 
 ## 3.00-r2-ls85
+
 - Update to latest version from linuxserver/docker-transmission
 
 ## 3.00-r2-ls83
+
 - Update to latest version from linuxserver/docker-transmission
 
 ## 3.00-r2-ls82
+
 - Update to latest version from linuxserver/docker-transmission
 
 ## 3.00-r2-ls81
+
 - Update to latest version from linuxserver/docker-transmission
 
 ## 3.00-r2-ls80
+
 - Update to latest version from linuxserver/docker-transmission
 
 ## 3.00-r2-ls79
+
 - Update to latest version from linuxserver/docker-transmission
 
 ## 3.00-r2-ls78
+
 - Update to latest version from linuxserver/docker-transmission
 - Change directory from /share/transmission to /config/transmission
 - Correct permissions changes
@@ -31,5 +41,6 @@
 - Allow to mount several SMB shares using comma separated values (same password & username)
 
 ## 3.00-r2-ls77
+
 - Update to latest version from linuxserver/docker-transmission
 - Enables PUID/GUID options
diff --git a/transmission/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh b/transmission/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/transmission/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/transmission/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done
diff --git a/ubooquity/CHANGELOG.md b/ubooquity/CHANGELOG.md
index 8fd850d22..a3c2caef1 100644
--- a/ubooquity/CHANGELOG.md
+++ b/ubooquity/CHANGELOG.md
@@ -1,21 +1,28 @@
+- Improve SMB mount code to v1.5 ; accepts several network disks separated by commas (//123.12.12.12/share,//123.12.12.12/hello) that are mount to /mnt/$sharename
 
 ## 2.1.2-ls63
+
 - Update to latest version from linuxserver/docker-ubooquity
 
 ## 2.1.2-ls62
+
 - Update to latest version from linuxserver/docker-ubooquity
 
 ## 2.1.2-ls61
+
 - Update to latest version from linuxserver/docker-ubooquity
 
 ## 2.1.2-ls60
+
 - Update to latest version from linuxserver/docker-ubooquity
 
 ## 2.1.2-ls59
+
 - Update to latest version from linuxserver/docker-ubooquity
-- Allow custom themes : comixology 
+- Allow custom themes : comixology
 
 ## 2.1.2-ls58
+
 - Update to latest version from linuxserver/docker-ubooquity
 - Enables PUID/GUID options
 - Addition of possibility to mount smb
diff --git a/ubooquity/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh b/ubooquity/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
index e4b37713b..3fabe99e6 100644
--- a/ubooquity/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
+++ b/ubooquity/rootfs/etc/cont-init.d/92-smb_mounts_v1.4.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
+#########################
+# MOUNT SMB SHARES v1.5 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
 
   # Define variables
@@ -40,7 +40,7 @@ if bashio::config.has_value 'networkdisks'; then
 
     # if Fail test different smb and sec versions
     if [ $MOUNTED = false ]; then
-      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN}"; do
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
         mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
         for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
           mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
@@ -48,21 +48,30 @@ if bashio::config.has_value 'networkdisks'; then
       done
     fi
 
-    # Test smbclient if not mounted yet
-    if [ $MOUNTED = false ]; then
-      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" && MOUNTED=true && \
-      bashio::log.info "Mounted with smbclient"
-    fi
-
     # Messages
-    if [ $MOUNTED = true ]; then
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
       #Test write permissions
-      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze \
+      && bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" \
+      || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
     else
-      # message if still fail
-      bashio::log.fatal "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID" # Mount share
-      bashio::log.fatal "Error read : $(<ERRORCODE)"                                                                                                                                                          # Mount share
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true 
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD --option="client min protocol"="NT1" || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
       rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
     fi
 
   done