Merge deploy targets

Create both build type directories, taking advantage of the fact that we know
one will be empty.