Containerization PSD

- Sida 20