Dockerfile cleanup; add TOS to conf