Revert 83fb88e..35ca528

This rolls back to commit 83fb88e2d16da6bd383c1828c46694167f872233.
[FIX] new gateway image