diff --git a/src/nodes/config-client.html b/src/nodes/config-client.html
index 4ef2cf6..3e6585e 100644
--- a/src/nodes/config-client.html
+++ b/src/nodes/config-client.html
@@ -3489,6 +3489,19 @@ <h3>Details</h3>
 <p>With this node several settings can be read. Currently the focus is mainly on the Carlo Gavazzi Wired AC Sensors (cgwacs).</p>
 <h3>Settings</h3>
 <dl class="message-properties">
+  <dt class="optional">AC export current limit (A)<span class="property-type">float</dt>
+  <dd>Dbus path: <b>/Settings/CGwacs/AcExportLimit</b>
+</dd>
+  <dt class="optional">AC import current limit (A)<span class="property-type">float</dt>
+  <dd>Dbus path: <b>/Settings/CGwacs/AcImportLimit</b>
+</dd>
+  <dt class="optional">Mode for peakshaving<span class="property-type">enum</dt>
+  <dd>Dbus path: <b>/Settings/CGwacs/AlwaysPeakShave</b>
+<ul>
+  <li>0 - Above minimum SOC only</li>
+  <li>1 - Always</li>
+</ul>
+</dd>
   <dt class="optional">ESS max charge current (fractional) (%)<span class="property-type">float</dt>
   <dd>Dbus path: <b>/Settings/CGwacs/MaxChargePercentage</b>
 </dd>
@@ -5403,8 +5416,18 @@ <h3>Details</h3>
 <p>With this node several settings can be adjusted. Currently the focus is mainly on the Carlo Gavazzi Wired AC Sensors (cgwacs).</p>
 <h3>Settings</h3>
 <dl class="message-properties">
-  <dt class="optional">ESS control loop setpoint (W)<span class="property-type">float</dt>
-  <dd>Dbus path: <b>/Settings/CGwacs/AcPowerSetPoint</b>
+  <dt class="optional">AC export current limit (A)<span class="property-type">float</dt>
+  <dd>Dbus path: <b>/Settings/CGwacs/AcExportLimit</b>
+</dd>
+  <dt class="optional">AC import current limit (A)<span class="property-type">float</dt>
+  <dd>Dbus path: <b>/Settings/CGwacs/AcImportLimit</b>
+</dd>
+  <dt class="optional">Mode for peakshaving<span class="property-type">enum</dt>
+  <dd>Dbus path: <b>/Settings/CGwacs/AlwaysPeakShave</b>
+<ul>
+  <li>0 - Above minimum SOC only</li>
+  <li>1 - Always</li>
+</ul>
 </dd>
   <dt class="optional">ESS Minimum SoC (unless grid fails) (%)<span class="property-type">float</dt>
   <dd>Dbus path: <b>/Settings/CGwacs/BatteryLife/MinimumSocLimit</b>
diff --git a/src/services/services.json b/src/services/services.json
index 61b6b04..bc91102 100644
--- a/src/services/services.json
+++ b/src/services/services.json
@@ -4380,6 +4380,25 @@
   "input-settings": {
     "help": "<p>With this node several settings can be read. Currently the focus is mainly on the Carlo Gavazzi Wired AC Sensors (cgwacs).</p>",
     "settings": [
+      {
+        "path": "/Settings/CGwacs/AcExportLimit",
+        "type": "float",
+        "name": "AC export current limit (A)"
+      },
+      {
+        "path": "/Settings/CGwacs/AcImportLimit",
+        "type": "float",
+        "name": "AC import current limit (A)"
+      },
+      {
+        "path": "/Settings/CGwacs/AlwaysPeakShave",
+        "type": "enum",
+        "name": "Mode for peakshaving",
+        "enum": {
+          "0": "Above minimum SOC only",
+          "1": "Always"
+        }
+      },
       {
         "path": "/Settings/CGwacs/MaxChargePercentage",
         "type": "float",
@@ -6938,9 +6957,25 @@
     "help": "<p>With this node several settings can be adjusted. Currently the focus is mainly on the Carlo Gavazzi Wired AC Sensors (cgwacs).</p>",
     "settings": [
       {
-        "path": "/Settings/CGwacs/AcPowerSetPoint",
+        "path": "/Settings/CGwacs/AcExportLimit",
+        "type": "float",
+        "name": "AC export current limit (A)",
+        "writable": true
+      },
+      {
+        "path": "/Settings/CGwacs/AcImportLimit",
         "type": "float",
-        "name": "ESS control loop setpoint (W)",
+        "name": "AC import current limit (A)",
+        "writable": true
+      },
+      {
+        "path": "/Settings/CGwacs/AlwaysPeakShave",
+        "type": "enum",
+        "name": "Mode for peakshaving",
+        "enum": {
+          "0": "Above minimum SOC only",
+          "1": "Always"
+        },
         "writable": true
       },
       {