Synchronize infrastructure

Synchronize infrastructure