diff --git a/pkg/action/build-iso.go b/pkg/action/build-iso.go
index 670c3bdb1c8..0bdcd6c1d29 100644
--- a/pkg/action/build-iso.go
+++ b/pkg/action/build-iso.go
@@ -41,7 +41,7 @@ func grubCfgTemplate(arch string) string {
 
 	menuentry "%s" --class os --unrestricted {
 		echo Loading kernel...
-		linux ($root)` + constants.ISOKernelPath(arch) + ` cdroot root=live:CDLABEL=%s rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 rd.cos.disable cos.setup=` + constants.ISOCloudInitPath + `
+		linux ($root)` + constants.ISOKernelPath(arch) + ` cdroot root=live:CDLABEL=%s rd.live.dir=/ rd.live.squashimg=rootfs.squashfs console=tty1 console=ttyS0 elemental.disable elemental.setup=` + constants.ISOCloudInitPath + `
 		echo Loading initrd...
 		initrd ($root)` + constants.ISOInitrdPath(arch) + `
 	}
diff --git a/pkg/utils/runstage.go b/pkg/utils/runstage.go
index 60fc4031d1d..a64314013cd 100644
--- a/pkg/utils/runstage.go
+++ b/pkg/utils/runstage.go
@@ -75,7 +75,7 @@ func RunStage(cfg *types.Config, stage string, strict bool, cloudInitPaths ...st
 	for _, line := range cmdLineArgs {
 		if strings.Contains(line, "=") {
 			lineSplit := strings.Split(line, "=")
-			if lineSplit[0] == "cos.setup" {
+			if lineSplit[0] == "cos.setup" || lineSplit[0] == "elemental.setup" {
 				cloudInitPaths = append(cloudInitPaths, strings.TrimSpace(lineSplit[1]))
 				cfg.Logger.Debugf("Found cos.setup stanza on cmdline with value %s", lineSplit[1])
 			}