diff --git a/playbooks/roles/flag_build_commits/files/flag_commit_build.py b/playbooks/roles/flag_build_commits/files/flag_commit_build.py
index 2508a09..3b6d439 100644
--- a/playbooks/roles/flag_build_commits/files/flag_commit_build.py
+++ b/playbooks/roles/flag_build_commits/files/flag_commit_build.py
@@ -39,14 +39,14 @@ def _koji_hub_link(msg):
 
 
 def _koji_link(msg):
-    instance = msg['msg'].get('instance', 'primary')
+    instance = msg.get('instance', 'primary')
     if instance == 'primary':
         base = "https://koji.fedoraproject.org/koji"
     else:
         raise NotImplementedError("Unhandled instance")
 
     # One last little switch-a-roo for stg
-    if '.stg.' in msg['topic']:
+    if '.stg.' in msg['request'][0]:
         base = "https://koji.stg.fedoraproject.org/koji"
 
     return base + "/taskinfo?taskID=%i" \