diff --git a/spec_files/jupiter-hw-support/priv-write.patch b/spec_files/jupiter-hw-support/priv-write.patch
index 284377ca8e..dd4f1377ef 100644
--- a/spec_files/jupiter-hw-support/priv-write.patch
+++ b/spec_files/jupiter-hw-support/priv-write.patch
@@ -12,25 +12,17 @@ index 296996e..ae0ae3e 100755
  if [[ $EUID -ne 0 ]];
  then
      exec pkexec --disable-internal-agent "$0" "$@"
-@@ -12,21 +15,25 @@
+@@ -12,21 +15,21 @@
  
  function CommitWrite()
  {
--   if [ ! -z "$WRITE_VALUE" ]
--   then
--      echo "commit: $WRITE_VALUE -> $WRITE_PATH" | systemd-cat -t p-steamos-priv-write -p warning
--      echo "$WRITE_VALUE" > "$WRITE_PATH"
-+   if [[ ":Jupiter:" =~ ":$SYS_ID:" || ":Galileo:" =~ ":$SYS_ID:" || "$ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE" = 1 ]]; then
-+      if [ ! -z "$WRITE_VALUE" ]
-+      then
-+         echo "commit: $WRITE_VALUE -> $WRITE_PATH" | systemd-cat -t p-steamos-priv-write -p warning
-+         chmod a+w "$WRITE_PATH"
-+         echo "$WRITE_VALUE" > "$WRITE_PATH"
-+      fi
++   chmod a+w "$WRITE_PATH"
++   echo "chmod a+w: $WRITE_PATH" | systemd-cat -t p-steamos-priv-write -p warning
 +
-+      echo "chmod a+w: $WRITE_PATH" | systemd-cat -t p-steamos-priv-write -p warning
-+   else
-+      echo "commit: Skipped - see /etc/default/steam-hardware-control" | systemd-cat -t p-steamos-priv-write -p warning
+    if [ ! -z "$WRITE_VALUE" ]
+    then
+       echo "commit: $WRITE_VALUE -> $WRITE_PATH" | systemd-cat -t p-steamos-priv-write -p warning
+       echo "$WRITE_VALUE" > "$WRITE_PATH"
     fi
  
 -   chmod a+w "$WRITE_PATH"
@@ -45,25 +37,42 @@ index 296996e..ae0ae3e 100755
      exit 1
  }
  
-@@ -40,11 +47,19 @@
+@@ -40,15 +43,35 @@
  fi
  
  if [[ "$WRITE_PATH" == /sys/class/drm/card*/device/power_dpm_force_performance_level ]]; then
 -   CommitWrite
-+   for i in $(ls /sys/class/drm/card*/device/power_dpm_force_performance_level)
-+   do
-+      WRITE_PATH="$i"
-+      CommitWrite
-+   done
++   if [[ ":Jupiter:" =~ ":$SYS_ID:" || ":Galileo:" =~ ":$SYS_ID:" || "$ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE" = 1 ]]; then
++      for i in $(ls /sys/class/drm/card*/device/power_dpm_force_performance_level)
++      do
++         WRITE_PATH="$i"
++         CommitWrite
++      done
++   else
++      echo "commit: Skipped - see /etc/default/steam-hardware-control" | systemd-cat -t p-steamos-priv-write -p warning
++   fi
  fi
  
  if [[ "$WRITE_PATH" == /sys/class/drm/card*/device/pp_od_clk_voltage ]]; then
 -   CommitWrite
-+   for i in $(ls /sys/class/drm/card*/device/pp_od_clk_voltage)
-+   do
-+      WRITE_PATH="$i"
-+      CommitWrite
-+   done
++   if [[ ":Jupiter:" =~ ":$SYS_ID:" || ":Galileo:" =~ ":$SYS_ID:" || "$ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE" = 1 ]]; then
++      for i in $(ls /sys/class/drm/card*/device/pp_od_clk_voltage)
++      do
++         WRITE_PATH="$i"
++         CommitWrite
++      done
++   else
++      echo "commit: Skipped - see /etc/default/steam-hardware-control" | systemd-cat -t p-steamos-priv-write -p warning
++   fi
  fi
  
  if [[ "$WRITE_PATH" == /sys/class/hwmon/hwmon*/power*_cap ]]; then
+-   CommitWrite
++   if [[ ":Jupiter:" =~ ":$SYS_ID:" || ":Galileo:" =~ ":$SYS_ID:" || "$ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE" = 1 ]]; then
++      CommitWrite
++   else
++      echo "commit: Skipped - see /etc/default/steam-hardware-control" | systemd-cat -t p-steamos-priv-write -p warning
++   fi
+ fi
+ 
+ if [[ "$WRITE_PATH" == /sys/devices/platform/*/*/*/iio:device*/in_illuminance_integration_time ]]; then