diff --git a/Dockerfile b/Dockerfile
index c77d98a4..9d5655f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,4 +21,4 @@ ADD .build/linux-amd64/dellhw_exporter /bin/dellhw_exporter
 
 ENTRYPOINT ["/bin/dellhw_exporter"]
 
-#CMD srvadmin-services.sh restart && tail -f /opt/dell/srvadmin/var/log/openmanage/dcsys64.xml
+CMD ["-container"]
diff --git a/cmd/dellhw_exporter/dellhw_exporter.go b/cmd/dellhw_exporter/dellhw_exporter.go
index c36b0c6c..0c33031b 100644
--- a/cmd/dellhw_exporter/dellhw_exporter.go
+++ b/cmd/dellhw_exporter/dellhw_exporter.go
@@ -191,7 +191,7 @@ func main() {
 	log.Infoln("Build context", version.BuildContext())
 
 	if opts.container {
-		log.Infoln("Starting srvadmin-services")
+		log.Infoln("Starting srvadmin-services ...")
 		cmd := exec.Command("/opt/dell/srvadmin/sbin/srvadmin-services.sh", "start")
 		if err := cmd.Start(); err != nil {
 			log.Fatal(err)
@@ -204,6 +204,7 @@ func main() {
 			log.Fatal(err)
 		}
 		timer.Stop()
+		log.Infoln("Started srvadmin-services.")
 	}
 
 	omrOpts := &omreport.Options{
@@ -242,8 +243,8 @@ func main() {
 			</body>
 			</html>`))
 	})
-	err = http.ListenAndServe(opts.metricsAddr, nil)
-	if err != nil {
+
+	if err := http.ListenAndServe(opts.metricsAddr, nil); err != nil {
 		log.Fatal(err)
 	}
 }