diff --git a/qbittorrent/rootfs/scripts/shutdown.sh b/qbittorrent/rootfs/scripts/shutdown.sh
deleted file mode 100644
index 8bc8473cf..000000000
--- a/qbittorrent/rootfs/scripts/shutdown.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Shutdown addon
-
-s6-svscanctl -t /var/run/s6/services
diff --git a/ubooquity/config.json b/ubooquity/config.json
index 63b07e94d..f321abba3 100644
--- a/ubooquity/config.json
+++ b/ubooquity/config.json
@@ -38,7 +38,11 @@
   "options": {
     "PUID": 0,
     "PGID": 0,
-    "maxmem": 120
+    "maxmem": 120,
+    "networkdisks": "//IP/SHARE",
+    "cifsusername": "username",
+    "cifspassword": "folder",
+    "smbv1": "false"
   },
   "schema": {
     "PUID": "int",
@@ -47,6 +51,7 @@
     "networkdisks": "str?",
     "cifsusername": "str?",
     "cifspassword": "str?",
+    "smbv1": "bool",
     "TZ": "str?"
   }
 }
diff --git a/ubooquity/rootfs/etc/cont-init.d/92-mounts b/ubooquity/rootfs/etc/cont-init.d/92-mounts
index c11731c54..c854cb8f1 100644
--- a/ubooquity/rootfs/etc/cont-init.d/92-mounts
+++ b/ubooquity/rootfs/etc/cont-init.d/92-mounts
@@ -1,23 +1,32 @@
 #!/usr/bin/with-contenv bashio
 
-####################
-# MOUNT SMB SHARES #
-####################
-# Mount CIFS Share if configured and if Protection Mode is active
+#########################
+# MOUNT SMB SHARES v1.0 #
+#########################
 if bashio::config.has_value 'networkdisks'; then
-    bashio::log.info 'Mounting smb share...'
+    # 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')
-    bashio::log.info "Network Disks mounting.. ${MOREDISKS}" && \
-    for disk in $MOREDISKS 
+
+    # Allow SMB1
+    if bashio::config.true 'smbv1'; then
+      SMBVERS=",vers=1.0"
+    else
+      SMBVERS=",vers=2.1"
+    fi
+
+    # Mounting disks
+    for disk in ${MOREDISKS//,/ }  # Separate comma separated values
     do
-        bashio::log.info "Mount ${disk}"
-        echo "Creating /storage/storagecifs"
-        mkdir -p /storage/storagecifs
-        chown -R abc:abc /storage/storagecifs
-        mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD $disk /storage/storagecifs && \
-        bashio::log.info "Success!"   
-    done || \
-    bashio::log.warning "Protection mode is ON. Unable to mount external drives!"
+      disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+      diskname=${disk##*/} # Get only last part of the name
+      mkdir -p /mnt/$diskname  # Create dir
+      chown -R root:root /mnt/$diskname  # Permissions
+      mount -t cifs -o username=$CIFS_USERNAME,password=$CIFS_PASSWORD$SMBVERS $disk /mnt/$diskname && \
+      bashio::log.info "... $disk successfully mounted to /mnt/$diskname" || bashio::log.error "Unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD" # Mount share
+    done || true
 fi
diff --git a/ubooquity/rootfs/scripts/shutdown.sh b/ubooquity/rootfs/scripts/shutdown.sh
deleted file mode 100644
index 8bc8473cf..000000000
--- a/ubooquity/rootfs/scripts/shutdown.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Shutdown addon
-
-s6-svscanctl -t /var/run/s6/services