These were the last two combinations missing, just add them to let the user have full control over the build ouput. Closes: #756975