diff --git a/buildkit/convert.go b/buildkit/convert.go
index c5a9ec8..9dc57c2 100644
--- a/buildkit/convert.go
+++ b/buildkit/convert.go
@@ -106,20 +106,12 @@ func getStartState(buildState llb.State, plan *p.BuildPlan, platform specs.Platf
 }
 
 func getImageEnv(graphOutput *build_llb.BuildGraphOutput, plan *p.BuildPlan) []string {
-	paths := graphOutput.GraphEnv.PathList
+	paths := []string{system.DefaultPathEnvUnix}
+	paths = append(paths, graphOutput.GraphEnv.PathList...)
 	paths = append(paths, plan.Start.Paths...)
-
 	pathString := strings.Join(paths, ":")
 
-	var pathEnv string
-	if pathString == "" {
-		pathEnv = "PATH=" + system.DefaultPathEnvUnix
-	} else {
-		pathEnv = "PATH=" + pathString + ":" + system.DefaultPathEnvUnix
-	}
-
 	envMap := make(map[string]string)
-	envMap["PATH"] = pathEnv
 
 	for k, v := range graphOutput.GraphEnv.EnvVars {
 		envMap[k] = v
@@ -129,6 +121,8 @@ func getImageEnv(graphOutput *build_llb.BuildGraphOutput, plan *p.BuildPlan) []s
 		envMap[k] = v
 	}
 
+	envMap["PATH"] = pathString
+
 	envVars := make([]string, 0, len(envMap))
 	for k, v := range envMap {
 		envVars = append(envVars, fmt.Sprintf("%s=%s", k, v))