From f691d6c8491d200e8231d451ae76d1bc439a1313 Mon Sep 17 00:00:00 2001
From: Orne Brocaar <info@brocaar.com>
Date: Sat, 26 Aug 2023 16:37:04 +0100
Subject: [PATCH] Add MQTT topic config to Basics Station config.

---
 .../chirpstack-gateway-bridge-basicstation-as923.toml        | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-as923_2.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-as923_3.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-as923_4.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-au915_0.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-au915_1.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-au915_2.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-au915_3.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-au915_4.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-au915_5.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-au915_6.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-au915_7.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_0.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_1.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_10.toml     | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_11.toml     | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_2.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_3.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_4.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_5.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_6.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_7.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_8.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-cn470_9.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-eu433.toml        | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-eu868.toml        | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-in865.toml        | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-kr920.toml        | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-ru864.toml        | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-us915_0.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-us915_1.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-us915_2.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-us915_3.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-us915_4.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-us915_5.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-us915_6.toml      | 5 +++++
 .../chirpstack-gateway-bridge-basicstation-us915_7.toml      | 5 +++++
 37 files changed, 185 insertions(+)

diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923.toml
index e38c6e5..0fd289c 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="as923/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="as923/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="as923/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_2.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_2.toml
index 934cd4a..a836654 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_2.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_2.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="as923_2/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="as923_2/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="as923_2/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_3.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_3.toml
index 2537933..425805f 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_3.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_3.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="as923_3/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="as923_3/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="as923_3/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_4.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_4.toml
index 0ecca5c..e7344d5 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_4.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-as923_4.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="as923_4/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="as923_4/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="as923_4/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_0.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_0.toml
index c44a5e6..74c89a2 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_0.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_0.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="au915_0/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="au915_0/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="au915_0/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_1.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_1.toml
index 9bb3754..59dc4eb 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_1.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_1.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="au915_1/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="au915_1/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="au915_1/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_2.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_2.toml
index b2b657b..f85338a 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_2.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_2.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="au915_2/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="au915_2/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="au915_2/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_3.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_3.toml
index a2471bb..298f3f3 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_3.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_3.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="au915_3/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="au915_3/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="au915_3/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_4.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_4.toml
index fc571c1..7023b61 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_4.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_4.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="au915_4/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="au915_4/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="au915_4/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_5.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_5.toml
index af19f45..dda2580 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_5.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_5.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="au915_5/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="au915_5/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="au915_5/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_6.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_6.toml
index 1cca444..af6476c 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_6.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_6.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="au915_6/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="au915_6/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="au915_6/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_7.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_7.toml
index bf8dc00..df44ef1 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_7.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-au915_7.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="au915_7/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="au915_7/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="au915_7/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_0.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_0.toml
index 08067db..b155fe2 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_0.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_0.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_0/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_0/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_0/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_1.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_1.toml
index e417781..540eb3f 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_1.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_1.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_1/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_1/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_1/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_10.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_10.toml
index 7233e35..3156d05 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_10.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_10.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_10/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_10/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_10/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_11.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_11.toml
index 45c7c6d..38083cf 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_11.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_11.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_11/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_11/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_11/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_2.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_2.toml
index 4b7fcee..5729172 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_2.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_2.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_2/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_2/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_2/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_3.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_3.toml
index e0d380b..73433ee 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_3.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_3.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_3/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_3/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_3/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_4.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_4.toml
index 5863ae4..8a121b2 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_4.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_4.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_4/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_4/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_4/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_5.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_5.toml
index f83ef74..efac4a7 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_5.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_5.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_5/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_5/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_5/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_6.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_6.toml
index 913691c..799e7a5 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_6.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_6.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_6/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_6/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_6/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_7.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_7.toml
index 090cb52..47852f5 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_7.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_7.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_7/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_7/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_7/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_8.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_8.toml
index f0cb5d0..6592f59 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_8.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_8.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_8/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_8/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_8/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_9.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_9.toml
index cc7bf67..0a2e3b6 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_9.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-cn470_9.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="cn470_9/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="cn470_9/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="cn470_9/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu433.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu433.toml
index 051f8ea..f6d055e 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu433.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu433.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="eu433/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="eu433/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="eu433/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu868.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu868.toml
index cb84327..0ea475a 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu868.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-eu868.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="eu868/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="eu868/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="eu868/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-in865.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-in865.toml
index 13d9050..2ae640a 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-in865.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-in865.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="in865/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="in865/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="in865/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-kr920.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-kr920.toml
index 8aa9ee4..ab1e5d1 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-kr920.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-kr920.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="kr920/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="kr920/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="kr920/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-ru864.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-ru864.toml
index 3aab080..803ec32 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-ru864.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-ru864.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="ru864/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="ru864/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="ru864/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_0.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_0.toml
index 8020c61..5cf2483 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_0.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_0.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="us915_0/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="us915_0/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="us915_0/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_1.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_1.toml
index 0f7ca0d..191a23e 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_1.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_1.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="us915_1/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="us915_1/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="us915_1/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_2.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_2.toml
index 7b145e0..08472e9 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_2.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_2.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="us915_2/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="us915_2/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="us915_2/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_3.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_3.toml
index 554d787..4e79486 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_3.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_3.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="us915_3/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="us915_3/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="us915_3/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_4.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_4.toml
index 84ae72a..f8c8857 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_4.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_4.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="us915_4/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="us915_4/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="us915_4/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_5.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_5.toml
index 8f8638a..3795fac 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_5.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_5.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="us915_5/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="us915_5/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="us915_5/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_6.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_6.toml
index 9d00815..24da23f 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_6.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_6.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="us915_6/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="us915_6/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="us915_6/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"
 
diff --git a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_7.toml b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_7.toml
index 20fe5fe..f70fd66 100644
--- a/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_7.toml
+++ b/configuration/chirpstack-gateway-bridge/chirpstack-gateway-bridge-basicstation-us915_7.toml
@@ -6,6 +6,11 @@ servers=["tcp://mosquitto:1883"]
 username=""
 password=""
 
+[integration.mqtt]
+event_topic_template="us915_7/gateway/{{ .GatewayID }}/event/{{ .EventType }}"
+state_topic_template="us915_7/gateway/{{ .GatewayID }}/state/{{ .StateType }}"
+command_topic_template="us915_7/gateway/{{ .GatewayID }}/command/#"
+
 [backend]
 type="basic_station"