diff --git a/defaults.inc b/defaults.inc
index ffc92b01..5978a971 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -37,9 +37,9 @@ declare -A PW_TEMP_THRESHOLDS
 # PW_TEMP_THRESHOLDS['ServerRoomTH']="83,88,95" #Normal broken
 PW_TEMP_THRESHOLDS['ServerRoomTH']="78,85,91" #Normal -4
 PW_TEMP_THRESHOLDS['Powerwall-CPU']="122,131,176"
-PW_TEMP_THRESHOLDS['Powerwall-CPU-Usage']="40,80"
+PW_TEMP_THRESHOLDS['Powerwall-CPU-Usage']="4,8,90"
 PW_TEMP_THRESHOLDS['OctoPi-CPU']="122,131,176"
-PW_TEMP_THRESHOLDS['OctoPi-CPU-Usage']="40,80"
+PW_TEMP_THRESHOLDS['OctoPi-CPU-Usage']="1,3,90"
 
 declare -A PW_SENSOR_TYPE
 PW_SENSOR_TYPE['ServerRoomTH']='mqtt'
diff --git a/powerwall.sh b/powerwall.sh
index 062ff5b3..d4d25bb4 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -309,7 +309,7 @@ CHECKTEMP_SERVICE(){
 							fi
 							echo ${PW_TEMP_THRESHOLDS[${SENSORa}]} | cut -d',' -f 1 | read temp_warn
 							echo ${PW_TEMP_THRESHOLDS[${SENSORa}]} | cut -d',' -f 2 | read temp_crit	
-							temp_crit_sys=${temp_crit}
+							echo ${PW_TEMP_THRESHOLDS[${SENSORa}]} | cut -d',' -f 3 | read temp_crit_sys	
 							temp_h=''
 							
 						fi