diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index 969faf5fd8..ba7ca3d62e 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -416,13 +416,11 @@ func (c *Container) generateInspectContainerConfig(spec *spec.Spec) *define.Insp
 	}
 
 	if len(c.config.Labels) != 0 {
-		ctrConfig.Labels = make(map[string]string)
-		maps.Copy(ctrConfig.Labels, c.config.Labels)
+		ctrConfig.Labels = maps.Clone(c.config.Labels)
 	}
 
 	if len(spec.Annotations) != 0 {
-		ctrConfig.Annotations = make(map[string]string)
-		maps.Copy(ctrConfig.Annotations, spec.Annotations)
+		ctrConfig.Annotations = maps.Clone(spec.Annotations)
 	}
 	ctrConfig.StopSignal = signal.ToDockerFormat(c.config.StopSignal)
 	// TODO: should JSON deep copy this to ensure internal pointers don't
diff --git a/libpod/options.go b/libpod/options.go
index 2f32738ca9..e4693f8c40 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -87,8 +87,7 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption {
 		}
 
 		if config.PullOptions != nil {
-			rt.storageConfig.PullOptions = make(map[string]string)
-			maps.Copy(rt.storageConfig.PullOptions, config.PullOptions)
+			rt.storageConfig.PullOptions = maps.Clone(config.PullOptions)
 		}
 
 		// If any one of runroot, graphroot, graphdrivername,