diff --git a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar
index 48a34eb4..7ee4701d 100755
--- a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar
@@ -4,65 +4,66 @@
 #
 
 PATH_MODULE=/lib/modules/4.9.84/sigmastar
-PATH_SENSOR=${PATH_MODULE}/sensor
+PATH_SENSOR=$PATH_MODULE/sensor
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
-	insmod ${PATH_SENSOR}/sensor_config.ko
+	insmod $PATH_SENSOR/sensor_config.ko
 	if [ -e /dev/srcfg ]; then
 		echo srcfg 0 1 0 0 0 0 > /dev/srcfg
 		rmmod sensor_config
 	fi
 	SENSOR=$(ipcinfo -s)
-	fw_setenv sensor ${SENSOR}
+	fw_setenv sensor "$SENSOR"
 }
 
 set_sensor() {
-	case ${SENSOR} in
+	case $SENSOR in
 		gc2053|imx307)
-			insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		sc2239|sc2335)
 			[ "$(fw_printenv -n soc)" = "ssc325de" ] && IFACE=parl
-			insmod ${PATH_SENSOR}/sensor_${SENSOR}_${IFACE:-mipi}.ko chmap=1
+			insmod $PATH_SENSOR/sensor_${SENSOR}_${IFACE:-mipi}.ko chmap=1
 			;;
 		*)
-			echo -e "\n\e[1;31mUNSUPPORTED sensor - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC
+			echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC
 			;;
 	esac
 }
 
 insert_ko() {
-	insmod ${PATH_MODULE}/mhal.ko
-	insmod ${PATH_MODULE}/mi_common.ko
-	insmod ${PATH_MODULE}/mi_sys.ko logBufSize=256 default_config_path=/usr/bin
-	insmod ${PATH_MODULE}/mi_rgn.ko
-	insmod ${PATH_MODULE}/mi_ai.ko
-	insmod ${PATH_MODULE}/mi_ao.ko
-	insmod ${PATH_MODULE}/mi_sensor.ko
-	insmod ${PATH_MODULE}/mi_shadow.ko
-	insmod ${PATH_MODULE}/mi_divp.ko
-	insmod ${PATH_MODULE}/mi_vif.ko
-	insmod ${PATH_MODULE}/mi_vpe.ko
-	insmod ${PATH_MODULE}/mi_venc.ko
+	insmod $PATH_MODULE/mhal.ko
+	insmod $PATH_MODULE/mi_common.ko
+	insmod $PATH_MODULE/mi_sys.ko logBufSize=256 default_config_path=/usr/bin
+	insmod $PATH_MODULE/mi_rgn.ko
+	insmod $PATH_MODULE/mi_ai.ko
+	insmod $PATH_MODULE/mi_ao.ko
+	insmod $PATH_MODULE/mi_sensor.ko
+	insmod $PATH_MODULE/mi_shadow.ko
+	insmod $PATH_MODULE/mi_divp.ko
+	insmod $PATH_MODULE/mi_vif.ko
+	insmod $PATH_MODULE/mi_vpe.ko
+	insmod $PATH_MODULE/mi_venc.ko
 }
 
 if [ ! -e /sys/module/mhal ]; then
 	insert_ko
 fi
 
-if [ -z ${SENSOR} ]; then
+if [ -z "$1" ] || [ -z "$SENSOR" ]; then
 	echo -e "\n\e[1;33mAutodetect sensor\e[0m\n" | logger -s -t OpenIPC
 	detect_sensor
 fi
 
-if [ -z ${SENSOR} ]; then
+if [ -z "$SENSOR" ]; then
 	echo -e "\n\e[1;31mSensor parameter MISSING\e[0m\n" | logger -s -t OpenIPC
 	exit 1
 else
-	echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC
-	if [ -e /sys/module/sensor* ]; then
-		rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4)
+	echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC
+	SENSOR_MODULE=$(ls /sys/module | grep $SENSOR)
+	if [ -n "$SENSOR_MODULE" ]; then
+		rmmod $SENSOR_MODULE
 	fi
 	set_sensor
 fi
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
index 2c4f7af1..155a3d53 100755
--- a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
@@ -4,49 +4,49 @@
 #
 
 PATH_MODULE=/lib/modules/4.9.84/sigmastar
-PATH_SENSOR=${PATH_MODULE}/sensor
+PATH_SENSOR=$PATH_MODULE/sensor
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
-	insmod ${PATH_SENSOR}/sensor_config.ko
+	insmod $PATH_SENSOR/sensor_config.ko
 	if [ -e /dev/srcfg ]; then
 		echo srcfg 0 1 0 0 0 0 > /dev/srcfg
 		rmmod sensor_config
 	fi
 	SENSOR=$(ipcinfo -s)
-	fw_setenv sensor ${SENSOR}
+	fw_setenv sensor "$SENSOR"
 }
 
 set_sensor() {
-	case ${SENSOR} in
+	case $SENSOR in
 		gc2053|gc2083|gc4023|gc4653|imx307|imx335|jxf37|jxq03|os02g10)
-			insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		sc200ai|sc401ai|sc2239|sc223a|sc2335|sc2336|sc3335|sc3338)
-			insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		*)
-			echo -e "\n\e[1;31mUNSUPPORTED sensor - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC
+			echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC
 			;;
 	esac
 }
 
 insert_ko() {
-	insmod ${PATH_MODULE}/mhal.ko
-	insmod ${PATH_MODULE}/mi_common.ko
-	insmod ${PATH_MODULE}/mi_sys.ko cmdQBufSize=256 logBufSize=256
-	insmod ${PATH_MODULE}/mi_rgn.ko
-	insmod ${PATH_MODULE}/mi_ai.ko
-	insmod ${PATH_MODULE}/mi_ao.ko
-	insmod ${PATH_MODULE}/mi_sensor.ko
-	insmod ${PATH_MODULE}/mi_shadow.ko
-	insmod ${PATH_MODULE}/mi_divp.ko
-	insmod ${PATH_MODULE}/mi_vif.ko
-	insmod ${PATH_MODULE}/mi_vpe.ko
-	insmod ${PATH_MODULE}/mi_venc.ko fw_path=/etc/firmware/chagall.bin
+	insmod $PATH_MODULE/mhal.ko
+	insmod $PATH_MODULE/mi_common.ko
+	insmod $PATH_MODULE/mi_sys.ko cmdQBufSize=256 logBufSize=256
+	insmod $PATH_MODULE/mi_rgn.ko
+	insmod $PATH_MODULE/mi_ai.ko
+	insmod $PATH_MODULE/mi_ao.ko
+	insmod $PATH_MODULE/mi_sensor.ko
+	insmod $PATH_MODULE/mi_shadow.ko
+	insmod $PATH_MODULE/mi_divp.ko
+	insmod $PATH_MODULE/mi_vif.ko
+	insmod $PATH_MODULE/mi_vpe.ko
+	insmod $PATH_MODULE/mi_venc.ko fw_path=/etc/firmware/chagall.bin
 
 	MAJOR=$(awk '$2=="mi_poll" {print $1}' /proc/devices)
-	mknod /dev/mi_poll c ${MAJOR} 0
+	mknod /dev/mi_poll c "$MAJOR" 0
 	echo isproot /etc/firmware > /dev/ispmid
 }
 
@@ -54,18 +54,19 @@ if [ ! -e /sys/module/mhal ]; then
 	insert_ko
 fi
 
-if [ -z ${SENSOR} ]; then
+if [ -z "$1" ] || [ -z "$SENSOR" ]; then
 	echo -e "\n\e[1;33mAutodetect sensor\e[0m\n" | logger -s -t OpenIPC
 	detect_sensor
 fi
 
-if [ -z ${SENSOR} ]; then
+if [ -z "$SENSOR" ]; then
 	echo -e "\n\e[1;31mSensor parameter MISSING\e[0m\n" | logger -s -t OpenIPC
 	exit 1
 else
-	echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC
-	if [ -e /sys/module/sensor* ]; then
-		rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4)
+	echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC
+	SENSOR_MODULE=$(ls /sys/module | grep $SENSOR)
+	if [ -n "$SENSOR_MODULE" ]; then
+		rmmod $SENSOR_MODULE
 	fi
 	set_sensor
 fi
diff --git a/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar
index f1732f23..2c964337 100755
--- a/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar
@@ -4,40 +4,40 @@
 #
 
 PATH_MODULE=/lib/modules/5.10.61/sigmastar
-PATH_SENSOR=${PATH_MODULE}/sensor
+PATH_SENSOR=$PATH_MODULE/sensor
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
-	insmod ${PATH_SENSOR}/sensor_config.ko
+	insmod $PATH_SENSOR/sensor_config.ko
 	if [ -e /dev/srcfg ]; then
 		echo srcfg 0 1 0 0 0 0 > /dev/srcfg
 		rmmod sensor_config
 	fi
 	SENSOR=$(ipcinfo -s)
-	fw_setenv sensor ${SENSOR}
+	fw_setenv sensor "$SENSOR"
 }
 
 set_sensor() {
-	case ${SENSOR} in
+	case $SENSOR in
 		sc401ai|sc501ai)
-			insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		*)
-			echo -e "\n\e[1;31mUNSUPPORTED sensor - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC
+			echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC
 			;;
 	esac
 }
 
 insert_ko() {
-	insmod ${PATH_MODULE}/mi_common.ko g_ModParamPath=${PATH_MODULE}/param.json config_json_path=/${PATH_MODULE}/config.json
-	insmod ${PATH_MODULE}/mi_sys.ko
-	insmod ${PATH_MODULE}/mi_vif.ko
-	insmod ${PATH_MODULE}/mi_sensor.ko
-	insmod ${PATH_MODULE}/mi_isp.ko
-	insmod ${PATH_MODULE}/mi_rgn.ko
-	insmod ${PATH_MODULE}/mi_scl.ko
-	insmod ${PATH_MODULE}/mi_vcodec.ko drv_codec40_common.fw_load_path=/etc/firmware/chagall.bin
-	insmod ${PATH_MODULE}/mi_venc.ko
+	insmod $PATH_MODULE/mi_common.ko g_ModParamPath=$PATH_MODULE/param.json config_json_path=$PATH_MODULE/config.json
+	insmod $PATH_MODULE/mi_sys.ko
+	insmod $PATH_MODULE/mi_vif.ko
+	insmod $PATH_MODULE/mi_sensor.ko
+	insmod $PATH_MODULE/mi_isp.ko
+	insmod $PATH_MODULE/mi_rgn.ko
+	insmod $PATH_MODULE/mi_scl.ko
+	insmod $PATH_MODULE/mi_vcodec.ko drv_codec40_common.fw_load_path=/etc/firmware/chagall.bin
+	insmod $PATH_MODULE/mi_venc.ko
 
 	echo isproot /etc/firmware > /dev/ispmid
 }
@@ -46,18 +46,19 @@ if [ ! -e /sys/module/mhal ]; then
 	insert_ko
 fi
 
-if [ -z ${SENSOR} ]; then
+if [ -z "$1" ] || [ -z "$SENSOR" ]; then
 	echo -e "\n\e[1;33mAutodetect sensor\e[0m\n" | logger -s -t OpenIPC
 	detect_sensor
 fi
 
-if [ -z ${SENSOR} ]; then
+if [ -z "$SENSOR" ]; then
 	echo -e "\n\e[1;31mSensor parameter MISSING\e[0m\n" | logger -s -t OpenIPC
 	exit 1
 else
-	echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC
-	if [ -e /sys/module/sensor* ]; then
-		rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4)
+	echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC
+	SENSOR_MODULE=$(ls /sys/module | grep $SENSOR)
+	if [ -n "$SENSOR_MODULE" ]; then
+		rmmod $SENSOR_MODULE
 	fi
 	set_sensor
 fi
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
index 4cd36854..99520ca9 100755
--- a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
@@ -4,48 +4,48 @@
 #
 
 PATH_MODULE=/lib/modules/4.9.84/sigmastar
-PATH_SENSOR=${PATH_MODULE}/sensor
+PATH_SENSOR=$PATH_MODULE/sensor
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
-	insmod ${PATH_SENSOR}/sensor_config.ko
+	insmod $PATH_SENSOR/sensor_config.ko
 	if [ -e /dev/srcfg ]; then
 		echo srcfg 0 1 0 0 0 0 > /dev/srcfg
 		rmmod sensor_config
 	fi
 	SENSOR=$(ipcinfo -s)
-	fw_setenv sensor ${SENSOR}
+	fw_setenv sensor "$SENSOR"
 }
 
 set_sensor() {
-	case ${SENSOR} in
+	case $SENSOR in
 		gc2053|gc4653|imx274|imx307|imx335|imx347|imx415|sc501ai|sc8235)
-			insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		*)
-			echo -e "\n\e[1;31mUNSUPPORTED sensor - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC
+			echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC
 			;;
 	esac
 }
 
 insert_ko() {
-	insmod ${PATH_MODULE}/mhal.ko
-	insmod ${PATH_MODULE}/mi_common.ko
-	insmod ${PATH_MODULE}/mi_sys.ko cmdQBufSize=768 logBufSize=256
-	insmod ${PATH_MODULE}/mi_rgn.ko
-	insmod ${PATH_MODULE}/mi_ldc.ko
-	insmod ${PATH_MODULE}/mi_ai.ko
-	insmod ${PATH_MODULE}/mi_ao.ko
-	insmod ${PATH_MODULE}/mi_mipitx.ko
-	insmod ${PATH_MODULE}/mi_sensor.ko
-	insmod ${PATH_MODULE}/mi_shadow.ko
-	insmod ${PATH_MODULE}/mi_divp.ko
-	insmod ${PATH_MODULE}/mi_vif.ko
-	insmod ${PATH_MODULE}/mi_vpe.ko
-	insmod ${PATH_MODULE}/mi_venc.ko fw_path=/etc/firmware/chagall.bin
+	insmod $PATH_MODULE/mhal.ko
+	insmod $PATH_MODULE/mi_common.ko
+	insmod $PATH_MODULE/mi_sys.ko cmdQBufSize=768 logBufSize=256
+	insmod $PATH_MODULE/mi_rgn.ko
+	insmod $PATH_MODULE/mi_ldc.ko
+	insmod $PATH_MODULE/mi_ai.ko
+	insmod $PATH_MODULE/mi_ao.ko
+	insmod $PATH_MODULE/mi_mipitx.ko
+	insmod $PATH_MODULE/mi_sensor.ko
+	insmod $PATH_MODULE/mi_shadow.ko
+	insmod $PATH_MODULE/mi_divp.ko
+	insmod $PATH_MODULE/mi_vif.ko
+	insmod $PATH_MODULE/mi_vpe.ko
+	insmod $PATH_MODULE/mi_venc.ko fw_path=/etc/firmware/chagall.bin
 
 	MAJOR=$(awk '$2=="mi_poll" {print $1}' /proc/devices)
-	mknod /dev/mi_poll c ${MAJOR} 0
+	mknod /dev/mi_poll c "$MAJOR" 0
 	echo isproot /etc/firmware > /dev/ispmid
 }
 
@@ -53,18 +53,19 @@ if [ ! -e /sys/module/mhal ]; then
 	insert_ko
 fi
 
-if [ -z ${SENSOR} ]; then
+if [ -z "$1" ] || [ -z "$SENSOR" ]; then
 	echo -e "\n\e[1;33mAutodetect sensor\e[0m\n" | logger -s -t OpenIPC
 	detect_sensor
 fi
 
-if [ -z ${SENSOR} ]; then
+if [ -z "$SENSOR" ]; then
 	echo -e "\n\e[1;31mSensor parameter MISSING\e[0m\n" | logger -s -t OpenIPC
 	exit 1
 else
-	echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC
-	if [ -e /sys/module/sensor* ]; then
-		rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4)
+	echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC
+	SENSOR_MODULE=$(ls /sys/module | grep $SENSOR)
+	if [ -n "$SENSOR_MODULE" ]; then
+		rmmod $SENSOR_MODULE
 	fi
 	set_sensor
 fi