diff --git a/src/adoption-code/route/adoption-code.ts b/src/adoption-code/route/adoption-code.ts
index 799f3992..74eab76e 100644
--- a/src/adoption-code/route/adoption-code.ts
+++ b/src/adoption-code/route/adoption-code.ts
@@ -21,6 +21,7 @@ const handle = async (ctx: Context): Promise<void> => {
 		nodeVersion: probe.nodeVersion,
 		hardwareDevice: probe.hardwareDevice,
 		status: probe.status,
+		systemTags: probe.tags.filter(({ type }) => type === 'system').map(({ value }) => value),
 		city: probe.location.city,
 		state: probe.location.state,
 		country: probe.location.country,