More logic in upload target as per nix