diff --git a/docs/tech_stack.md b/docs/tech_stack.md
index fbec0cd049..7dfecea046 100644
--- a/docs/tech_stack.md
+++ b/docs/tech_stack.md
@@ -13,14 +13,16 @@ technology stack for compliant IoT devices.
 * JSON encoding following the core schema definition, specifying the semantic structure of the data.
 * Passes the [DAQ Validation Tool](validator.md) for all requirements.
 
-# MQTT Topic Table
-
-| Type     | Category | subFolder |                MQTT Topic              |  Schema File  |
-|----------|----------|-----------|----------------------------------------|---------------|
-| state    | state    | _n/a_     | `/devices/{device_id}/state`           | state.json    |
-| config   | config   | _n/a_     | `/devices/{device_id}/config`          | config.json   |
-| pointset | event    | pointset  | `/devices/{device_id}/events/pointset` | pointset.json |
-| system   | event    | system    | `/devices/{device_id}/events/system`   | system.json   |
+# MQTT Topic Suffix Table
+
+| Type     | Category | subFolder | MQTT Topic Suffix                | Schema File   |
+| -------- | -------- | --------- | -------------------------------- | ------------- |
+| state    | state    | _n/a_     | `{topic_prefix}/state`           | state.json    |
+| config   | config   | _n/a_     | `{topic_prefix}/config`          | config.json   |
+| pointset | event    | pointset  | `{topic_prefix}/events/pointset` | pointset.json |
+| system   | event    | system    | `{topic_prefix}/events/system`   | system.json   |
+
+For GCP implementations the full topic would be `/devices/{device_id}/{suffix}`
 
 # Backend Systems