changed detection of cli args and added server image name