diff --git a/src/core/agent.c b/src/core/agent.c
index 68ebaeb55b0dbb0a626802cf15826168191bde94..fa2a4af97b4a9dc064b87f78c655bd74765ad267 100644
--- a/src/core/agent.c
+++ b/src/core/agent.c
@@ -1226,7 +1226,8 @@ static int wifi_send_sta_report(struct agent *a, const char *vif,
 		return -1;
 
 	//TODO use the cntl ifname and origin address
-	strcpy(ifname, "lo");
+	strcpy(ifname, "br-lan");
+	mempcy(origin, a->cntlr_almac, 6);
 
 	/* Here we get need to send the steering report */
 	ret = send_steer_btm_report(a, origin, ifname,
@@ -3335,14 +3336,8 @@ static void agent_steering_opp_timeout(struct uloop_timeout *t)
 	char ifname[IFNAMESIZE] = { 0 };
 	uint8_t origin[6] = { 0 };
 
-	//TODO here we need to fill the controller
-	//src and interface to which the message needs to be sent
-
-	strcpy(ifname, "lo");
-#if 0 // TODO: needs to be enabled for proper DUT behavior
 	strncpy(ifname, "br-lan");
 	mempcy(origin, a->cntlr_almac, 6);
-#endif
 	send_sta_steer_complete((void *)a, origin, ifname);
 }