diff --git a/.homeycompose/flow/triggers/charging_state_false.json b/.homeycompose/flow/triggers/charging_state_false.json
new file mode 100644
index 0000000..0c82113
--- /dev/null
+++ b/.homeycompose/flow/triggers/charging_state_false.json
@@ -0,0 +1,21 @@
+{
+  "title": {
+    "en": "Charging was stopped",
+    "nl": "Opladen werd gestopt"
+  },
+  "hint": {
+    "en": "This flowcard triggers when the charging was stopped.",
+    "nl": "Deze kaart wordt geactiveerd wanneer het opladen gestopt werd."
+  },
+  "platforms": [
+    "local",
+    "cloud"
+  ],
+  "args": [
+    {
+      "type": "device",
+      "name": "device",
+      "filter": "driver_id=tracker&capabilities=charging_state"
+    }
+  ]
+}
diff --git a/.homeycompose/flow/triggers/charging_state_true.json b/.homeycompose/flow/triggers/charging_state_true.json
new file mode 100644
index 0000000..1c7f60c
--- /dev/null
+++ b/.homeycompose/flow/triggers/charging_state_true.json
@@ -0,0 +1,21 @@
+{
+  "title": {
+    "en": "Charging was started",
+    "nl": "Opladen werd gestart"
+  },
+  "hint": {
+    "en": "This flowcard triggers when the charging was started.",
+    "nl": "Deze kaart wordt geactiveerd wanneer het opladen gestart werd."
+  },
+  "platforms": [
+    "local",
+    "cloud"
+  ],
+  "args": [
+    {
+      "type": "device",
+      "name": "device",
+      "filter": "driver_id=tracker&capabilities=charging_state"
+    }
+  ]
+}
diff --git a/app.json b/app.json
index 90ed37b..93fbf95 100644
--- a/app.json
+++ b/app.json
@@ -232,6 +232,50 @@
         ],
         "id": "buzzer_control_true"
       },
+      {
+        "title": {
+          "en": "Charging was stopped",
+          "nl": "Opladen werd gestopt"
+        },
+        "hint": {
+          "en": "This flowcard triggers when the charging was stopped.",
+          "nl": "Deze kaart wordt geactiveerd wanneer het opladen gestopt werd."
+        },
+        "platforms": [
+          "local",
+          "cloud"
+        ],
+        "args": [
+          {
+            "type": "device",
+            "name": "device",
+            "filter": "driver_id=tracker&capabilities=charging_state"
+          }
+        ],
+        "id": "charging_state_false"
+      },
+      {
+        "title": {
+          "en": "Charging was started",
+          "nl": "Opladen werd gestart"
+        },
+        "hint": {
+          "en": "This flowcard triggers when the charging was started.",
+          "nl": "Deze kaart wordt geactiveerd wanneer het opladen gestart werd."
+        },
+        "platforms": [
+          "local",
+          "cloud"
+        ],
+        "args": [
+          {
+            "type": "device",
+            "name": "device",
+            "filter": "driver_id=tracker&capabilities=charging_state"
+          }
+        ],
+        "id": "charging_state_true"
+      },
       {
         "title": {
           "en": "Virtual fence changed",