diff --git a/automations/house/climate/automated/climate_control.yaml b/automations/house/climate/automated/climate_control.yaml
index 01aa3ea5..52b40259 100644
--- a/automations/house/climate/automated/climate_control.yaml
+++ b/automations/house/climate/automated/climate_control.yaml
@@ -1,7 +1,7 @@
 ---
 - alias: '[House] - Studio climate automated'
   description: >-
-    Make sure the climate is livable in my warm studio
+    Make sure the climate is livable in my studio
 
   id: ee8b0ad0-5888-44a9-8291-1305dc646cf7
   mode: single
diff --git a/automations/house/climate/nobody_home.yaml b/automations/house/climate/nobody_home.yaml
index 4e2fccb7..90a180c3 100644
--- a/automations/house/climate/nobody_home.yaml
+++ b/automations/house/climate/nobody_home.yaml
@@ -18,7 +18,7 @@
       state: 'on'
   action:
     # HA Android notification
-    - service: notify.mobile_app_klaas_samsung_s20_plus
+    - service: notify.mobile_app_klaas_samsung_s22_plus
       data:
         title: 'Airco vergeten!'
         message: >
diff --git a/automations/house/lights/nobody_home.yaml b/automations/house/lights/nobody_home.yaml
index eb89de5e..9a410bdb 100644
--- a/automations/house/lights/nobody_home.yaml
+++ b/automations/house/lights/nobody_home.yaml
@@ -33,7 +33,7 @@
         state: 'on'
   action:
     # HA Android notification
-    - service: notify.mobile_app_klaas_samsung_s20_plus
+    - service: notify.mobile_app_klaas_samsung_s22_plus
       data:
         title: 'Lampen vergeten!'
         message: >
@@ -61,10 +61,10 @@
       to: 'on'
   condition:
     - condition: state
-      entity_id: device_tracker.klaas_samsung_s20_plus
+      entity_id: device_tracker.klaas_samsung_s22_plus
       state: 'not_home'
   action:
-    - service: notify.mobile_app_klaas_samsung_s20_plus
+    - service: notify.mobile_app_klaas_samsung_s22_plus
       data:
         title: 'Lamp is aan gegaan!'
         message: >
diff --git a/automations/house/morning.yaml b/automations/house/morning.yaml
index d59a2c10..b1660bbf 100755
--- a/automations/house/morning.yaml
+++ b/automations/house/morning.yaml
@@ -16,7 +16,7 @@
     - platform: template
       value_template: >
         {{ is_state('binary_sensor.manual_wakeup_alarm', 'on') and
-        states('sensor.klaas_samsung_s20_plus_volgende_alarm') in ('none', 'unavailable', 'unknown') }}
+        states('sensor.klaas_samsung_s22_plus_volgende_alarm') in ('none', 'unavailable', 'unknown') }}
   condition:
     condition: and
     conditions:
diff --git a/automations/people/phone_battery.yaml b/automations/people/phone_battery.yaml
index ac046f46..346f1ec1 100644
--- a/automations/people/phone_battery.yaml
+++ b/automations/people/phone_battery.yaml
@@ -9,7 +9,7 @@
 
   trigger:
     - platform: numeric_state
-      entity_id: sensor.klaas_samsung_s20_plus_batterijniveau
+      entity_id: sensor.klaas_samsung_s22_plus_battery_level
       above: 99
       for: '00:03:00'
   condition:
diff --git a/automations/system/ha_backup.yaml b/automations/system/ha_backup.yaml
index 87da1d62..8379a938 100755
--- a/automations/system/ha_backup.yaml
+++ b/automations/system/ha_backup.yaml
@@ -20,7 +20,7 @@
     - service: hassio.backup_full
       data_template:
         name: Backup {{ now().strftime('%Y-%m-%d') }} running HA version {{ states('sensor.current_version') }}
-    - service: notify.mobile_app_klaas_samsung_s20_plus
+    - service: notify.mobile_app_klaas_samsung_s22_plus
       data_template:
         title: '*Home Assistant Backup!*'
         message: >-
diff --git a/automations/system/notifications/ha_update.yaml b/automations/system/notifications/ha_update.yaml
index 804e5e05..59c3b5cb 100644
--- a/automations/system/notifications/ha_update.yaml
+++ b/automations/system/notifications/ha_update.yaml
@@ -10,7 +10,7 @@
     input:
       clickAction: https://my.home-assistant.io/redirect/supervisor/
       delay: 0
-      notify_device: 5e3a9bc1a6710fb13b08435ab16cd62b
+      notify_device: 6a16c24c60507cdb3712c249d13133c3
       notification_title: Tijd om te upgraden!
       group: Updates
       notification_message: 'Er is een nieuwe versie voor Home Assistant beschikbaar,
diff --git a/customizations/entities/device_trackers.yaml b/customizations/entities/device_trackers.yaml
index 1fb67651..c212d8b8 100755
--- a/customizations/entities/device_trackers.yaml
+++ b/customizations/entities/device_trackers.yaml
@@ -1,5 +1,5 @@
 ---
 # Customize device tracker entities
 #
-device_tracker.klaas_samsung_s20_plus:
+device_tracker.klaas_samsung_s22_plus:
   entity_picture: /local/klaas.jpg
diff --git a/integrations/proximity.yaml b/integrations/proximity.yaml
index d2f2e7d3..7c537e30 100755
--- a/integrations/proximity.yaml
+++ b/integrations/proximity.yaml
@@ -9,3 +9,4 @@ proximity:
       # Android Companion app
       - device_tracker.klaas_samsung_s22_plus
     tolerance: 50
+    unit_of_measurement: m