We now always rebuild the matrixdotorg/synapse image, then build the matrixdotorg/synapse-workers image on top of it.