diff --git a/systems/brain/services/home_assistant/gps_location.yaml b/systems/brain/services/home_assistant/gps_location.yaml
index 19d88c5..8f2ebab 100644
--- a/systems/brain/services/home_assistant/gps_location.yaml
+++ b/systems/brain/services/home_assistant/gps_location.yaml
@@ -57,6 +57,30 @@ automation:
 
 template:
   - sensor:
+      - name: Van Last Known Latitude
+        unique_id: van_last_known_latitude
+        unit_of_measurement: "°"
+        state: >-
+          {% set lat = states('sensor.gps_latitude')|float(none) %}
+          {% set fix = states('sensor.gps_fix')|int(0) %}
+          {% if lat is not none and fix > 0 %}
+            {{ lat }}
+          {% else %}
+            {{ this.state | default('unavailable', true) }}
+          {% endif %}
+
+      - name: Van Last Known Longitude
+        unique_id: van_last_known_longitude
+        unit_of_measurement: "°"
+        state: >-
+          {% set lon = states('sensor.gps_longitude')|float(none) %}
+          {% set fix = states('sensor.gps_fix')|int(0) %}
+          {% if lon is not none and fix > 0 %}
+            {{ lon }}
+          {% else %}
+            {{ this.state | default('unavailable', true) }}
+          {% endif %}
+
       - name: GPS Location
         unique_id: gps_location
         state: >-
diff --git a/systems/brain/services/home_assistant/victron_modbuss.yaml b/systems/brain/services/home_assistant/victron_modbuss.yaml
index 602e579..bc22c79 100644
--- a/systems/brain/services/home_assistant/victron_modbuss.yaml
+++ b/systems/brain/services/home_assistant/victron_modbuss.yaml
@@ -78,7 +78,7 @@ modbus:
 
       # GPS
       - name: GPS Latitude
-        slave: 100
+        slave: 1
         address: 2800
         input_type: holding
         data_type: int32
@@ -88,7 +88,7 @@ modbus:
         unique_id: gps_latitude
 
       - name: GPS Longitude
-        slave: 100
+        slave: 1
         address: 2802
         input_type: holding
         data_type: int32
@@ -98,7 +98,7 @@ modbus:
         unique_id: gps_longitude
 
       - name: GPS Course
-        slave: 100
+        slave: 1
         address: 2804
         input_type: holding
         data_type: uint16
@@ -109,7 +109,7 @@ modbus:
         unique_id: gps_course
 
       - name: GPS Speed
-        slave: 100
+        slave: 1
         address: 2805
         input_type: holding
         data_type: uint16
@@ -120,7 +120,7 @@ modbus:
         unique_id: gps_speed
 
       - name: GPS Fix
-        slave: 100
+        slave: 1
         address: 2806
         input_type: holding
         data_type: uint16
@@ -129,7 +129,7 @@ modbus:
         unique_id: gps_fix
 
       - name: GPS Satellites
-        slave: 100
+        slave: 1
         address: 2807
         input_type: holding
         data_type: uint16
@@ -138,7 +138,7 @@ modbus:
         unique_id: gps_satellites
 
       - name: GPS Altitude
-        slave: 100
+        slave: 1
         address: 2808
         input_type: holding
         data_type: int32