diff --git a/custom_components/JackeryHome/sensor.py b/custom_components/JackeryHome/sensor.py
index 8d27c7e..0063f1c 100644
--- a/custom_components/JackeryHome/sensor.py
+++ b/custom_components/JackeryHome/sensor.py
@@ -29,8 +29,8 @@ METER_SN_MAP = {
     "battery_soc": "21548033",
     "solar_energy": "16961537",
     "home_energy": "16962561",
-    "grid_import_energy": "16969729",
-    "grid_export_energy": "16970753",
+    "grid_import_energy": "16962561",
+    "grid_export_energy": "16968705",
     "battery_charge_energy": "16964609",
     "battery_discharge_energy": "16965633",
     "solar_power": "16932865",
diff --git a/energy_flow_card_config.yaml b/energy_flow_card_config.yaml
index d6b5e84..f5a22e1 100644
--- a/energy_flow_card_config.yaml
+++ b/energy_flow_card_config.yaml
@@ -10,14 +10,11 @@ entities:
     entity: sensor.solar_power
   battery:
     entity:
-      consumption: sensor.battery_discharge
-      production: sensor.battery_charge
+      consumption: sensor.battery_charge
+      production: sensor.battery_discharge
     state_of_charge: sensor.battery_state_of_charge
     display_state: two_way
     color_circle: true
-   
   home:
     color_icon: true
-  
-
 watt_threshold: 10000