Merge "Fix docker compose file"