DEPLOY CHECK V234 - ARCHITECTURE FIX