Containerization PSD

- Sida 18