diff --git a/cmd/goldpinger/main.go b/cmd/goldpinger/main.go
index b0919f5..df8fc7d 100644
--- a/cmd/goldpinger/main.go
+++ b/cmd/goldpinger/main.go
@@ -16,6 +16,7 @@ package main
 
 import (
 	"os"
+	"strconv"
 
 	"github.com/go-openapi/loads"
 	"go.uber.org/zap"
@@ -35,7 +36,16 @@ var (
 )
 
 func getLogger() *zap.Logger {
-	logger, err := zap.NewProduction()
+	var logger *zap.Logger
+	var err error
+
+	// We haven't parsed flags at this stage and that might be error prone
+	// so just use an envvar
+	if debug, err := strconv.ParseBool(os.Getenv("DEBUG")); err == nil && debug {
+		logger, err = zap.NewDevelopment()
+	} else {
+		logger, err = zap.NewProduction()
+	}
 	if err != nil {
 		panic(err)
 	}