Merge "scenario004: containerize services for CI"