diff --git a/pkg/types/tool.go b/pkg/types/tool.go
index bb49e6f1..7e08f604 100644
--- a/pkg/types/tool.go
+++ b/pkg/types/tool.go
@@ -752,6 +752,16 @@ func (t Tool) GetCredentialTools(prg Program, agentGroup []ToolReference) ([]Too
 		result.AddAll(referencedTool.GetToolRefsFromNames(referencedTool.ExportCredentials))
 	}
 
+	contextToolRefs, err := t.getDirectContextToolRefs(prg)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, contextToolRef := range contextToolRefs {
+		contextTool := prg.ToolSet[contextToolRef.ToolID]
+		result.AddAll(contextTool.GetToolRefsFromNames(contextTool.ExportCredentials))
+	}
+
 	return result.List()
 }