blue/green deployment and #6 fix