joachimmetz Applied updates and changes for deployment