Demo mohab fixing containers

@ahmedhagii @KhaledHelmy