diff --git a/apps/predbat/config/apps.yaml b/apps/predbat/config/apps.yaml
index f67900b78..dfb2f89bb 100644
--- a/apps/predbat/config/apps.yaml
+++ b/apps/predbat/config/apps.yaml
@@ -387,7 +387,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/fox.yaml b/templates/fox.yaml
index 6f8a00d20..5a633af8e 100644
--- a/templates/fox.yaml
+++ b/templates/fox.yaml
@@ -275,7 +275,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/fox_cloud.yaml b/templates/fox_cloud.yaml
index cf163d591..3731436ab 100644
--- a/templates/fox_cloud.yaml
+++ b/templates/fox_cloud.yaml
@@ -175,7 +175,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/fronius.yaml b/templates/fronius.yaml
index 379a5a903..25c9af815 100644
--- a/templates/fronius.yaml
+++ b/templates/fronius.yaml
@@ -328,7 +328,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/ginlong_solis.yaml b/templates/ginlong_solis.yaml
index e51883331..5e0b911e9 100644
--- a/templates/ginlong_solis.yaml
+++ b/templates/ginlong_solis.yaml
@@ -262,7 +262,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/givenergy_cloud.yaml b/templates/givenergy_cloud.yaml
index f2825ba1d..e7c49c879 100644
--- a/templates/givenergy_cloud.yaml
+++ b/templates/givenergy_cloud.yaml
@@ -287,7 +287,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/givenergy_ems.yaml b/templates/givenergy_ems.yaml
index 87425e513..0abbcdf28 100644
--- a/templates/givenergy_ems.yaml
+++ b/templates/givenergy_ems.yaml
@@ -209,7 +209,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/givenergy_givtcp.yaml b/templates/givenergy_givtcp.yaml
index 50cfe8c05..db5256d7d 100644
--- a/templates/givenergy_givtcp.yaml
+++ b/templates/givenergy_givtcp.yaml
@@ -327,7 +327,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/huawei.yaml b/templates/huawei.yaml
index b6e4ee390..e4016530d 100644
--- a/templates/huawei.yaml
+++ b/templates/huawei.yaml
@@ -265,7 +265,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/luxpower.yaml b/templates/luxpower.yaml
index 5f1f70465..ef58e18d6 100644
--- a/templates/luxpower.yaml
+++ b/templates/luxpower.yaml
@@ -297,7 +297,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/sigenergy_sigenstor.yaml b/templates/sigenergy_sigenstor.yaml
index c04171b1b..0702d42c8 100644
--- a/templates/sigenergy_sigenstor.yaml
+++ b/templates/sigenergy_sigenstor.yaml
@@ -232,7 +232,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Enter your Axle VPP API key if you have signed up to the Axle service in the UK
diff --git a/templates/sofar.yaml b/templates/sofar.yaml
index 560896d76..0be28f07f 100644
--- a/templates/sofar.yaml
+++ b/templates/sofar.yaml
@@ -228,7 +228,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # rate configured with input_number.predbat_metric_octopus_saving_rate in-side HA
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/sofar_modbus.yaml b/templates/sofar_modbus.yaml
index 7e830b1cc..fffdb85ce 100644
--- a/templates/sofar_modbus.yaml
+++ b/templates/sofar_modbus.yaml
@@ -249,7 +249,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Energy rates
diff --git a/templates/solar_assistant_growatt_spa.yaml b/templates/solar_assistant_growatt_spa.yaml
index 0f1f504db..9b403e241 100644
--- a/templates/solar_assistant_growatt_spa.yaml
+++ b/templates/solar_assistant_growatt_spa.yaml
@@ -232,7 +232,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Energy rates
diff --git a/templates/solar_assistant_growatt_sph.yaml b/templates/solar_assistant_growatt_sph.yaml
index 6d5c28131..2bfe87d20 100644
--- a/templates/solar_assistant_growatt_sph.yaml
+++ b/templates/solar_assistant_growatt_sph.yaml
@@ -229,7 +229,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Energy rates
diff --git a/templates/solaredge.yaml b/templates/solaredge.yaml
index 10971ceab..e8210add7 100644
--- a/templates/solaredge.yaml
+++ b/templates/solaredge.yaml
@@ -233,7 +233,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/solax_cloud.yaml b/templates/solax_cloud.yaml
index 778fc2790..b6f0719aa 100644
--- a/templates/solax_cloud.yaml
+++ b/templates/solax_cloud.yaml
@@ -178,7 +178,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/solax_sx4.yaml b/templates/solax_sx4.yaml
index 0ff950c97..5dc27fac2 100644
--- a/templates/solax_sx4.yaml
+++ b/templates/solax_sx4.yaml
@@ -289,7 +289,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/solis_cloud.yaml b/templates/solis_cloud.yaml
index 4153b2769..0729a82cb 100644
--- a/templates/solis_cloud.yaml
+++ b/templates/solis_cloud.yaml
@@ -196,7 +196,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/sunsynk.yaml b/templates/sunsynk.yaml
index 91c908439..2bbeac520 100644
--- a/templates/sunsynk.yaml
+++ b/templates/sunsynk.yaml
@@ -341,7 +341,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Octopus free session points to the free session Sensor in the Octopus plugin
diff --git a/templates/tesla_powerwall.yaml b/templates/tesla_powerwall.yaml
index 7ce169bcc..43979b276 100644
--- a/templates/tesla_powerwall.yaml
+++ b/templates/tesla_powerwall.yaml
@@ -262,7 +262,7 @@ pred_bat:
 
   # Octopus saving session points to the saving session Sensor in the Octopus plugin, when enabled saving sessions will be at the assumed
   # Rate is read automatically from the add-in and converted to pence using the conversion rate below (default is 8)
-  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|)'
+  octopus_saving_session: 're:(event.octopus_energy([0-9a-z_]+|)_saving_session_event(s|))'
   octopus_saving_session_octopoints_per_penny: 8
 
   # Energy rates