diff --git a/virtcontainers/pkg/hyperstart/hyperstart.go b/virtcontainers/pkg/hyperstart/hyperstart.go
index 36474566e..44548bd4c 100644
--- a/virtcontainers/pkg/hyperstart/hyperstart.go
+++ b/virtcontainers/pkg/hyperstart/hyperstart.go
@@ -124,7 +124,10 @@ var hyperLog = logrus.FieldLogger(logrus.New())
 
 // SetLogger sets the logger for hyperstart package.
 func SetLogger(logger logrus.FieldLogger) {
-	hyperLog = logger.WithField("source", "virtcontainers/hyperstart")
+	hyperLog = logger.WithFields(logrus.Fields{
+		"source":    "virtcontainers",
+		"subsystem": "hyperstart",
+	})
 }
 
 // NewHyperstart returns a new hyperstart structure.
diff --git a/virtcontainers/pkg/oci/utils.go b/virtcontainers/pkg/oci/utils.go
index 680354b1d..0fb67ad5d 100644
--- a/virtcontainers/pkg/oci/utils.go
+++ b/virtcontainers/pkg/oci/utils.go
@@ -132,7 +132,10 @@ var ociLog = logrus.FieldLogger(logrus.New())
 
 // SetLogger sets the logger for oci package.
 func SetLogger(logger logrus.FieldLogger) {
-	ociLog = logger.WithField("source", "virtcontainers/oci")
+	ociLog = logger.WithFields(logrus.Fields{
+		"source":    "virtcontainers",
+		"subsystem": "oci",
+	})
 }
 
 func cmdEnvs(spec CompatOCISpec, envs []vc.EnvVar) []vc.EnvVar {