diff --git a/config/config_source.go b/config/config_source.go
index c0cffa14a..66acd9763 100644
--- a/config/config_source.go
+++ b/config/config_source.go
@@ -163,7 +163,7 @@ func NewFileOrEnvironmentSource(
 
 func (src *FileOrEnvironmentSource) check(ctx context.Context) {
 	ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
-		return c.Str("config_change_id", uuid.New().String())
+		return c.Str("config-change-id", uuid.New().String())
 	})
 	src.mu.Lock()
 	cfg := src.config
diff --git a/databroker/cache.go b/databroker/cache.go
index fbba1a7aa..52772af22 100644
--- a/databroker/cache.go
+++ b/databroker/cache.go
@@ -106,7 +106,7 @@ func New(ctx context.Context, cfg *config.Config, eventsMgr *events.Manager, opt
 	}
 
 	ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
-		return c.Str("service", "databroker").Str("config_source", "bootstrap")
+		return c.Str("service", "databroker").Str("config-source", "bootstrap")
 	})
 	localGRPCConnection, err := grpc.DialContext(
 		ctx,
diff --git a/internal/autocert/manager.go b/internal/autocert/manager.go
index b4d7e5c75..6e208e690 100644
--- a/internal/autocert/manager.go
+++ b/internal/autocert/manager.go
@@ -219,10 +219,10 @@ func (mgr *Manager) renewConfigCerts(ctx context.Context) error {
 
 	ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
 		if len(renew) > 0 {
-			c = c.Strs("renew_domains", renew)
+			c = c.Strs("renew-domains", renew)
 		}
 		if len(ocsp) > 0 {
-			c = c.Strs("ocsp_refresh", ocsp)
+			c = c.Strs("ocsp-refresh", ocsp)
 		}
 		return c
 	})
diff --git a/internal/controlplane/server.go b/internal/controlplane/server.go
index 96f82654c..382221ce8 100644
--- a/internal/controlplane/server.go
+++ b/internal/controlplane/server.go
@@ -98,7 +98,7 @@ func NewServer(
 	}
 
 	ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
-		return c.Str("server_name", cfg.Options.Services)
+		return c.Str("server-name", cfg.Options.Services)
 	})
 
 	var err error
diff --git a/internal/zero/reconciler/sync.go b/internal/zero/reconciler/sync.go
index bd3dbba14..30999ead7 100644
--- a/internal/zero/reconciler/sync.go
+++ b/internal/zero/reconciler/sync.go
@@ -178,7 +178,7 @@ func (c *service) syncUpdatedBundle(ctx context.Context, key string, cached *Bun
 
 	log.Ctx(ctx).Debug().
 		Str("bundle", key).
-		Strs("record_types", bundleRecordTypes).
+		Strs("record-types", bundleRecordTypes).
 		Str("etag", current.ETag).
 		Str("last-modified", current.LastModified).
 		Interface("metadata", result.Metadata).
@@ -213,9 +213,9 @@ func (c *service) getUpdatedMetadata(ctx context.Context, key string, cached Bun
 
 	log.Ctx(ctx).Debug().
 		Str("bundle", key).
-		Strs("record_types", current.RecordTypes).
+		Strs("record-types", current.RecordTypes).
 		Str("etag", current.ETag).
-		Str("last_modified", current.LastModified).
+		Str("last-modified", current.LastModified).
 		Interface("metadata", result.Metadata).
 		Msg("metadata updated")
 
diff --git a/pkg/grpc/databroker/leaser.go b/pkg/grpc/databroker/leaser.go
index 169b2aa20..939256298 100644
--- a/pkg/grpc/databroker/leaser.go
+++ b/pkg/grpc/databroker/leaser.go
@@ -95,7 +95,7 @@ func (locker *Leaser) runOnce(ctx context.Context, resetBackoff func()) error {
 	if status.Code(err) == codes.AlreadyExists {
 		return nil
 	} else if err != nil {
-		log.Ctx(ctx).Error().Err(err).Str("lease_name", locker.leaseName).Msg("leaser: error acquiring lease")
+		log.Ctx(ctx).Error().Err(err).Str("lease-name", locker.leaseName).Msg("leaser: error acquiring lease")
 		return retryableError{err}
 	}
 	resetBackoff()
diff --git a/pkg/storage/inmemory/backend.go b/pkg/storage/inmemory/backend.go
index 495a247c7..4fc920338 100644
--- a/pkg/storage/inmemory/backend.go
+++ b/pkg/storage/inmemory/backend.go
@@ -222,9 +222,9 @@ func (backend *Backend) Put(ctx context.Context, records []*databroker.Record) (
 		}
 
 		ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
-			return c.Str("db_op", "put").
-				Str("db_id", record.Id).
-				Str("db_type", record.Type)
+			return c.Str("db-op", "put").
+				Str("db-id", record.Id).
+				Str("db-type", record.Type)
 		})
 
 		backend.update(record)