diff --git a/cloudcommander/run.sh b/cloudcommander/run.sh
index c1a6ccdd8..ae23cd19a 100644
--- a/cloudcommander/run.sh
+++ b/cloudcommander/run.sh
@@ -39,6 +39,92 @@ if bashio::supervisor.ping; then
         '-----------------------------------------------------------'
 fi
 
+######################
+# MOUNT LOCAL SHARES #
+######################
+
+# Mount local Share if configured and if Protection Mode is active
+if bashio::config.has_value 'localdisks'; then
+    bashio::log.info 'Mounting local hdd...'
+    bashio::require.unprotected
+    MOREDISKS=$(bashio::config 'localdisks')
+    bashio::log.info "Local Disks mounting.. ${MOREDISKS}" && \
+    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
+    do
+        bashio::log.info "Mount ${disk}"
+        mkdir -p /share/$disk && \
+            if [ ! -d /share/$disk ]; then
+              echo "Creating /share/$disk"
+              mkdir -p /share/$disk
+              chown -R abc:abc /share/$disk
+            fi
+            mount /dev/$disk /share/$disk && \
+            bashio::log.info "Success!"   
+    done || \
+    bashio::log.warning "Protection mode is ON. Unable to mount local drives!"
+fi || true
+
+####################
+# MOUNT SMB SHARES #
+####################
+if bashio::config.has_value 'networkdisks'; then
+    # Mount CIFS Share if configured and if Protection Mode is active
+    bashio::log.info 'Mounting smb share(s)...'
+
+    # Define variables 
+    MOREDISKS=$(bashio::config 'networkdisks')
+    CIFS_USERNAME=$(bashio::config 'cifsusername')
+    CIFS_PASSWORD=$(bashio::config 'cifspassword')
+    MOUNTED=false
+    SMBVERS=""
+    SECVERS=""
+
+    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
+        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
+
+    done
+fi || true
+
 ###############
 # LAUNCH APPS #
 ###############