diff --git a/config/default/overlays/dev/manager_image_patch.yaml b/config/default/overlays/dev/manager_image_patch.yaml
index 6870e701b..27b8c6843 100644
--- a/config/default/overlays/dev/manager_image_patch.yaml
+++ b/config/default/overlays/dev/manager_image_patch.yaml
@@ -17,3 +17,4 @@ spec:
       - image: ((operator_docker_image))
         name: operator
         imagePullPolicy: Always
+        args: ["--zap-devel"]
diff --git a/config/default/overlays/kind/manager_image_patch.yaml b/config/default/overlays/kind/manager_image_patch.yaml
index 1ec424e83..da59a39ff 100644
--- a/config/default/overlays/kind/manager_image_patch.yaml
+++ b/config/default/overlays/kind/manager_image_patch.yaml
@@ -17,3 +17,4 @@ spec:
       - image: ((operator_docker_image))
         name: operator
         imagePullPolicy: IfNotPresent
+        args: ["--zap-devel"]
diff --git a/main.go b/main.go
index e79815c6c..b583c1607 100644
--- a/main.go
+++ b/main.go
@@ -45,9 +45,13 @@ func init() {
 func main() {
 	var metricsAddr string
 	flag.StringVar(&metricsAddr, "metrics-addr", ":12345", "The address the metric endpoint binds to.")
+
+	opts := zap.Options{}
+	opts.BindFlags(flag.CommandLine)
+
 	flag.Parse()
 
-	ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
 	operatorNamespace := os.Getenv("OPERATOR_NAMESPACE")
 	if operatorNamespace == "" {