Adapt to new deployment layout