diff --git a/build/opt.go b/build/opt.go
index ea63f5ecc..db5caf901 100644
--- a/build/opt.go
+++ b/build/opt.go
@@ -723,10 +723,12 @@ func processGitURL(url string, name string, target *client.SolveOpt, caps map[st
 	if name == "context" {
 		target.FrontendInputs["context"] = *st
 		delete(target.FrontendAttrs, "context")
+		target.FrontendAttrs["input:context"] = url
 	} else {
 		inputName := "git_state_" + name
 		target.FrontendInputs[inputName] = *st
 		target.FrontendAttrs[name] = "input:" + inputName
+		target.FrontendAttrs["input:"+name] = url
 	}
 
 	return nil