diff --git a/automation/System/startup_notification.yaml b/automation/System/startup_notification.yaml
index a03cf06e..8bf3efa9 100755
--- a/automation/System/startup_notification.yaml
+++ b/automation/System/startup_notification.yaml
@@ -13,7 +13,7 @@
         value1: 'Startup: Home Assistant is Up and Running!'
         value2: ''
         value3: ''
-        
+
     - service: light.turn_off
       entity_id: group.hallway_lights
-    
\ No newline at end of file
+    - service: shell_command.restart_homebridge
diff --git a/configuration.yaml b/configuration.yaml
index 838ba38a..c760b9b8 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -145,3 +145,4 @@ scene: !include_dir_merge_list scene
 switch: !include_dir_merge_list switch
 script: !include_dir_merge_named script
 input_boolean: !include_dir_merge_named input_boolean
+shell_command: !include_dir_merge_named shell_command
diff --git a/shell_command/restart_homebridge.yaml b/shell_command/restart_homebridge.yaml
new file mode 100755
index 00000000..d841fc2d
--- /dev/null
+++ b/shell_command/restart_homebridge.yaml
@@ -0,0 +1,2 @@
+restart_homebridge: >-
+    sudo -u pi -H /usr/bin/pm2 restart homebridge