diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
index f81fd64b46..c8709ea85c 100644
--- a/pkg/systemd/quadlet/quadlet.go
+++ b/pkg/systemd/quadlet/quadlet.go
@@ -588,7 +588,7 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 
 	podman.add("run")
 
-	podman.addf("--name=%s", containerName)
+	podman.add("--name", containerName)
 
 	podman.add(
 		// We store the container id so we can clean it up in case of failure
@@ -608,31 +608,49 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 	service.Add(ServiceGroup, "Delegate", "yes")
 
 	if cgroupsMode, ok := container.Lookup(ContainerGroup, KeyCgroupsMode); ok && len(cgroupsMode) > 0 {
-		podman.addf("--cgroups=%s", cgroupsMode)
+		podman.add("--cgroups", cgroupsMode)
 	} else {
 		podman.add("--cgroups=split")
 	}
 
-	timezone, ok := container.Lookup(ContainerGroup, KeyTimezone)
-	if ok && len(timezone) > 0 {
-		podman.addf("--tz=%s", timezone)
+	stringKeys := map[string]string{
+		KeyTimezone:    "--tz",
+		KeyPidsLimit:   "--pids-limit",
+		KeyShmSize:     "--shm-size",
+		KeyEntrypoint:  "--entrypoint",
+		KeyWorkingDir:  "--workdir",
+		KeyIP:          "--ip",
+		KeyIP6:         "--ip6",
+		KeyHostName:    "--hostname",
+		KeyStopSignal:  "--stop-signal",
+		KeyStopTimeout: "--stop-timeout",
+		KeyPull:        "--pull",
+	}
+	lookupAndAddString(container, ContainerGroup, stringKeys, podman)
+
+	allStringsKeys := map[string]string{
+		KeyNetworkAlias: "--network-alias",
+		KeyUlimit:       "--ulimit",
+		KeyDNS:          "--dns",
+		KeyDNSOption:    "--dns-option",
+		KeyDNSSearch:    "--dns-search",
+		KeyGroupAdd:     "--group-add",
+		KeyAddHost:      "--add-host",
+		KeyTmpfs:        "--tmpfs",
+	}
+	lookupAndAddAllStrings(container, ContainerGroup, allStringsKeys, podman)
+
+	boolKeys := map[string]string{
+		KeyRunInit:         "--init",
+		KeyEnvironmentHost: "--env-host",
+		KeyReadOnlyTmpfs:   "--read-only-tmpfs",
 	}
+	lookupAndAddBoolean(container, ContainerGroup, boolKeys, podman)
 
 	if err := addNetworks(container, ContainerGroup, service, unitsInfoMap, podman); err != nil {
 		return nil, err
 	}
 
-	networkAliases := container.LookupAll(ContainerGroup, KeyNetworkAlias)
-	for _, networkAlias := range networkAliases {
-		podman.add("--network-alias", networkAlias)
-	}
-
-	// Run with a pid1 init to reap zombies by default (as most apps don't do that)
-	runInit, ok := container.LookupBoolean(ContainerGroup, KeyRunInit)
-	if ok {
-		podman.addBool("--init", runInit)
-	}
-
 	serviceType, ok := service.Lookup(ServiceGroup, "Type")
 	if ok && serviceType != "notify" && serviceType != "oneshot" {
 		return nil, fmt.Errorf("invalid service Type '%s'", serviceType)
@@ -678,11 +696,6 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 		podman.add("--security-opt", "label=nested")
 	}
 
-	pidsLimit, ok := container.Lookup(ContainerGroup, KeyPidsLimit)
-	if ok && len(pidsLimit) > 0 {
-		podman.add("--pids-limit", pidsLimit)
-	}
-
 	securityLabelType, ok := container.Lookup(ContainerGroup, KeySecurityLabelType)
 	if ok && len(securityLabelType) > 0 {
 		podman.add("--security-opt", fmt.Sprintf("label=type:%s", securityLabelType))
@@ -698,12 +711,6 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 		podman.add("--security-opt", fmt.Sprintf("label=level:%s", securityLabelLevel))
 	}
 
-	ulimits := container.LookupAll(ContainerGroup, KeyUlimit)
-	for _, ulimit := range ulimits {
-		podman.add("--ulimit", ulimit)
-	}
-
-	// But allow overrides with AddCapability
 	devices := container.LookupAllStrv(ContainerGroup, KeyAddDevice)
 	for _, device := range devices {
 		if device[0] == '-' {
@@ -713,7 +720,7 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 				continue
 			}
 		}
-		podman.addf("--device=%s", device)
+		podman.add("--device", device)
 	}
 
 	// Default to no higher level privileges or caps
@@ -722,57 +729,29 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 		podman.add("--security-opt", fmt.Sprintf("seccomp=%s", seccompProfile))
 	}
 
-	dns := container.LookupAll(ContainerGroup, KeyDNS)
-	for _, ipAddr := range dns {
-		podman.addf("--dns=%s", ipAddr)
-	}
-
-	dnsOptions := container.LookupAll(ContainerGroup, KeyDNSOption)
-	for _, dnsOption := range dnsOptions {
-		podman.addf("--dns-option=%s", dnsOption)
-	}
-
-	dnsSearches := container.LookupAll(ContainerGroup, KeyDNSSearch)
-	for _, dnsSearch := range dnsSearches {
-		podman.addf("--dns-search=%s", dnsSearch)
-	}
-
 	dropCaps := container.LookupAllStrv(ContainerGroup, KeyDropCapability)
 
 	for _, caps := range dropCaps {
-		podman.addf("--cap-drop=%s", strings.ToLower(caps))
+		podman.add("--cap-drop", strings.ToLower(caps))
 	}
 
 	// But allow overrides with AddCapability
 	addCaps := container.LookupAllStrv(ContainerGroup, KeyAddCapability)
 	for _, caps := range addCaps {
-		podman.addf("--cap-add=%s", strings.ToLower(caps))
-	}
-
-	shmSize, hasShmSize := container.Lookup(ContainerGroup, KeyShmSize)
-	if hasShmSize {
-		podman.addf("--shm-size=%s", shmSize)
-	}
-
-	entrypoint, hasEntrypoint := container.Lookup(ContainerGroup, KeyEntrypoint)
-	if hasEntrypoint {
-		podman.addf("--entrypoint=%s", entrypoint)
+		podman.add("--cap-add", strings.ToLower(caps))
 	}
 
 	sysctl := container.LookupAllStrv(ContainerGroup, KeySysctl)
 	for _, sysctlItem := range sysctl {
-		podman.addf("--sysctl=%s", sysctlItem)
+		podman.add("--sysctl", sysctlItem)
 	}
 
+	// This was not moved to the generic handling since readOnly is used also with volatileTmp
 	readOnly, ok := container.LookupBoolean(ContainerGroup, KeyReadOnly)
 	if ok {
 		podman.addBool("--read-only", readOnly)
 	}
 
-	if readOnlyTmpfs, ok := container.LookupBoolean(ContainerGroup, KeyReadOnlyTmpfs); ok {
-		podman.addBool("--read-only-tmpfs", readOnlyTmpfs)
-	}
-
 	volatileTmp := container.LookupBooleanWithDefault(ContainerGroup, KeyVolatileTmp, false)
 	if volatileTmp && !readOnly {
 		podman.add("--tmpfs", "/tmp:rw,size=512M,mode=1777")
@@ -782,30 +761,10 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 		return nil, err
 	}
 
-	if workdir, exists := container.Lookup(ContainerGroup, KeyWorkingDir); exists {
-		podman.addf("-w=%s", workdir)
-	}
-
 	if err := handleUserMappings(container, ContainerGroup, podman, isUser, true); err != nil {
 		return nil, err
 	}
 
-	groupsAdd := container.LookupAll(ContainerGroup, KeyGroupAdd)
-	for _, groupAdd := range groupsAdd {
-		if len(groupAdd) > 0 {
-			podman.addf("--group-add=%s", groupAdd)
-		}
-	}
-
-	tmpfsValues := container.LookupAll(ContainerGroup, KeyTmpfs)
-	for _, tmpfs := range tmpfsValues {
-		if strings.Count(tmpfs, ":") > 1 {
-			return nil, fmt.Errorf("invalid tmpfs format '%s'", tmpfs)
-		}
-
-		podman.add("--tmpfs", tmpfs)
-	}
-
 	if err := addVolumes(container, service, ContainerGroup, unitsInfoMap, podman); err != nil {
 		return nil, err
 	}
@@ -825,28 +784,13 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 			return nil, fmt.Errorf("invalid port format '%s'", exposedPort)
 		}
 
-		podman.addf("--expose=%s", exposedPort)
+		podman.add("--expose", exposedPort)
 	}
 
 	handlePublishPorts(container, ContainerGroup, podman)
 
 	podman.addEnv(podmanEnv)
 
-	ip, ok := container.Lookup(ContainerGroup, KeyIP)
-	if ok && len(ip) > 0 {
-		podman.add("--ip", ip)
-	}
-
-	ip6, ok := container.Lookup(ContainerGroup, KeyIP6)
-	if ok && len(ip6) > 0 {
-		podman.add("--ip6", ip6)
-	}
-
-	addHosts := container.LookupAll(ContainerGroup, KeyAddHost)
-	for _, addHost := range addHosts {
-		podman.addf("--add-host=%s", addHost)
-	}
-
 	labels := container.LookupAllKeyVal(ContainerGroup, KeyLabel)
 	podman.addLabels(labels)
 
@@ -872,10 +816,6 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 		podman.add("--env-file", filePath)
 	}
 
-	if envHost, ok := container.LookupBoolean(ContainerGroup, KeyEnvironmentHost); ok {
-		podman.addBool("--env-host", envHost)
-	}
-
 	secrets := container.LookupAllArgs(ContainerGroup, KeySecret)
 	for _, secret := range secrets {
 		podman.add("--secret", secret)
@@ -892,27 +832,10 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 
 	handleHealth(container, ContainerGroup, podman)
 
-	if hostname, ok := container.Lookup(ContainerGroup, KeyHostName); ok {
-		podman.add("--hostname", hostname)
-	}
-
-	pull, ok := container.Lookup(ContainerGroup, KeyPull)
-	if ok && len(pull) > 0 {
-		podman.add("--pull", pull)
-	}
-
 	if err := handlePod(container, service, ContainerGroup, unitsInfoMap, podman); err != nil {
 		return nil, err
 	}
 
-	if stopSignal, ok := container.Lookup(ContainerGroup, KeyStopSignal); ok && len(stopSignal) > 0 {
-		podman.add("--stop-signal", stopSignal)
-	}
-
-	if stopTimeout, ok := container.Lookup(ContainerGroup, KeyStopTimeout); ok && len(stopTimeout) > 0 {
-		podman.add("--stop-timeout", stopTimeout)
-	}
-
 	handlePodmanArgs(container, ContainerGroup, podman)
 
 	if len(image) > 0 {
@@ -953,6 +876,10 @@ func ConvertNetwork(network *parser.UnitFile, name string, unitsInfoMap map[stri
 	service := network.Dup()
 	service.Filename = unitInfo.ServiceFileName()
 
+	if network.Path != "" {
+		service.Add(UnitGroup, "SourcePath", network.Path)
+	}
+
 	if err := checkForUnknownKeys(network, NetworkGroup, supportedNetworkKeys); err != nil {
 		return nil, err
 	}
@@ -973,19 +900,23 @@ func ConvertNetwork(network *parser.UnitFile, name string, unitsInfoMap map[stri
 
 	podman.add("network", "create", "--ignore")
 
-	if disableDNS := network.LookupBooleanWithDefault(NetworkGroup, KeyDisableDNS, false); disableDNS {
-		podman.add("--disable-dns")
+	boolKeys := map[string]string{
+		KeyDisableDNS: "--disable-dns",
+		KeyInternal:   "--internal",
+		KeyIPv6:       "--ipv6",
 	}
+	lookupAndAddBoolean(network, NetworkGroup, boolKeys, podman)
 
-	dns := network.LookupAll(NetworkGroup, KeyDNS)
-	for _, ipAddr := range dns {
-		podman.addf("--dns=%s", ipAddr)
+	stringKeys := map[string]string{
+		KeyDriver:     "--driver",
+		KeyIPAMDriver: "--ipam-driver",
 	}
+	lookupAndAddString(network, NetworkGroup, stringKeys, podman)
 
-	driver, ok := network.Lookup(NetworkGroup, KeyDriver)
-	if ok && len(driver) > 0 {
-		podman.addf("--driver=%s", driver)
+	allStringKeys := map[string]string{
+		KeyDNS: "--dns",
 	}
+	lookupAndAddAllStrings(network, NetworkGroup, allStringKeys, podman)
 
 	subnets := network.LookupAll(NetworkGroup, KeySubnet)
 	gateways := network.LookupAll(NetworkGroup, KeyGateway)
@@ -998,30 +929,18 @@ func ConvertNetwork(network *parser.UnitFile, name string, unitsInfoMap map[stri
 			return nil, fmt.Errorf("cannot set more ranges than subnets")
 		}
 		for i := range subnets {
-			podman.addf("--subnet=%s", subnets[i])
+			podman.add("--subnet", subnets[i])
 			if len(gateways) > i {
-				podman.addf("--gateway=%s", gateways[i])
+				podman.add("--gateway", gateways[i])
 			}
 			if len(ipRanges) > i {
-				podman.addf("--ip-range=%s", ipRanges[i])
+				podman.add("--ip-range", ipRanges[i])
 			}
 		}
 	} else if len(ipRanges) > 0 || len(gateways) > 0 {
 		return nil, fmt.Errorf("cannot set gateway or range without subnet")
 	}
 
-	if internal := network.LookupBooleanWithDefault(NetworkGroup, KeyInternal, false); internal {
-		podman.add("--internal")
-	}
-
-	if ipamDriver, ok := network.Lookup(NetworkGroup, KeyIPAMDriver); ok && len(ipamDriver) > 0 {
-		podman.addf("--ipam-driver=%s", ipamDriver)
-	}
-
-	if ipv6 := network.LookupBooleanWithDefault(NetworkGroup, KeyIPv6, false); ipv6 {
-		podman.add("--ipv6")
-	}
-
 	networkOptions := network.LookupAllKeyVal(NetworkGroup, KeyOptions)
 	if len(networkOptions) > 0 {
 		podman.addKeys("--opt", networkOptions)
@@ -1064,6 +983,10 @@ func ConvertVolume(volume *parser.UnitFile, name string, unitsInfoMap map[string
 	service := volume.Dup()
 	service.Filename = unitInfo.ServiceFileName()
 
+	if volume.Path != "" {
+		service.Add(UnitGroup, "SourcePath", volume.Path)
+	}
+
 	if err := checkForUnknownKeys(volume, VolumeGroup, supportedVolumeKeys); err != nil {
 		return nil, err
 	}
@@ -1088,7 +1011,7 @@ func ConvertVolume(volume *parser.UnitFile, name string, unitsInfoMap map[string
 
 	driver, ok := volume.Lookup(VolumeGroup, KeyDriver)
 	if ok {
-		podman.addf("--driver=%s", driver)
+		podman.add("--driver", driver)
 	}
 
 	var opts strings.Builder
@@ -1378,19 +1301,13 @@ func ConvertImage(image *parser.UnitFile, unitsInfoMap map[string]*UnitInfo) (*p
 		KeyOS:            "--os",
 		KeyVariant:       "--variant",
 	}
+	lookupAndAddString(image, ImageGroup, stringKeys, podman)
 
 	boolKeys := map[string]string{
 		KeyAllTags:   "--all-tags",
 		KeyTLSVerify: "--tls-verify",
 	}
-
-	for key, flag := range stringKeys {
-		lookupAndAddString(image, ImageGroup, key, flag, podman)
-	}
-
-	for key, flag := range boolKeys {
-		lookupAndAddBoolean(image, ImageGroup, key, flag, podman)
-	}
+	lookupAndAddBoolean(image, ImageGroup, boolKeys, podman)
 
 	handlePodmanArgs(image, ImageGroup, podman)
 
@@ -1461,56 +1378,32 @@ func ConvertBuild(build *parser.UnitFile, unitsInfoMap map[string]*UnitInfo) (*p
 		KeyTarget:   "--target",
 		KeyVariant:  "--variant",
 	}
+	lookupAndAddString(build, BuildGroup, stringKeys, podman)
 
 	boolKeys := map[string]string{
 		KeyTLSVerify: "--tls-verify",
 		KeyForceRM:   "--force-rm",
 	}
+	lookupAndAddBoolean(build, BuildGroup, boolKeys, podman)
 
-	for key, flag := range stringKeys {
-		lookupAndAddString(build, BuildGroup, key, flag, podman)
-	}
-
-	for key, flag := range boolKeys {
-		lookupAndAddBoolean(build, BuildGroup, key, flag, podman)
+	allStringKeys := map[string]string{
+		KeyDNS:       "--dns",
+		KeyDNSOption: "--dns-option",
+		KeyDNSSearch: "--dns-search",
+		KeyGroupAdd:  "--group-add",
+		KeyImageTag:  "--tag",
 	}
+	lookupAndAddAllStrings(build, BuildGroup, allStringKeys, podman)
 
 	annotations := build.LookupAllKeyVal(BuildGroup, KeyAnnotation)
 	podman.addAnnotations(annotations)
 
-	dns := build.LookupAll(BuildGroup, KeyDNS)
-	for _, ipAddr := range dns {
-		podman.addf("--dns=%s", ipAddr)
-	}
-
-	dnsOptions := build.LookupAll(BuildGroup, KeyDNSOption)
-	for _, dnsOption := range dnsOptions {
-		podman.addf("--dns-option=%s", dnsOption)
-	}
-
-	dnsSearches := build.LookupAll(BuildGroup, KeyDNSSearch)
-	for _, dnsSearch := range dnsSearches {
-		podman.addf("--dns-search=%s", dnsSearch)
-	}
-
 	podmanEnv := build.LookupAllKeyVal(BuildGroup, KeyEnvironment)
 	podman.addEnv(podmanEnv)
 
-	groupsAdd := build.LookupAll(BuildGroup, KeyGroupAdd)
-	for _, groupAdd := range groupsAdd {
-		if len(groupAdd) > 0 {
-			podman.addf("--group-add=%s", groupAdd)
-		}
-	}
-
 	labels := build.LookupAllKeyVal(BuildGroup, KeyLabel)
 	podman.addLabels(labels)
 
-	imageTags := build.LookupAll(BuildGroup, KeyImageTag)
-	for _, imageTag := range imageTags {
-		podman.addf("--tag=%s", imageTag)
-	}
-
 	if err := addNetworks(build, BuildGroup, service, unitsInfoMap, podman); err != nil {
 		return nil, err
 	}
@@ -1540,7 +1433,7 @@ func ConvertBuild(build *parser.UnitFile, unitsInfoMap map[string]*UnitInfo) (*p
 	}
 
 	if len(filePath) > 0 {
-		podman.addf("--file=%s", filePath)
+		podman.add("--file", filePath)
 	}
 
 	handlePodmanArgs(build, BuildGroup, podman)
@@ -1691,47 +1584,27 @@ func ConvertPod(podUnit *parser.UnitFile, name string, unitsInfoMap map[string]*
 		return nil, err
 	}
 
-	networkAliases := podUnit.LookupAll(PodGroup, KeyNetworkAlias)
-	for _, networkAlias := range networkAliases {
-		execStartPre.add("--network-alias", networkAlias)
+	stringsKeys := map[string]string{
+		KeyIP:  "--ip",
+		KeyIP6: "--ip6",
 	}
+	lookupAndAddAllStrings(podUnit, PodGroup, stringsKeys, execStartPre)
 
-	if err := addVolumes(podUnit, service, PodGroup, unitsInfoMap, execStartPre); err != nil {
-		return nil, err
+	allStringsKeys := map[string]string{
+		KeyNetworkAlias: "--network-alias",
+		KeyDNS:          "--dns",
+		KeyDNSOption:    "--dns-option",
+		KeyDNSSearch:    "--dns-search",
+		KeyAddHost:      "--add-host",
 	}
+	lookupAndAddAllStrings(podUnit, PodGroup, allStringsKeys, execStartPre)
 
-	execStartPre.addf("--infra-name=%s-infra", podName)
-	execStartPre.addf("--name=%s", podName)
-
-	dns := podUnit.LookupAll(PodGroup, KeyDNS)
-	for _, ipAddr := range dns {
-		execStartPre.addf("--dns=%s", ipAddr)
-	}
-
-	dnsOptions := podUnit.LookupAll(PodGroup, KeyDNSOption)
-	for _, dnsOption := range dnsOptions {
-		execStartPre.addf("--dns-option=%s", dnsOption)
-	}
-
-	dnsSearches := podUnit.LookupAll(PodGroup, KeyDNSSearch)
-	for _, dnsSearch := range dnsSearches {
-		execStartPre.addf("--dns-search=%s", dnsSearch)
-	}
-
-	ip, ok := podUnit.Lookup(PodGroup, KeyIP)
-	if ok && len(ip) > 0 {
-		execStartPre.addf("--ip=%s", ip)
-	}
-
-	ip6, ok := podUnit.Lookup(PodGroup, KeyIP6)
-	if ok && len(ip6) > 0 {
-		execStartPre.addf("--ip6=%s", ip6)
+	if err := addVolumes(podUnit, service, PodGroup, unitsInfoMap, execStartPre); err != nil {
+		return nil, err
 	}
 
-	addHosts := podUnit.LookupAll(PodGroup, KeyAddHost)
-	for _, addHost := range addHosts {
-		execStartPre.addf("--add-host=%s", addHost)
-	}
+	execStartPre.add("--infra-name", fmt.Sprintf("%s-infra", podName))
+	execStartPre.add("--name", podName)
 
 	handlePodmanArgs(podUnit, PodGroup, execStartPre)
 
@@ -1761,12 +1634,13 @@ func handleUser(unitFile *parser.UnitFile, groupName string, podman *PodmanCmdli
 		return nil
 	}
 
+	var userGroupStr string
 	if !okGroup {
-		podman.add("--user", user)
-		return nil
+		userGroupStr = user
+	} else {
+		userGroupStr = fmt.Sprintf("%s:%s", user, group)
 	}
-
-	podman.addf("--user=%s:%s", user, group)
+	podman.add("--user", userGroupStr)
 
 	return nil
 }
@@ -1782,13 +1656,13 @@ func handleUserMappings(unitFile *parser.UnitFile, groupName string, podman *Pod
 	uidMaps := unitFile.LookupAllStrv(groupName, KeyUIDMap)
 	mappingsDefined = mappingsDefined || len(uidMaps) > 0
 	for _, uidMap := range uidMaps {
-		podman.addf("--uidmap=%s", uidMap)
+		podman.add("--uidmap", uidMap)
 	}
 
 	gidMaps := unitFile.LookupAllStrv(groupName, KeyGIDMap)
 	mappingsDefined = mappingsDefined || len(gidMaps) > 0
 	for _, gidMap := range gidMaps {
-		podman.addf("--gidmap=%s", gidMap)
+		podman.add("--gidmap", gidMap)
 	}
 
 	if subUIDMap, ok := unitFile.Lookup(groupName, KeySubUIDMap); ok && len(subUIDMap) > 0 {
@@ -1829,10 +1703,10 @@ func handleUserRemap(unitFile *parser.UnitFile, groupName string, podman *Podman
 	case "manual":
 		if supportManual {
 			for _, uidMap := range uidMaps {
-				podman.addf("--uidmap=%s", uidMap)
+				podman.add("--uidmap", uidMap)
 			}
 			for _, gidMap := range gidMaps {
-				podman.addf("--gidmap=%s", gidMap)
+				podman.add("--gidmap", gidMap)
 			}
 		} else {
 			return fmt.Errorf("RemapUsers=manual is not supported")
@@ -1850,7 +1724,7 @@ func handleUserRemap(unitFile *parser.UnitFile, groupName string, podman *Podman
 			autoOpts = append(autoOpts, fmt.Sprintf("size=%v", uidSize))
 		}
 
-		podman.add("--userns=" + usernsOpts("auto", autoOpts))
+		podman.add("--userns", usernsOpts("auto", autoOpts))
 	case "keep-id":
 		if !isUser {
 			return fmt.Errorf("RemapUsers=keep-id is unsupported for system units")
@@ -1870,7 +1744,7 @@ func handleUserRemap(unitFile *parser.UnitFile, groupName string, podman *Podman
 			keepidOpts = append(keepidOpts, "gid="+gidMaps[0])
 		}
 
-		podman.add("--userns=" + usernsOpts("keep-id", keepidOpts))
+		podman.add("--userns", usernsOpts("keep-id", keepidOpts))
 
 	default:
 		return fmt.Errorf("unsupported RemapUsers option '%s'", remapUsers)
@@ -1919,7 +1793,7 @@ func addNetworks(quadletUnitFile *parser.UnitFile, groupName string, serviceUnit
 				}
 			}
 
-			podman.addf("--network=%s", network)
+			podman.add("--network", network)
 		}
 	}
 	return nil
@@ -2100,17 +1974,28 @@ func handleSetWorkingDirectory(quadletUnitFile, serviceUnitFile *parser.UnitFile
 	return context, nil
 }
 
-func lookupAndAddString(unit *parser.UnitFile, group, key, flag string, podman *PodmanCmdline) {
-	val, ok := unit.Lookup(group, key)
-	if ok && len(val) > 0 {
-		podman.addf("%s=%s", flag, val)
+func lookupAndAddString(unit *parser.UnitFile, group string, keys map[string]string, podman *PodmanCmdline) {
+	for key, flag := range keys {
+		if val, ok := unit.Lookup(group, key); ok && len(val) > 0 {
+			podman.add(flag, val)
+		}
+	}
+}
+
+func lookupAndAddAllStrings(unit *parser.UnitFile, group string, keys map[string]string, podman *PodmanCmdline) {
+	for key, flag := range keys {
+		values := unit.LookupAll(group, key)
+		for _, val := range values {
+			podman.add(flag, val)
+		}
 	}
 }
 
-func lookupAndAddBoolean(unit *parser.UnitFile, group, key, flag string, podman *PodmanCmdline) {
-	val, ok := unit.LookupBoolean(group, key)
-	if ok {
-		podman.addBool(flag, val)
+func lookupAndAddBoolean(unit *parser.UnitFile, group string, keys map[string]string, podman *PodmanCmdline) {
+	for key, flag := range keys {
+		if val, ok := unit.LookupBoolean(group, key); ok {
+			podman.addBool(flag, val)
+		}
 	}
 }
 
diff --git a/test/e2e/quadlet/annotation.build b/test/e2e/quadlet/annotation.build
index 6f0fd9281a..cae9dc8fc1 100644
--- a/test/e2e/quadlet/annotation.build
+++ b/test/e2e/quadlet/annotation.build
@@ -3,7 +3,7 @@
 ## assert-podman-args "--annotation" "org.foo.Arg1=arg1"
 ## assert-podman-args "--annotation" "org.foo.Arg2=arg 2"
 ## assert-podman-args "--annotation" "org.foo.Arg3=arg3"
-## assert-podman-args --tag=localhost/imagename
+## assert-podman-args "--tag" "localhost/imagename"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/arch-os.image b/test/e2e/quadlet/arch-os.image
index e2ce94297e..36aea9410c 100644
--- a/test/e2e/quadlet/arch-os.image
+++ b/test/e2e/quadlet/arch-os.image
@@ -1,6 +1,6 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --os=windows
-## assert-podman-args --arch=arm64
+## assert-podman-args "--os" "windows"
+## assert-podman-args "--arch" "arm64"
 
 [Image]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/arch.build b/test/e2e/quadlet/arch.build
index 38c597db89..e73e81f241 100644
--- a/test/e2e/quadlet/arch.build
+++ b/test/e2e/quadlet/arch.build
@@ -1,6 +1,6 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args --arch=aarch64
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--arch" "aarch64"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/arch.image b/test/e2e/quadlet/arch.image
index ef657888be..27f0b22580 100644
--- a/test/e2e/quadlet/arch.image
+++ b/test/e2e/quadlet/arch.image
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --arch=aarch64
+## assert-podman-args "--arch" "aarch64"
 
 [Image]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/auth.image b/test/e2e/quadlet/auth.image
index 6c8d3ee393..ad8bf8e62d 100644
--- a/test/e2e/quadlet/auth.image
+++ b/test/e2e/quadlet/auth.image
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --authfile=/etc/certs/auth.json
+## assert-podman-args "--authfile" "/etc/certs/auth.json"
 
 [Image]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/authfile.build b/test/e2e/quadlet/authfile.build
index 42d74118d8..90d184eeb2 100644
--- a/test/e2e/quadlet/authfile.build
+++ b/test/e2e/quadlet/authfile.build
@@ -1,6 +1,6 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args --authfile=/etc/certs/auth.json
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--authfile" "/etc/certs/auth.json"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/basepodman.container b/test/e2e/quadlet/basepodman.container
index 3069b35446..4ffa4430bc 100644
--- a/test/e2e/quadlet/basepodman.container
+++ b/test/e2e/quadlet/basepodman.container
@@ -1,4 +1,4 @@
-## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm --cgroups=split --sdnotify=conmon  -d localhost/imagename
+## assert-podman-final-args run --name systemd-%N --cidfile=%t/%N.cid --replace --rm --cgroups=split --sdnotify=conmon  -d localhost/imagename
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/basic.build b/test/e2e/quadlet/basic.build
index 878d2787c8..b8d5d08c4c 100644
--- a/test/e2e/quadlet/basic.build
+++ b/test/e2e/quadlet/basic.build
@@ -1,5 +1,5 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
+## assert-podman-args "--tag" "localhost/imagename"
 ## assert-key-is "Unit" "After" "network-online.target"
 ## assert-key-is "Unit" "Wants" "network-online.target"
 ## assert-key-is "Unit" "RequiresMountsFor" "%t/containers"
diff --git a/test/e2e/quadlet/basic.container b/test/e2e/quadlet/basic.container
index 3d507c884a..cbceda4e4c 100644
--- a/test/e2e/quadlet/basic.container
+++ b/test/e2e/quadlet/basic.container
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "--name=systemd-%N"
+## assert-podman-args "--name" "systemd-%N"
 ## assert-podman-args "--cidfile=%t/%N.cid"
 ## assert-podman-args "--rm"
 ## assert-podman-args "--replace"
diff --git a/test/e2e/quadlet/basic.pod b/test/e2e/quadlet/basic.pod
index ba507cf9aa..4f9ce35e6e 100644
--- a/test/e2e/quadlet/basic.pod
+++ b/test/e2e/quadlet/basic.pod
@@ -1,7 +1,7 @@
 ## assert-key-is Unit RequiresMountsFor "%t/containers"
 ## assert-key-is Service Type forking
 ## assert-key-is Service SyslogIdentifier "%N"
-## assert-key-is-regex Service ExecStartPre ".*/podman pod create --infra-conmon-pidfile=%t/%N.pid --pod-id-file=%t/%N.pod-id --exit-policy=stop --replace --infra-name=systemd-basic-infra --name=systemd-basic"
+## assert-key-is-regex Service ExecStartPre ".*/podman pod create --infra-conmon-pidfile=%t/%N.pid --pod-id-file=%t/%N.pod-id --exit-policy=stop --replace --infra-name systemd-basic-infra --name systemd-basic"
 ## assert-key-is-regex Service ExecStart ".*/podman pod start --pod-id-file=%t/%N.pod-id"
 ## assert-key-is-regex Service ExecStop ".*/podman pod stop --pod-id-file=%t/%N.pod-id --ignore --time=10"
 ## assert-key-is-regex Service ExecStopPost ".*/podman pod rm --pod-id-file=%t/%N.pod-id --ignore --force"
diff --git a/test/e2e/quadlet/build.quadlet.servicename.volume b/test/e2e/quadlet/build.quadlet.servicename.volume
index c3e6a92084..a253ec0871 100644
--- a/test/e2e/quadlet/build.quadlet.servicename.volume
+++ b/test/e2e/quadlet/build.quadlet.servicename.volume
@@ -1,4 +1,4 @@
-## assert-podman-args --driver=image
+## assert-podman-args --driver image
 ## assert-podman-args --opt image=localhost/imagename
 ## assert-key-is "Unit" "Requires" "basic.service"
 ## assert-key-is "Unit" "After" "basic.service"
diff --git a/test/e2e/quadlet/build.quadlet.volume b/test/e2e/quadlet/build.quadlet.volume
index 177e98981e..b5daa92c0b 100644
--- a/test/e2e/quadlet/build.quadlet.volume
+++ b/test/e2e/quadlet/build.quadlet.volume
@@ -1,4 +1,4 @@
-## assert-podman-args --driver=image
+## assert-podman-args --driver image
 ## assert-podman-args --opt image=localhost/imagename
 ## assert-key-is "Unit" "Requires" "basic-build.service"
 ## assert-key-is "Unit" "After" "basic-build.service"
diff --git a/test/e2e/quadlet/capabilities.container b/test/e2e/quadlet/capabilities.container
index 74c21a869e..92966403fe 100644
--- a/test/e2e/quadlet/capabilities.container
+++ b/test/e2e/quadlet/capabilities.container
@@ -1,7 +1,7 @@
-## !assert-podman-args "--cap-drop=all"
-## assert-podman-args "--cap-add=cap_dac_override"
-## assert-podman-args "--cap-add=cap_audit_write"
-## assert-podman-args "--cap-add=cap_ipc_owner"
+## !assert-podman-args "--cap-drop" "all"
+## assert-podman-args "--cap-add" "cap_dac_override"
+## assert-podman-args "--cap-add" "cap_audit_write"
+## assert-podman-args "--cap-add" "cap_ipc_owner"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/capabilities2.container b/test/e2e/quadlet/capabilities2.container
index b7bda66485..df08df9e9c 100644
--- a/test/e2e/quadlet/capabilities2.container
+++ b/test/e2e/quadlet/capabilities2.container
@@ -1,7 +1,7 @@
-## !assert-podman-args "--cap-drop=all"
-## assert-podman-args "--cap-drop=cap_dac_override"
-## assert-podman-args "--cap-drop=cap_audit_write"
-## assert-podman-args "--cap-drop=cap_ipc_owner"
+## !assert-podman-args "--cap-drop" "all"
+## assert-podman-args "--cap-drop" "cap_dac_override"
+## assert-podman-args "--cap-drop" "cap_audit_write"
+## assert-podman-args "--cap-drop" "cap_ipc_owner"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/certs.image b/test/e2e/quadlet/certs.image
index 397ed9bfdb..daedd419c0 100644
--- a/test/e2e/quadlet/certs.image
+++ b/test/e2e/quadlet/certs.image
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --cert-dir=/etc/certs/auth.json
+## assert-podman-args "--cert-dir" "/etc/certs/auth.json"
 
 [Image]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/cgroups-mode.container b/test/e2e/quadlet/cgroups-mode.container
index 67dfe2a4da..ee33320b5d 100644
--- a/test/e2e/quadlet/cgroups-mode.container
+++ b/test/e2e/quadlet/cgroups-mode.container
@@ -1,4 +1,4 @@
-## assert-podman-args --cgroups=no-conmon
+## assert-podman-args "--cgroups" "no-conmon"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/comment-with-continuation.container b/test/e2e/quadlet/comment-with-continuation.container
index 1ba3a9f6fa..3782fab404 100644
--- a/test/e2e/quadlet/comment-with-continuation.container
+++ b/test/e2e/quadlet/comment-with-continuation.container
@@ -1,6 +1,6 @@
 ## assert-podman-final-args localhost/imagename:latest
 ## assert-podman-args --publish 9091:9091
-## assert-podman-args "--name=greatName"
+## assert-podman-args "--name" "greatName"
 
 [Unit]
 Wants=network-online.target
diff --git a/test/e2e/quadlet/creds.image b/test/e2e/quadlet/creds.image
index 7c1ec6c828..8d031b2758 100644
--- a/test/e2e/quadlet/creds.image
+++ b/test/e2e/quadlet/creds.image
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --creds=myname:mypassword
+## assert-podman-args "--creds" "myname:mypassword"
 
 [Image]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/decrypt.image b/test/e2e/quadlet/decrypt.image
index 40c6bb20c4..4b542794cc 100644
--- a/test/e2e/quadlet/decrypt.image
+++ b/test/e2e/quadlet/decrypt.image
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --decryption-key=/etc/keys/decrypt:passphrase
+## assert-podman-args "--decryption-key" "/etc/keys/decrypt:passphrase"
 
 [Image]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/devices.container b/test/e2e/quadlet/devices.container
index dbf806f50e..560b68f686 100644
--- a/test/e2e/quadlet/devices.container
+++ b/test/e2e/quadlet/devices.container
@@ -1,9 +1,9 @@
-## assert-podman-args --device=/dev/fuse
-## assert-podman-args --device=/dev/loop0:r
-## assert-podman-args --device=/dev/null:/dev/test
-## !assert-podman-args --device=/dev/bogus:r
-## !assert-podman-args --device=/dev/bogus
-## !assert-podman-args --device=/dev/bogus1
+## assert-podman-args --device /dev/fuse
+## assert-podman-args --device /dev/loop0:r
+## assert-podman-args --device /dev/null:/dev/test
+## !assert-podman-args --device /dev/bogus:r
+## !assert-podman-args --device /dev/bogus
+## !assert-podman-args --device /dev/bogus1
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/dns-option.pod b/test/e2e/quadlet/dns-option.pod
index 05ceddcf8c..4bc6a0b06d 100644
--- a/test/e2e/quadlet/dns-option.pod
+++ b/test/e2e/quadlet/dns-option.pod
@@ -1,5 +1,5 @@
-## assert-podman-pre-args "--dns-option=ndots:1"
-## assert-podman-pre-args "--dns-option=color:blue"
+## assert-podman-pre-args "--dns-option" "ndots:1"
+## assert-podman-pre-args "--dns-option" "color:blue"
 
 [Pod]
 DNSOption=ndots:1
diff --git a/test/e2e/quadlet/dns-options.build b/test/e2e/quadlet/dns-options.build
index 5bdfb202df..c6676b180a 100644
--- a/test/e2e/quadlet/dns-options.build
+++ b/test/e2e/quadlet/dns-options.build
@@ -1,7 +1,7 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args "--dns-option=ndots:1"
-## assert-podman-args "--dns-option=color:blue"
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--dns-option" "ndots:1"
+## assert-podman-args "--dns-option" "color:blue"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/dns-options.container b/test/e2e/quadlet/dns-options.container
index 523991252d..85c6df88ca 100644
--- a/test/e2e/quadlet/dns-options.container
+++ b/test/e2e/quadlet/dns-options.container
@@ -1,6 +1,6 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "--dns-option=ndots:1"
-## assert-podman-args "--dns-option=color:blue"
+## assert-podman-args "--dns-option" "ndots:1"
+## assert-podman-args "--dns-option" "color:blue"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/dns-search.build b/test/e2e/quadlet/dns-search.build
index f2340bacd0..a44f670dbd 100644
--- a/test/e2e/quadlet/dns-search.build
+++ b/test/e2e/quadlet/dns-search.build
@@ -1,7 +1,7 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args "--dns-search=foo.com"
-## assert-podman-args "--dns-search=bar.com"
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--dns-search" "foo.com"
+## assert-podman-args "--dns-search" "bar.com"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/dns-search.container b/test/e2e/quadlet/dns-search.container
index dbc26d4a49..a78c227f45 100644
--- a/test/e2e/quadlet/dns-search.container
+++ b/test/e2e/quadlet/dns-search.container
@@ -1,6 +1,6 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "--dns-search=foo.com"
-## assert-podman-args "--dns-search=bar.com"
+## assert-podman-args "--dns-search" "foo.com"
+## assert-podman-args "--dns-search" "bar.com"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/dns-search.pod b/test/e2e/quadlet/dns-search.pod
index fb3aae6521..167c43f479 100644
--- a/test/e2e/quadlet/dns-search.pod
+++ b/test/e2e/quadlet/dns-search.pod
@@ -1,5 +1,5 @@
-## assert-podman-pre-args "--dns-search=foo.com"
-## assert-podman-pre-args "--dns-search=bar.com"
+## assert-podman-pre-args "--dns-search" "foo.com"
+## assert-podman-pre-args "--dns-search" "bar.com"
 
 [Pod]
 DNSSearch=foo.com
diff --git a/test/e2e/quadlet/dns.build b/test/e2e/quadlet/dns.build
index aaf96ce171..069c4ca9e5 100644
--- a/test/e2e/quadlet/dns.build
+++ b/test/e2e/quadlet/dns.build
@@ -1,7 +1,7 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args "--dns=8.7.7.7"
-## assert-podman-args "--dns=8.8.8.8"
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--dns" "8.7.7.7"
+## assert-podman-args "--dns" "8.8.8.8"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/dns.container b/test/e2e/quadlet/dns.container
index 6402b8bf61..4c0710ee7b 100644
--- a/test/e2e/quadlet/dns.container
+++ b/test/e2e/quadlet/dns.container
@@ -1,6 +1,6 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "--dns=8.7.7.7"
-## assert-podman-args "--dns=8.8.8.8"
+## assert-podman-args "--dns" "8.7.7.7"
+## assert-podman-args "--dns" "8.8.8.8"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/dns.network b/test/e2e/quadlet/dns.network
index 77ed678d32..48836dcca7 100644
--- a/test/e2e/quadlet/dns.network
+++ b/test/e2e/quadlet/dns.network
@@ -1,6 +1,6 @@
 ## assert-podman-final-args systemd-dns
-## assert-podman-args "--dns=8.7.7.7"
-## assert-podman-args "--dns=8.8.8.8"
+## assert-podman-args "--dns" "8.7.7.7"
+## assert-podman-args "--dns" "8.8.8.8"
 
 [Network]
 DNS=8.7.7.7
diff --git a/test/e2e/quadlet/dns.pod b/test/e2e/quadlet/dns.pod
index 965dd32a42..be756a7bc0 100644
--- a/test/e2e/quadlet/dns.pod
+++ b/test/e2e/quadlet/dns.pod
@@ -1,5 +1,5 @@
-## assert-podman-pre-args "--dns=8.7.7.7"
-## assert-podman-pre-args "--dns=8.8.8.8"
+## assert-podman-pre-args "--dns" "8.7.7.7"
+## assert-podman-pre-args "--dns" "8.8.8.8"
 
 [Pod]
 DNS=8.7.7.7
diff --git a/test/e2e/quadlet/driver.network b/test/e2e/quadlet/driver.network
index c49a596a8a..9330f0efe1 100644
--- a/test/e2e/quadlet/driver.network
+++ b/test/e2e/quadlet/driver.network
@@ -1,5 +1,5 @@
 ## assert-podman-final-args systemd-driver
-## assert-podman-args "--driver=macvlan"
+## assert-podman-args "--driver" "macvlan"
 
 [Network]
 Driver=macvlan
diff --git a/test/e2e/quadlet/entrypoint.container b/test/e2e/quadlet/entrypoint.container
index 035783500b..d72b1cd4c5 100644
--- a/test/e2e/quadlet/entrypoint.container
+++ b/test/e2e/quadlet/entrypoint.container
@@ -1,6 +1,6 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "--entrypoint=top"
+## assert-podman-args "--entrypoint" "top -b"
 
 [Container]
 Image=localhost/imagename
-Entrypoint=top
+Entrypoint=top -b
diff --git a/test/e2e/quadlet/env.build b/test/e2e/quadlet/env.build
index 55a09b2397..dab2ad150e 100644
--- a/test/e2e/quadlet/env.build
+++ b/test/e2e/quadlet/env.build
@@ -1,10 +1,10 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args --env "FOO1=foo1"
-## assert-podman-args --env "FOO2=foo2 "
-## assert-podman-args --env "FOO3=foo3"
-## assert-podman-args --env "REPLACE=replaced"
-## assert-podman-args --env "FOO4=foo\\nfoo"
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--env" "FOO1=foo1"
+## assert-podman-args "--env" "FOO2=foo2 "
+## assert-podman-args "--env" "FOO3=foo3"
+## assert-podman-args "--env" "REPLACE=replaced"
+## assert-podman-args "--env" "FOO4=foo\\nfoo"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/file-abs.build b/test/e2e/quadlet/file-abs.build
index 89c2877a6a..bc37b57c24 100644
--- a/test/e2e/quadlet/file-abs.build
+++ b/test/e2e/quadlet/file-abs.build
@@ -1,4 +1,4 @@
-## assert-podman-final-args --file=/etc/containers/systemd/Containerfile
+## assert-podman-final-args "--file" "/etc/containers/systemd/Containerfile"
 
 [Build]
 File=/etc/containers/systemd/Containerfile
diff --git a/test/e2e/quadlet/file-https.build b/test/e2e/quadlet/file-https.build
index 9cb2971561..24c5bbb47e 100644
--- a/test/e2e/quadlet/file-https.build
+++ b/test/e2e/quadlet/file-https.build
@@ -1,5 +1,5 @@
-## assert-podman-args --tag=localhost/podman-hello
-## assert-podman-args --file=https://raw.githubusercontent.com/containers/PodmanHello/main/Containerfile
+## assert-podman-args "--tag" "localhost/podman-hello"
+## assert-podman-args "--file" "https://raw.githubusercontent.com/containers/PodmanHello/main/Containerfile"
 
 [Build]
 File=https://raw.githubusercontent.com/containers/PodmanHello/main/Containerfile
diff --git a/test/e2e/quadlet/file-rel.build b/test/e2e/quadlet/file-rel.build
index 3cc60e500e..e867917ab3 100644
--- a/test/e2e/quadlet/file-rel.build
+++ b/test/e2e/quadlet/file-rel.build
@@ -1,5 +1,5 @@
 ## assert-podman-final-args .
-## assert-podman-args-regex "--file=Containerfile"
+## assert-podman-args-regex "--file" "Containerfile"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/force-rm.build b/test/e2e/quadlet/force-rm.build
index 7a17e60f26..7d7bcd71dc 100644
--- a/test/e2e/quadlet/force-rm.build
+++ b/test/e2e/quadlet/force-rm.build
@@ -1,5 +1,5 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
+## assert-podman-args "--tag" "localhost/imagename"
 ## assert-podman-args --force-rm=false
 
 [Build]
diff --git a/test/e2e/quadlet/gateway.network b/test/e2e/quadlet/gateway.network
index e2f349f3d7..10b2c8fccd 100644
--- a/test/e2e/quadlet/gateway.network
+++ b/test/e2e/quadlet/gateway.network
@@ -1,5 +1,5 @@
 ## assert-podman-final-args systemd-gateway
-## assert-podman-args "--subnet=192.168.1.0/24" "--gateway=192.168.1.1"
+## assert-podman-args "--subnet" "192.168.1.0/24" "--gateway" "192.168.1.1"
 
 [Network]
 Subnet=192.168.1.0/24
diff --git a/test/e2e/quadlet/group-add.build b/test/e2e/quadlet/group-add.build
index f2a54a50f1..e9fc680592 100644
--- a/test/e2e/quadlet/group-add.build
+++ b/test/e2e/quadlet/group-add.build
@@ -1,5 +1,5 @@
-## assert-podman-args "--group-add=keep-groups"
-## assert-podman-args "--group-add=users"
+## assert-podman-args "--group-add" "keep-groups"
+## assert-podman-args "--group-add" "users"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/group-add.container b/test/e2e/quadlet/group-add.container
index 99800604cf..be858275b4 100644
--- a/test/e2e/quadlet/group-add.container
+++ b/test/e2e/quadlet/group-add.container
@@ -1,5 +1,5 @@
-## assert-podman-args "--group-add=keep-groups"
-## assert-podman-args "--group-add=users"
+## assert-podman-args "--group-add" "keep-groups"
+## assert-podman-args "--group-add" "users"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/host.container b/test/e2e/quadlet/host.container
index 2b8314f0aa..5d7b30b2af 100644
--- a/test/e2e/quadlet/host.container
+++ b/test/e2e/quadlet/host.container
@@ -1,6 +1,6 @@
 [Container]
 Image=localhost/imagename
-## assert-podman-args "--add-host=my-host-name:192.168.10.10"
+## assert-podman-args "--add-host" "my-host-name:192.168.10.10"
 AddHost=my-host-name:192.168.10.10
-## assert-podman-args "--add-host=my-second-host-name:192.168.10.11"
+## assert-podman-args "--add-host" "my-second-host-name:192.168.10.11"
 AddHost=my-second-host-name:192.168.10.11
diff --git a/test/e2e/quadlet/host.pod b/test/e2e/quadlet/host.pod
index 88dc2b2480..ee43eb4577 100644
--- a/test/e2e/quadlet/host.pod
+++ b/test/e2e/quadlet/host.pod
@@ -1,5 +1,5 @@
 [Pod]
-## assert-podman-pre-args "--add-host=my-host-name:192.168.10.10"
+## assert-podman-pre-args "--add-host" "my-host-name:192.168.10.10"
 AddHost=my-host-name:192.168.10.10
-## assert-podman-pre-args "--add-host=my-second-host-name:192.168.10.11"
+## assert-podman-pre-args "--add-host" "my-second-host-name:192.168.10.11"
 AddHost=my-second-host-name:192.168.10.11
diff --git a/test/e2e/quadlet/idmapping.container b/test/e2e/quadlet/idmapping.container
index 5ea2e38a45..6834853dc4 100644
--- a/test/e2e/quadlet/idmapping.container
+++ b/test/e2e/quadlet/idmapping.container
@@ -1,7 +1,7 @@
-## assert-podman-args "--uidmap=0:10000:10"
-## assert-podman-args "--uidmap=10:20000:10"
-## assert-podman-args "--gidmap=0:10000:10"
-## assert-podman-args "--gidmap=10:20000:10"
+## assert-podman-args "--uidmap" "0:10000:10"
+## assert-podman-args "--uidmap" "10:20000:10"
+## assert-podman-args "--gidmap" "0:10000:10"
+## assert-podman-args "--gidmap" "10:20000:10"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/image.quadlet.servicename.volume b/test/e2e/quadlet/image.quadlet.servicename.volume
index 43d4a8f786..e7b4d21127 100644
--- a/test/e2e/quadlet/image.quadlet.servicename.volume
+++ b/test/e2e/quadlet/image.quadlet.servicename.volume
@@ -1,4 +1,4 @@
-## assert-podman-args --driver=image
+## assert-podman-args --driver image
 ## assert-podman-args --opt image=localhost/imagename
 ## assert-key-is "Unit" "Requires" "basic.service"
 ## assert-key-is "Unit" "After" "basic.service"
diff --git a/test/e2e/quadlet/image.quadlet.volume b/test/e2e/quadlet/image.quadlet.volume
index 8a64b00768..5cd4922cae 100644
--- a/test/e2e/quadlet/image.quadlet.volume
+++ b/test/e2e/quadlet/image.quadlet.volume
@@ -1,4 +1,4 @@
-## assert-podman-args --driver=image
+## assert-podman-args --driver image
 ## assert-podman-args --opt image=localhost/imagename
 ## assert-key-is "Unit" "Requires" "basic-image.service"
 ## assert-key-is "Unit" "After" "basic-image.service"
diff --git a/test/e2e/quadlet/image.volume b/test/e2e/quadlet/image.volume
index 2c22403b71..a55c56031c 100644
--- a/test/e2e/quadlet/image.volume
+++ b/test/e2e/quadlet/image.volume
@@ -1,4 +1,4 @@
-## assert-podman-args --driver=image
+## assert-podman-args --driver image
 ## assert-podman-args --opt image=localhost/imagename
 
 [Volume]
diff --git a/test/e2e/quadlet/ip.pod b/test/e2e/quadlet/ip.pod
index 8df5ed2c55..89406cc38d 100644
--- a/test/e2e/quadlet/ip.pod
+++ b/test/e2e/quadlet/ip.pod
@@ -1,5 +1,5 @@
-## assert-podman-pre-args "--ip=10.88.64.128"
-## assert-podman-pre-args "--ip6=fd46:db93:aa76:ac37::10"
+## assert-podman-pre-args "--ip" "10.88.64.128"
+## assert-podman-pre-args "--ip6" "fd46:db93:aa76:ac37::10"
 
 [Pod]
 IP=10.88.64.128
diff --git a/test/e2e/quadlet/ipam-driver.network b/test/e2e/quadlet/ipam-driver.network
index 03fc842034..c1ce2443ec 100644
--- a/test/e2e/quadlet/ipam-driver.network
+++ b/test/e2e/quadlet/ipam-driver.network
@@ -1,5 +1,5 @@
 ## assert-podman-final-args systemd-ipam-driver
-## assert-podman-args "--ipam-driver=dhcp"
+## assert-podman-args "--ipam-driver" "dhcp"
 
 [Network]
 IPAMDriver=dhcp
diff --git a/test/e2e/quadlet/label.build b/test/e2e/quadlet/label.build
index 688c2b2455..fd21525b09 100644
--- a/test/e2e/quadlet/label.build
+++ b/test/e2e/quadlet/label.build
@@ -1,5 +1,5 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
+## assert-podman-args "--tag" "localhost/imagename"
 ## assert-podman-args "--label" "org.foo.Arg0=arg0"
 ## assert-podman-args "--label" "org.foo.Arg1=arg1"
 ## assert-podman-args "--label" "org.foo.Arg2=arg 2"
diff --git a/test/e2e/quadlet/multiple-tags.build b/test/e2e/quadlet/multiple-tags.build
index 19eacca872..609f3b8fd2 100644
--- a/test/e2e/quadlet/multiple-tags.build
+++ b/test/e2e/quadlet/multiple-tags.build
@@ -1,5 +1,5 @@
-## assert-podman-args --tag=localhost/imagename:v1
-## assert-podman-args --tag=localhost/imagename:latest
+## assert-podman-args "--tag" "localhost/imagename:v1"
+## assert-podman-args "--tag" "localhost/imagename:latest"
 
 [Build]
 ImageTag=localhost/imagename:v1
diff --git a/test/e2e/quadlet/name.container b/test/e2e/quadlet/name.container
index 34e077763e..71ec129e2f 100644
--- a/test/e2e/quadlet/name.container
+++ b/test/e2e/quadlet/name.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--name=foobar"
+## assert-podman-args "--name" "foobar"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/name.pod b/test/e2e/quadlet/name.pod
index 40dcd67092..d9a259ed24 100644
--- a/test/e2e/quadlet/name.pod
+++ b/test/e2e/quadlet/name.pod
@@ -1,5 +1,5 @@
-## assert-podman-pre-args "--name=test-pod"
-## assert-podman-pre-args "--infra-name=test-pod-infra"
+## assert-podman-pre-args "--name" "test-pod"
+## assert-podman-pre-args "--infra-name" "test-pod-infra"
 
 [Pod]
 PodName=test-pod
diff --git a/test/e2e/quadlet/network.build b/test/e2e/quadlet/network.build
index cc9fddd26c..bb7b8edff4 100644
--- a/test/e2e/quadlet/network.build
+++ b/test/e2e/quadlet/network.build
@@ -1,6 +1,6 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args "--network=host"
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--network" "host"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/network.container b/test/e2e/quadlet/network.container
index 89179a29ac..a21a6734be 100644
--- a/test/e2e/quadlet/network.container
+++ b/test/e2e/quadlet/network.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=host"
+## assert-podman-args "--network" "host"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/network.kube b/test/e2e/quadlet/network.kube
index 3b64fc419f..7b5493244d 100644
--- a/test/e2e/quadlet/network.kube
+++ b/test/e2e/quadlet/network.kube
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=basic"
+## assert-podman-args --network basic
 
 [Kube]
 Yaml=deployment.yml
diff --git a/test/e2e/quadlet/network.pod b/test/e2e/quadlet/network.pod
index 596453f898..5b8e358d1e 100644
--- a/test/e2e/quadlet/network.pod
+++ b/test/e2e/quadlet/network.pod
@@ -1,4 +1,4 @@
-## assert-podman-pre-args "--network=host"
+## assert-podman-pre-args --network host
 ## assert-podman-pre-args --publish 127.0.0.1:80:90
 
 [Pod]
diff --git a/test/e2e/quadlet/network.quadlet.build b/test/e2e/quadlet/network.quadlet.build
index 6423aa090d..eb755dcedd 100644
--- a/test/e2e/quadlet/network.quadlet.build
+++ b/test/e2e/quadlet/network.quadlet.build
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=systemd-basic"
+## assert-podman-args "--network" "systemd-basic"
 ## assert-key-is "Unit" "Requires" "basic-network.service"
 ## assert-key-is "Unit" "After" "network-online.target" "basic-network.service"
 
diff --git a/test/e2e/quadlet/network.quadlet.container b/test/e2e/quadlet/network.quadlet.container
index a37e56cdf0..7811cad10c 100644
--- a/test/e2e/quadlet/network.quadlet.container
+++ b/test/e2e/quadlet/network.quadlet.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=systemd-basic"
+## assert-podman-args "--network" "systemd-basic"
 ## assert-key-is "Unit" "Requires" "basic-network.service"
 ## assert-key-is "Unit" "After" "network-online.target" "basic-network.service"
 
diff --git a/test/e2e/quadlet/network.quadlet.kube b/test/e2e/quadlet/network.quadlet.kube
index a69479bbb9..5a3f367d92 100644
--- a/test/e2e/quadlet/network.quadlet.kube
+++ b/test/e2e/quadlet/network.quadlet.kube
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=systemd-basic"
+## assert-podman-args "--network" "systemd-basic"
 ## assert-key-is "Unit" "Requires" "basic-network.service"
 ## assert-key-is "Unit" "After" "basic-network.service"
 
diff --git a/test/e2e/quadlet/network.quadlet.pod b/test/e2e/quadlet/network.quadlet.pod
index 4c2b0bf7d6..f08079de2b 100644
--- a/test/e2e/quadlet/network.quadlet.pod
+++ b/test/e2e/quadlet/network.quadlet.pod
@@ -1,4 +1,4 @@
-## assert-podman-pre-args "--network=systemd-basic"
+## assert-podman-pre-args "--network" "systemd-basic"
 ## assert-key-is "Unit" "Requires" "basic-network.service"
 ## assert-key-is "Unit" "After" "basic-network.service"
 
diff --git a/test/e2e/quadlet/network.quadlet.servicename.build b/test/e2e/quadlet/network.quadlet.servicename.build
index 5e458028a4..a06c030ebd 100644
--- a/test/e2e/quadlet/network.quadlet.servicename.build
+++ b/test/e2e/quadlet/network.quadlet.servicename.build
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=test-network"
+## assert-podman-args "--network" "test-network"
 ## assert-key-is "Unit" "Requires" "basic.service"
 ## assert-key-is "Unit" "After" "network-online.target" "basic.service"
 
diff --git a/test/e2e/quadlet/network.quadlet.servicename.container b/test/e2e/quadlet/network.quadlet.servicename.container
index f4d2dc80a6..54c74fd1ea 100644
--- a/test/e2e/quadlet/network.quadlet.servicename.container
+++ b/test/e2e/quadlet/network.quadlet.servicename.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=test-network"
+## assert-podman-args "--network" "test-network"
 ## assert-key-is "Unit" "Requires" "basic.service"
 ## assert-key-is "Unit" "After" "network-online.target" "basic.service"
 
diff --git a/test/e2e/quadlet/network.quadlet.servicename.kube b/test/e2e/quadlet/network.quadlet.servicename.kube
index f72646ab90..16eccc37be 100644
--- a/test/e2e/quadlet/network.quadlet.servicename.kube
+++ b/test/e2e/quadlet/network.quadlet.servicename.kube
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=test-network"
+## assert-podman-args "--network" "test-network"
 ## assert-key-is "Unit" "Requires" "basic.service"
 ## assert-key-is "Unit" "After" "basic.service"
 
diff --git a/test/e2e/quadlet/network.reuse.container b/test/e2e/quadlet/network.reuse.container
index 85fe3b4508..e26546ba44 100644
--- a/test/e2e/quadlet/network.reuse.container
+++ b/test/e2e/quadlet/network.reuse.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=container:systemd-basic"
+## assert-podman-args "--network" "container:systemd-basic"
 ## assert-key-is "Unit" "Requires" "basic.service"
 ## assert-key-is "Unit" "After" "network-online.target" "basic.service"
 
diff --git a/test/e2e/quadlet/network.reuse.name.container b/test/e2e/quadlet/network.reuse.name.container
index 2458cecb5e..49fef56267 100644
--- a/test/e2e/quadlet/network.reuse.name.container
+++ b/test/e2e/quadlet/network.reuse.name.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--network=container:foobar"
+## assert-podman-args "--network" "container:foobar"
 ## assert-key-is "Unit" "Requires" "name.service"
 ## assert-key-is "Unit" "After" "network-online.target" "name.service"
 
diff --git a/test/e2e/quadlet/network.servicename.quadlet.pod b/test/e2e/quadlet/network.servicename.quadlet.pod
index 8f0cf9810c..88d7edfead 100644
--- a/test/e2e/quadlet/network.servicename.quadlet.pod
+++ b/test/e2e/quadlet/network.servicename.quadlet.pod
@@ -1,4 +1,4 @@
-## assert-podman-pre-args "--network=test-network"
+## assert-podman-pre-args "--network" "test-network"
 ## assert-key-is "Unit" "Requires" "basic.service"
 ## assert-key-is "Unit" "After" "basic.service"
 
diff --git a/test/e2e/quadlet/os.image b/test/e2e/quadlet/os.image
index 1a15453106..16f48e1e61 100644
--- a/test/e2e/quadlet/os.image
+++ b/test/e2e/quadlet/os.image
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --os=windows
+## assert-podman-args "--os" "windows"
 
 [Image]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/ports.container b/test/e2e/quadlet/ports.container
index db0612c77b..7293d094e8 100644
--- a/test/e2e/quadlet/ports.container
+++ b/test/e2e/quadlet/ports.container
@@ -1,8 +1,8 @@
 [Container]
 Image=localhost/imagename
-## assert-podman-args --expose=1000
+## assert-podman-args --expose 1000
 ExposeHostPort=1000
-## assert-podman-args --expose=2000-3000
+## assert-podman-args --expose 2000-3000
 ExposeHostPort=2000-3000
 
 ## assert-podman-args --publish 127.0.0.1:80:90
@@ -52,8 +52,8 @@ PublishPort=127.0.0.1:1234:1234/tcp
 ## assert-podman-args --publish ${PORT}:${PORT}
 PublishPort=${PORT}:${PORT}
 
-## assert-podman-args --expose=2000-3000/udp
+## assert-podman-args --expose 2000-3000/udp
 ExposeHostPort=2000-3000/udp
 
-## assert-podman-args --expose=2000-3000/tcp
+## assert-podman-args --expose 2000-3000/tcp
 ExposeHostPort=2000-3000/tcp
diff --git a/test/e2e/quadlet/pull.build b/test/e2e/quadlet/pull.build
index 7aad2ca20a..c41259a061 100644
--- a/test/e2e/quadlet/pull.build
+++ b/test/e2e/quadlet/pull.build
@@ -1,6 +1,6 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args --pull=never
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--pull" "never"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/quotes.container b/test/e2e/quadlet/quotes.container
index b34d16811f..8bd5152fd7 100644
--- a/test/e2e/quadlet/quotes.container
+++ b/test/e2e/quadlet/quotes.container
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --name=RemoveQuotes\"Name
+## assert-podman-args "--name" "RemoveQuotes\"Name"
 
 [Container]
 Image="localhost/imagename"
diff --git a/test/e2e/quadlet/range.network b/test/e2e/quadlet/range.network
index 26e40e3cc3..8f51c129d3 100644
--- a/test/e2e/quadlet/range.network
+++ b/test/e2e/quadlet/range.network
@@ -1,5 +1,5 @@
 ## assert-podman-final-args systemd-range
-## assert-podman-args "--subnet=192.168.1.0/24" "--ip-range=192.168.1.0/32"
+## assert-podman-args "--subnet" "192.168.1.0/24" "--ip-range" "192.168.1.0/32"
 
 [Network]
 Subnet=192.168.1.0/24
diff --git a/test/e2e/quadlet/remap-auto.container b/test/e2e/quadlet/remap-auto.container
index 67ef4ee33b..1f4dd900ed 100644
--- a/test/e2e/quadlet/remap-auto.container
+++ b/test/e2e/quadlet/remap-auto.container
@@ -1,4 +1,4 @@
-## assert-podman-args --userns=auto
+## assert-podman-args --userns auto
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/remap-auto.kube b/test/e2e/quadlet/remap-auto.kube
index 95189573f2..c0156549d8 100644
--- a/test/e2e/quadlet/remap-auto.kube
+++ b/test/e2e/quadlet/remap-auto.kube
@@ -1,4 +1,4 @@
-## assert-podman-args --userns=auto
+## assert-podman-args --userns auto
 
 [Kube]
 Yaml=/opt/k8s/deployment.yml
diff --git a/test/e2e/quadlet/remap-auto.pod b/test/e2e/quadlet/remap-auto.pod
index 1e3073eb6f..147a682cf4 100644
--- a/test/e2e/quadlet/remap-auto.pod
+++ b/test/e2e/quadlet/remap-auto.pod
@@ -1,4 +1,4 @@
-## assert-podman-pre-args --userns=auto
+## assert-podman-pre-args --userns auto
 
 [Pod]
 RemapUsers=auto
diff --git a/test/e2e/quadlet/remap-auto2.container b/test/e2e/quadlet/remap-auto2.container
index 8abe826d59..2005c0ed49 100644
--- a/test/e2e/quadlet/remap-auto2.container
+++ b/test/e2e/quadlet/remap-auto2.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--userns=auto:uidmapping=0:10000:10,uidmapping=10:20000:10,gidmapping=0:10000:10,gidmapping=10:20000:10,size=20"
+## assert-podman-args "--userns" "auto:uidmapping=0:10000:10,uidmapping=10:20000:10,gidmapping=0:10000:10,gidmapping=10:20000:10,size=20"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/remap-auto2.kube b/test/e2e/quadlet/remap-auto2.kube
index bc37033c2a..7de6c69bb4 100644
--- a/test/e2e/quadlet/remap-auto2.kube
+++ b/test/e2e/quadlet/remap-auto2.kube
@@ -1,4 +1,4 @@
-## assert-podman-args "--userns=auto:uidmapping=0:10000:10,uidmapping=10:20000:10,gidmapping=0:10000:10,gidmapping=10:20000:10,size=20"
+## assert-podman-args "--userns" "auto:uidmapping=0:10000:10,uidmapping=10:20000:10,gidmapping=0:10000:10,gidmapping=10:20000:10,size=20"
 
 [Kube]
 Yaml=/opt/k8s/deployment.yml
diff --git a/test/e2e/quadlet/remap-auto2.pod b/test/e2e/quadlet/remap-auto2.pod
index 884f73b6ce..101618750c 100644
--- a/test/e2e/quadlet/remap-auto2.pod
+++ b/test/e2e/quadlet/remap-auto2.pod
@@ -1,4 +1,4 @@
-## assert-podman-pre-args "--userns=auto:uidmapping=0:10000:10,uidmapping=10:20000:10,gidmapping=0:10000:10,gidmapping=10:20000:10,size=20"
+## assert-podman-pre-args "--userns" "auto:uidmapping=0:10000:10,uidmapping=10:20000:10,gidmapping=0:10000:10,gidmapping=10:20000:10,size=20"
 
 [Pod]
 RemapUsers=auto
diff --git a/test/e2e/quadlet/remap-keep-id.container b/test/e2e/quadlet/remap-keep-id.container
index 399c92d446..ff381e811f 100644
--- a/test/e2e/quadlet/remap-keep-id.container
+++ b/test/e2e/quadlet/remap-keep-id.container
@@ -1,4 +1,4 @@
-## assert-podman-args --userns=keep-id
+## assert-podman-args --userns keep-id
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/remap-keep-id.pod b/test/e2e/quadlet/remap-keep-id.pod
index eff1f7e610..9db6582d2c 100644
--- a/test/e2e/quadlet/remap-keep-id.pod
+++ b/test/e2e/quadlet/remap-keep-id.pod
@@ -1,4 +1,4 @@
-## assert-podman-pre-args --userns=keep-id
+## assert-podman-pre-args --userns keep-id
 
 [Pod]
 RemapUsers=keep-id
diff --git a/test/e2e/quadlet/remap-keep-id2.container b/test/e2e/quadlet/remap-keep-id2.container
index e35af2ba29..936e140cff 100644
--- a/test/e2e/quadlet/remap-keep-id2.container
+++ b/test/e2e/quadlet/remap-keep-id2.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--userns=keep-id:uid=200,gid=210"
+## assert-podman-args --userns keep-id:uid=200,gid=210
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/remap-manual.container b/test/e2e/quadlet/remap-manual.container
index e36b460083..47fe576be6 100644
--- a/test/e2e/quadlet/remap-manual.container
+++ b/test/e2e/quadlet/remap-manual.container
@@ -1,7 +1,7 @@
-## assert-podman-args "--uidmap=0:10000:10"
-## assert-podman-args "--uidmap=10:20000:10"
-## assert-podman-args "--gidmap=0:10000:10"
-## assert-podman-args "--gidmap=10:20000:10"
+## assert-podman-args "--uidmap" "0:10000:10"
+## assert-podman-args "--uidmap" "10:20000:10"
+## assert-podman-args "--gidmap" "0:10000:10"
+## assert-podman-args "--gidmap" "10:20000:10"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/remap-manual.pod b/test/e2e/quadlet/remap-manual.pod
index ac06962b7f..ae746007e0 100644
--- a/test/e2e/quadlet/remap-manual.pod
+++ b/test/e2e/quadlet/remap-manual.pod
@@ -1,7 +1,7 @@
-## assert-podman-pre-args "--uidmap=0:10000:10"
-## assert-podman-pre-args "--uidmap=10:20000:10"
-## assert-podman-pre-args "--gidmap=0:10000:10"
-## assert-podman-pre-args "--gidmap=10:20000:10"
+## assert-podman-pre-args "--uidmap" "0:10000:10"
+## assert-podman-pre-args "--uidmap" "10:20000:10"
+## assert-podman-pre-args "--gidmap" "0:10000:10"
+## assert-podman-pre-args "--gidmap" "10:20000:10"
 
 [Pod]
 RemapUsers=manual
diff --git a/test/e2e/quadlet/service-name.build b/test/e2e/quadlet/service-name.build
index 6f6581023d..91977707f7 100644
--- a/test/e2e/quadlet/service-name.build
+++ b/test/e2e/quadlet/service-name.build
@@ -1,4 +1,4 @@
-## assert-podman-args --tag=localhost/imagename
+## assert-podman-args "--tag" "localhost/imagename"
 
 [Build]
 ServiceName=basic
diff --git a/test/e2e/quadlet/service-name.pod b/test/e2e/quadlet/service-name.pod
index 353309a592..927089ec8c 100644
--- a/test/e2e/quadlet/service-name.pod
+++ b/test/e2e/quadlet/service-name.pod
@@ -1,4 +1,4 @@
-## assert-podman-pre-args "--name=test-pod"
+## assert-podman-pre-args "--name" "test-pod"
 
 [Pod]
 ServiceName=basic
diff --git a/test/e2e/quadlet/setworkingdirectory-is-archive.build b/test/e2e/quadlet/setworkingdirectory-is-archive.build
index 7e40fe4c60..9a94d5581e 100644
--- a/test/e2e/quadlet/setworkingdirectory-is-archive.build
+++ b/test/e2e/quadlet/setworkingdirectory-is-archive.build
@@ -1,6 +1,6 @@
 ## assert-podman-final-args https://github.com/containers/PodmanHello/archive/refs/heads/main.tar.gz
-## assert-podman-args --tag=localhost/podman-hello-archive
-## assert-podman-args --file=PodmanHello-main/Containerfile
+## assert-podman-args "--tag" "localhost/podman-hello-archive"
+## assert-podman-args "--file" "PodmanHello-main/Containerfile"
 
 [Build]
 ImageTag=localhost/podman-hello-archive
diff --git a/test/e2e/quadlet/setworkingdirectory-is-file-abs.build b/test/e2e/quadlet/setworkingdirectory-is-file-abs.build
index 0ebf1918b1..5efb904a3b 100644
--- a/test/e2e/quadlet/setworkingdirectory-is-file-abs.build
+++ b/test/e2e/quadlet/setworkingdirectory-is-file-abs.build
@@ -1,4 +1,4 @@
-## assert-podman-args --file=/etc/containers/systemd/Containerfile
+## assert-podman-args "--file" "/etc/containers/systemd/Containerfile"
 ## assert-key-is "Service" "WorkingDirectory" "/etc/containers/systemd"
 
 [Build]
diff --git a/test/e2e/quadlet/setworkingdirectory-is-file-rel.build b/test/e2e/quadlet/setworkingdirectory-is-file-rel.build
index 472d84ffca..20a9a0d0fb 100644
--- a/test/e2e/quadlet/setworkingdirectory-is-file-rel.build
+++ b/test/e2e/quadlet/setworkingdirectory-is-file-rel.build
@@ -1,4 +1,4 @@
-## assert-podman-args --file=Containerfile
+## assert-podman-args "--file" "Containerfile"
 ## assert-key-is-regex "Service" "WorkingDirectory" "/.*/podman-e2e-.*/subtest-.*/quadlet"
 
 [Build]
diff --git a/test/e2e/quadlet/setworkingdirectory-is-git.build b/test/e2e/quadlet/setworkingdirectory-is-git.build
index f85718f608..49a9f8ef85 100644
--- a/test/e2e/quadlet/setworkingdirectory-is-git.build
+++ b/test/e2e/quadlet/setworkingdirectory-is-git.build
@@ -1,5 +1,5 @@
 ## assert-podman-final-args git://git@git.sr.ht/~emersion/sr.ht-container-compose
-## assert-podman-args --tag=localhost/podman-hello
+## assert-podman-args "--tag" "localhost/podman-hello"
 
 [Build]
 ImageTag=localhost/podman-hello
diff --git a/test/e2e/quadlet/setworkingdirectory-is-github.build b/test/e2e/quadlet/setworkingdirectory-is-github.build
index 484bc21cd1..b816f9ed69 100644
--- a/test/e2e/quadlet/setworkingdirectory-is-github.build
+++ b/test/e2e/quadlet/setworkingdirectory-is-github.build
@@ -1,5 +1,5 @@
 ## assert-podman-final-args github.com/containers/PodmanHello.git
-## assert-podman-args --tag=localhost/podman-hello
+## assert-podman-args "--tag" "localhost/podman-hello"
 
 [Build]
 ImageTag=localhost/podman-hello
diff --git a/test/e2e/quadlet/setworkingdirectory-is-https-git.build b/test/e2e/quadlet/setworkingdirectory-is-https-git.build
index ec03f8dd2f..e1225e38e8 100644
--- a/test/e2e/quadlet/setworkingdirectory-is-https-git.build
+++ b/test/e2e/quadlet/setworkingdirectory-is-https-git.build
@@ -1,5 +1,5 @@
 ## assert-podman-final-args https://github.com/containers/PodmanHello.git
-## assert-podman-args --tag=localhost/podman-hello
+## assert-podman-args "--tag" "localhost/podman-hello"
 
 [Build]
 ImageTag=localhost/podman-hello
diff --git a/test/e2e/quadlet/shmsize.container b/test/e2e/quadlet/shmsize.container
index fe8df7d152..7c667daa52 100644
--- a/test/e2e/quadlet/shmsize.container
+++ b/test/e2e/quadlet/shmsize.container
@@ -1,4 +1,4 @@
-## assert-podman-args "--shm-size=5g"
+## assert-podman-args "--shm-size" "5g"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/subnet-trio.multiple.network b/test/e2e/quadlet/subnet-trio.multiple.network
index 14097c9c48..cf4aadad7b 100644
--- a/test/e2e/quadlet/subnet-trio.multiple.network
+++ b/test/e2e/quadlet/subnet-trio.multiple.network
@@ -1,6 +1,6 @@
 ## assert-podman-final-args systemd-subnet-trio.multiple
-## assert-podman-args "--subnet=192.168.1.0/24" "--gateway=192.168.1.1" "--ip-range=192.168.1.0/32"
-## assert-podman-args "--subnet=192.168.2.0/24" "--gateway=192.168.2.1" "--ip-range=192.168.2.0/32"
+## assert-podman-args "--subnet" "192.168.1.0/24" "--gateway" "192.168.1.1" "--ip-range" "192.168.1.0/32"
+## assert-podman-args "--subnet" "192.168.2.0/24" "--gateway" "192.168.2.1" "--ip-range" "192.168.2.0/32"
 
 [Network]
 Subnet=192.168.1.0/24
diff --git a/test/e2e/quadlet/subnet-trio.network b/test/e2e/quadlet/subnet-trio.network
index eec5ed0e44..afec792033 100644
--- a/test/e2e/quadlet/subnet-trio.network
+++ b/test/e2e/quadlet/subnet-trio.network
@@ -1,5 +1,5 @@
 ## assert-podman-final-args systemd-subnet-trio
-## assert-podman-args "--subnet=192.168.1.0/24" "--gateway=192.168.1.1" "--ip-range=192.168.1.0/32"
+## assert-podman-args "--subnet" "192.168.1.0/24" "--gateway" "192.168.1.1" "--ip-range" "192.168.1.0/32"
 
 [Network]
 Subnet=192.168.1.0/24
diff --git a/test/e2e/quadlet/subnets.network b/test/e2e/quadlet/subnets.network
index c6dec14d1c..1014d43d8f 100644
--- a/test/e2e/quadlet/subnets.network
+++ b/test/e2e/quadlet/subnets.network
@@ -1,6 +1,6 @@
 ## assert-podman-final-args systemd-subnets
-## assert-podman-args "--subnet=192.168.0.0/24"
-## assert-podman-args "--subnet=192.168.1.0/24"
+## assert-podman-args "--subnet" "192.168.0.0/24"
+## assert-podman-args "--subnet" "192.168.1.0/24"
 
 [Network]
 Subnet=192.168.0.0/24
diff --git a/test/e2e/quadlet/sysctl.container b/test/e2e/quadlet/sysctl.container
index 7e9b9fb39e..b3a9664bd9 100644
--- a/test/e2e/quadlet/sysctl.container
+++ b/test/e2e/quadlet/sysctl.container
@@ -1,6 +1,6 @@
-## assert-podman-args "--sysctl=net.ipv6.conf.all.disable_ipv6=1"
-## assert-podman-args "--sysctl=net.ipv6.conf.all.use_tempaddr=1"
-## assert-podman-args "--sysctl=net.ipv4.conf.lo.force_igmp_version=0"
+## assert-podman-args "--sysctl" "net.ipv6.conf.all.disable_ipv6=1"
+## assert-podman-args "--sysctl" "net.ipv6.conf.all.use_tempaddr=1"
+## assert-podman-args "--sysctl" "net.ipv4.conf.lo.force_igmp_version=0"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/target.build b/test/e2e/quadlet/target.build
index 6af72c1c82..0e28112c64 100644
--- a/test/e2e/quadlet/target.build
+++ b/test/e2e/quadlet/target.build
@@ -1,6 +1,6 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args --target=my-app
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--target" "my-app"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/template@.container b/test/e2e/quadlet/template@.container
index d8b10449da..b40324a1fc 100644
--- a/test/e2e/quadlet/template@.container
+++ b/test/e2e/quadlet/template@.container
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "--name=systemd-%p_%i"
+## assert-podman-args "--name" "systemd-%p_%i"
 ## assert-symlink want.service.wants/template@default.service ../template@.service
 ## assert-podman-args --env "FOO=bar"
 
diff --git a/test/e2e/quadlet/template@instance.container b/test/e2e/quadlet/template@instance.container
index ea64082196..0e608f2089 100644
--- a/test/e2e/quadlet/template@instance.container
+++ b/test/e2e/quadlet/template@instance.container
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/changed-image
-## assert-podman-args "--name=systemd-%p_%i"
+## assert-podman-args "--name" "systemd-%p_%i"
 ## assert-symlink want.service.wants/template@instance.service ../template@instance.service
 ## assert-podman-args --env "FOO=bar"
 
diff --git a/test/e2e/quadlet/timezone.container b/test/e2e/quadlet/timezone.container
index 96123539f9..d751cad994 100644
--- a/test/e2e/quadlet/timezone.container
+++ b/test/e2e/quadlet/timezone.container
@@ -1,4 +1,4 @@
-## assert-podman-args --tz=foo
+## assert-podman-args "--tz" "foo"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/tls-verify.build b/test/e2e/quadlet/tls-verify.build
index 0970bbab7a..dec3d77c24 100644
--- a/test/e2e/quadlet/tls-verify.build
+++ b/test/e2e/quadlet/tls-verify.build
@@ -1,6 +1,6 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args --tls-verify=false
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--tls-verify=false"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/user.container b/test/e2e/quadlet/user.container
index 6b1834415b..cfd1c58232 100644
--- a/test/e2e/quadlet/user.container
+++ b/test/e2e/quadlet/user.container
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "--user=998:999"
+## assert-podman-args "--user" "998:999"
 
 [Container]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/user1.container b/test/e2e/quadlet/user1.container
deleted file mode 100644
index 361a20a5f0..0000000000
--- a/test/e2e/quadlet/user1.container
+++ /dev/null
@@ -1,6 +0,0 @@
-## assert-podman-final-args localhost/imagename
-## assert-podman-args "--user=%U:%G"
-
-[Container]
-Image=localhost/imagename
-User=%U:%G
diff --git a/test/e2e/quadlet/user2.container b/test/e2e/quadlet/user2.container
deleted file mode 100644
index 5a4b1476b8..0000000000
--- a/test/e2e/quadlet/user2.container
+++ /dev/null
@@ -1,7 +0,0 @@
-## assert-podman-final-args localhost/imagename
-## assert-podman-args "--user=%U:%G"
-
-[Container]
-Image=localhost/imagename
-User=%U
-Group=%G
diff --git a/test/e2e/quadlet/variant.build b/test/e2e/quadlet/variant.build
index ffc03b1ac7..66a21a057a 100644
--- a/test/e2e/quadlet/variant.build
+++ b/test/e2e/quadlet/variant.build
@@ -1,6 +1,6 @@
 ## assert-podman-final-args-regex /.*/podman-e2e-.*/subtest-.*/quadlet
-## assert-podman-args --tag=localhost/imagename
-## assert-podman-args --variant=arm/v7
+## assert-podman-args "--tag" "localhost/imagename"
+## assert-podman-args "--variant" "arm/v7"
 
 [Build]
 ImageTag=localhost/imagename
diff --git a/test/e2e/quadlet/variant.image b/test/e2e/quadlet/variant.image
index 08744aa42c..d4612d3f21 100644
--- a/test/e2e/quadlet/variant.image
+++ b/test/e2e/quadlet/variant.image
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args --variant=arm/v5
+## assert-podman-args "--variant" "arm/v5"
 
 [Image]
 Image=localhost/imagename
diff --git a/test/e2e/quadlet/workingdir.container b/test/e2e/quadlet/workingdir.container
index 28a082b0dd..e8e69225c7 100644
--- a/test/e2e/quadlet/workingdir.container
+++ b/test/e2e/quadlet/workingdir.container
@@ -1,5 +1,5 @@
 ## assert-podman-final-args localhost/imagename
-## assert-podman-args "-w=%h"
+## assert-podman-args "--workdir" "%h"
 
 [Container]
 Image=localhost/imagename