diff --git a/watchdog/main.go b/watchdog/main.go
index 4f86da24..74445d3f 100644
--- a/watchdog/main.go
+++ b/watchdog/main.go
@@ -60,7 +60,13 @@ func main() {
 	}
 
 	httpMetrics := metrics.NewHttp()
-	log.Printf("Read/write timeout: %s, %s. Port: %d\n", readTimeout, writeTimeout, config.port)
+
+	log.Printf("Timeouts: read: %s, write: %s hard: %s.\n",
+		readTimeout,
+		writeTimeout,
+		config.execTimeout)
+	log.Printf("Listening on port: %d\n", config.port)
+
 	http.HandleFunc("/_/health", makeHealthHandler())
 	http.HandleFunc("/", metrics.InstrumentHandler(makeRequestHandler(&config), httpMetrics))
 
diff --git a/watchdog/metrics/metrics.go b/watchdog/metrics/metrics.go
index efdda8a6..18f48b5e 100644
--- a/watchdog/metrics/metrics.go
+++ b/watchdog/metrics/metrics.go
@@ -39,7 +39,7 @@ func (m *MetricsServer) Register(metricsPort int) {
 
 // Serve http traffic in go routine, non-blocking
 func (m *MetricsServer) Serve(cancel chan bool) {
-	log.Printf("Metrics server. Port: %d\n", m.port)
+	log.Printf("Metrics listening on port: %d\n", m.port)
 
 	go func() {
 		if err := m.s.ListenAndServe(); err != http.ErrServerClosed {