diff --git a/configuration/automations/behaviour-goto-sleep.yaml b/configuration/automations/behaviour-goto-sleep.yaml
index 5a56f55..3b78f14 100644
--- a/configuration/automations/behaviour-goto-sleep.yaml
+++ b/configuration/automations/behaviour-goto-sleep.yaml
@@ -15,7 +15,7 @@
         - thu
         - sun
     - condition: state
-      entity_id: binary_sensor.desktop
+      entity_id: binary_sensor.hulk_ping
       state: 'on'
   action:
     - service: light.turn_on
@@ -31,7 +31,7 @@
     - choose:
         - conditions:
             - condition: state
-              entity_id: binary_sensor.desktop
+              entity_id: binary_sensor.hulk_ping
               state: 'on'
             - condition: state
               entity_id: input_boolean.pc_caffeine
@@ -41,7 +41,7 @@
     - choose:
         - conditions:
             - condition: state
-              entity_id: binary_sensor.desktop
+              entity_id: binary_sensor.hulk_ping
               state: 'on'
             - condition: state
               entity_id: input_boolean.pc_caffeine
@@ -70,7 +70,7 @@
         - thu
         - fri
     - condition: state
-      entity_id: binary_sensor.desktop
+      entity_id: binary_sensor.hulk_ping
       state: 'on'
   action:
     - service: light.turn_on
@@ -86,7 +86,7 @@
     - choose:
         - conditions:
             - condition: state
-              entity_id: binary_sensor.desktop
+              entity_id: binary_sensor.hulk_ping
               state: 'on'
             - condition: state
               entity_id: input_boolean.pc_caffeine
@@ -96,7 +96,7 @@
     - choose:
         - conditions:
             - condition: state
-              entity_id: binary_sensor.desktop
+              entity_id: binary_sensor.hulk_ping
               state: 'on'
             - condition: state
               entity_id: input_boolean.pc_caffeine
@@ -125,7 +125,7 @@
         - thu
         - fri
     - condition: state
-      entity_id: binary_sensor.desktop
+      entity_id: binary_sensor.hulk_ping
       state: 'on'
   action:
     - service: light.turn_on
diff --git a/configuration/automations/computer-lights.yaml b/configuration/automations/computer-lights.yaml
index 3bde0bb..1fae47a 100644
--- a/configuration/automations/computer-lights.yaml
+++ b/configuration/automations/computer-lights.yaml
@@ -3,7 +3,7 @@
   description: ''
   trigger:
     - platform: state
-      entity_id: binary_sensor.desktop
+      entity_id: binary_sensor.hulk_ping
       to: 'off'
       for:
         minutes: 5
diff --git a/configuration/automations/computer.yaml b/configuration/automations/computer.yaml
index 8fa7fbe..2a4e242 100644
--- a/configuration/automations/computer.yaml
+++ b/configuration/automations/computer.yaml
@@ -3,7 +3,7 @@
   mode: single
   trigger:
     - platform: state
-      entity_id: binary_sensor.desktop
+      entity_id: binary_sensor.hulk_ping
       to: 'on'
       from: 'off'
   action:
diff --git a/scripts/30.pc-sleep.yaml b/scripts/30.pc-sleep.yaml
index f9d432e..173620a 100644
--- a/scripts/30.pc-sleep.yaml
+++ b/scripts/30.pc-sleep.yaml
@@ -4,7 +4,7 @@ pc_sleep:
     - choose:
         - conditions:
             - condition: state
-              entity_id: binary_sensor.desktop
+              entity_id: binary_sensor.hulk_ping
               state: 'on'
             - condition: state
               entity_id: input_boolean.pc_caffeine
@@ -16,7 +16,7 @@ pc_sleep:
                 entity_id: input_boolean.pc_sleeping
         - conditions:
             - condition: state
-              entity_id: binary_sensor.desktop
+              entity_id: binary_sensor.hulk_ping
               state: 'off'
           sequence: [ ]
       default:
@@ -28,13 +28,13 @@ pc_safe_off:
     - choose:
         - conditions:
             - condition: state
-              entity_id: binary_sensor.desktop
+              entity_id: binary_sensor.hulk_ping
               state: 'on'
           sequence:
             - service: shell_command.pc_poweroff
             - wait_for_trigger:
                 - platform: state
-                  entity_id: binary_sensor.desktop
+                  entity_id: binary_sensor.hulk_ping
                   to: 'off'
             - service: switch.turn_off
               target: