diff --git a/source/_integrations/swiss_public_transport.markdown b/source/_integrations/swiss_public_transport.markdown
index 50ec1f6787b..e48455327f4 100644
--- a/source/_integrations/swiss_public_transport.markdown
+++ b/source/_integrations/swiss_public_transport.markdown
@@ -25,6 +25,48 @@ The [Stationboard](https://transport.opendata.ch/examples/stationboard.html) web
 
 The public timetables are coming from [Swiss public transport](https://transport.opendata.ch/).
 
+## Set up a connection
+
+The minimum configuration for a connection requires a _start_ and _end_ station (for example, "Zürich HB").
+
+Optionally, you can provide up to 5 additional _via_ stations.
+
+![Config flow](/images/integrations/swiss_public_transport/config_flow.png)
+
+### Time mode
+
+The _Time mode_ allows you to specify the time of the connections.
+
+- Now (default): Provide the next connections.
+- At a fixed time of day: Provide the connections that depart at a fixed time of day (for example, 18:15 in the evening)
+- At an offset from now: Provide the next possible connections which depart after a specified offset (for example, 15 minutes from now, which helps account for a 15-minute walk to the station)
+
+![Time mode option](/images/integrations/swiss_public_transport/config_flow_time_mode.png)
+
+#### Use case: Next connection at my local bus stop
+
+Usually, it takes some time to walk to the closest bus station from home, which can be modeled using the `offset` option in the _Time mode_ dropdown, filtering out connections which are not reachable anymore. This information can then be displayed at the door or on your mobile device.
+
+![Offset time mode option](/images/integrations/swiss_public_transport/config_flow_time_offset.png)
+
+#### Use case: Daily train home
+
+For people working business hours, a set-up using the `fixed` option in the _Time mode_ allows you to identify the same train each day for commuting home. Set up an automation to send a push notification to get informed early.
+
+![Fixed time mode option](/images/integrations/swiss_public_transport/config_flow_time_fixed.png)
+
+### Departure versus Arrival
+
+Usually, one wants to know when a connection **departs** (default), but in case where the opposite is needed and one wants to know when a connection **arrives**, select "Show arrival time at end station" in the time reference dropdown.
+
+When configured for arrival time, the sensor will display the arrival time at the destination instead of the departure time from the start station. This is particularly useful for automations that need to trigger based on arrival times.
+
+![Departure versus arrival option](/images/integrations/swiss_public_transport/config_flow_departure_arrival.png)
+
+#### Use case: Inform family of train arriving late
+
+A popular use case would be to know if your family member is running late and sending out a push notification or displaying their arrival time at home.
+
 ## Actions
 
 The Swiss public transport integration has the following action:
diff --git a/source/images/integrations/swiss_public_transport/config_flow.png b/source/images/integrations/swiss_public_transport/config_flow.png
new file mode 100644
index 00000000000..dd4efa53309
Binary files /dev/null and b/source/images/integrations/swiss_public_transport/config_flow.png differ
diff --git a/source/images/integrations/swiss_public_transport/config_flow_departure_arrival.png b/source/images/integrations/swiss_public_transport/config_flow_departure_arrival.png
new file mode 100644
index 00000000000..adb66a75dd9
Binary files /dev/null and b/source/images/integrations/swiss_public_transport/config_flow_departure_arrival.png differ
diff --git a/source/images/integrations/swiss_public_transport/config_flow_time_fixed.png b/source/images/integrations/swiss_public_transport/config_flow_time_fixed.png
new file mode 100644
index 00000000000..0ba92022851
Binary files /dev/null and b/source/images/integrations/swiss_public_transport/config_flow_time_fixed.png differ
diff --git a/source/images/integrations/swiss_public_transport/config_flow_time_mode.png b/source/images/integrations/swiss_public_transport/config_flow_time_mode.png
new file mode 100644
index 00000000000..f5368d1054b
Binary files /dev/null and b/source/images/integrations/swiss_public_transport/config_flow_time_mode.png differ
diff --git a/source/images/integrations/swiss_public_transport/config_flow_time_offset.png b/source/images/integrations/swiss_public_transport/config_flow_time_offset.png
new file mode 100644
index 00000000000..749471c12cd
Binary files /dev/null and b/source/images/integrations/swiss_public_transport/config_flow_time_offset.png differ