diff --git a/packages/modules/common/store/_chargepoint_internal.py b/packages/modules/common/store/_chargepoint_internal.py
index 339220a1e5..58e2aafa13 100644
--- a/packages/modules/common/store/_chargepoint_internal.py
+++ b/packages/modules/common/store/_chargepoint_internal.py
@@ -12,32 +12,31 @@ def set(self, state: ChargepointState) -> None:
         self.state = state
 
     def update(self):
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/voltages", self.state.voltages, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/currents", self.state.currents, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/frequency", self.state.frequency, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) +
-                      "/get/power_factors", self.state.power_factors, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/imported", self.state.imported, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/exported", self.state.exported, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/power", self.state.power, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/powers", self.state.powers, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) +
-                      "/get/phases_in_use", self.state.phases_in_use, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) +
-                      "/get/charge_state", self.state.charge_state, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/plug_state", self.state.plug_state, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/rfid", self.state.rfid)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) +
-                      "/get/serial_number", self.state.serial_number)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) +
-                      "/get/evse_current", self.state.evse_current, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) +
-                      "/get/max_evse_current", self.state.max_evse_current, 2)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) + "/get/version", self.state.version)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) +
-                      "/get/current_branch", self.state.current_branch)
-        pub_to_broker("openWB/set/internal_chargepoint/" + str(self.num) +
-                      "/get/current_commit", self.state.current_commit)
+        topic_prefix = f"openWB/set/internal_chargepoint/{self.num}/get"
+        pub_to_broker(f"{topic_prefix}/voltages", self.state.voltages, 2)
+        pub_to_broker(f"{topic_prefix}/currents", self.state.currents, 2)
+        pub_to_broker(f"{topic_prefix}/frequency", self.state.frequency, 2)
+        pub_to_broker(f"{topic_prefix}/power_factors", self.state.power_factors, 2)
+        pub_to_broker(f"{topic_prefix}/imported", self.state.imported, 2)
+        pub_to_broker(f"{topic_prefix}/exported", self.state.exported, 2)
+        pub_to_broker(f"{topic_prefix}/power", self.state.power, 2)
+        pub_to_broker(f"{topic_prefix}/powers", self.state.powers, 2)
+        pub_to_broker(f"{topic_prefix}/phases_in_use", self.state.phases_in_use, 2)
+        pub_to_broker(f"{topic_prefix}/charge_state", self.state.charge_state, 2)
+        pub_to_broker(f"{topic_prefix}/plug_state", self.state.plug_state, 2)
+        pub_to_broker(f"{topic_prefix}/rfid", self.state.rfid)
+        pub_to_broker(f"{topic_prefix}/serial_number", self.state.serial_number)
+        pub_to_broker(f"{topic_prefix}/evse_current", self.state.evse_current, 2)
+        pub_to_broker(f"{topic_prefix}/max_evse_current", self.state.max_evse_current, 2)
+        pub_to_broker(f"{topic_prefix}/version", self.state.version)
+        pub_to_broker(f"{topic_prefix}/current_branch", self.state.current_branch)
+        pub_to_broker(f"{topic_prefix}/current_commit", self.state.current_commit)
+        if self.state.soc is not None:
+            pub_to_broker(f"{topic_prefix}/get/soc", self.state.soc)
+        if self.state.soc_timestamp is not None:
+            pub_to_broker(f"{topic_prefix}/soc_timestamp", self.state.soc_timestamp)
+        if self.state.rfid_timestamp is not None:
+            pub_to_broker(f"{topic_prefix}/vehicle_id", self.state.vehicle_id)
 
 
 def get_internal_chargepoint_value_store(id: int) -> ValueStore[ChargepointState]: