Move back to single dockerfile