Append '-checkout' to environment when relevant