diff --git a/cmd/docker-driver/config.go b/cmd/docker-driver/config.go
index dc539ee5af87..6f8ce0eec12c 100644
--- a/cmd/docker-driver/config.go
+++ b/cmd/docker-driver/config.go
@@ -241,7 +241,9 @@ func parseConfig(logCtx logger.Info) (*config, error) {
 	}
 
 	// other labels coming from docker labels or env selected by user labels, labels-regex, env, env-regex config.
-	attrs, err := logCtx.ExtraAttributes(nil)
+	attrs, err := logCtx.ExtraAttributes(func(label string) string {
+                return strings.ReplaceAll(strings.ReplaceAll(label, "-", "_"), ".", "_")
+        })
 	if err != nil {
 		return nil, err
 	}