diff --git a/distro/oraclelinux/oraclelinux.go b/distro/oraclelinux/oraclelinux.go
index 35aa96b..fe688a5 100644
--- a/distro/oraclelinux/oraclelinux.go
+++ b/distro/oraclelinux/oraclelinux.go
@@ -75,3 +75,44 @@ func Match(km config.KernelMask) (pkgs []string, err error) {
 
 	return
 }
+
+func Install(km config.KernelMask, pkgname string, headers bool) (commands []string, err error) {
+	var headerspkg string
+	if headers {
+		if strings.Contains(pkgname, "uek") {
+			headerspkg = strings.Replace(pkgname,
+				"kernel-uek", "kernel-uek-devel", -1)
+		} else {
+			headerspkg = strings.Replace(pkgname,
+				"kernel", "kernel-devel", -1)
+		}
+	}
+
+	cmdf := func(f string, s ...interface{}) {
+		commands = append(commands, fmt.Sprintf(f, s...))
+	}
+
+	cmdf("yum -y install %s %s", pkgname, headerspkg)
+
+	var version string
+	if strings.Contains(pkgname, "uek") {
+		version = strings.Replace(pkgname, "kernel-uek-", "", -1)
+	} else {
+		version = strings.Replace(pkgname, "kernel-", "", -1)
+	}
+
+	if km.DistroRelease <= "7" {
+		cmdf("dracut -v --add-drivers 'e1000 ext4' -f "+
+			"/boot/initramfs-%s.img %s", version, version)
+	} else {
+		cmdf("dracut -v --add-drivers 'ata_piix libata' "+
+			"--force-drivers 'e1000 ext4 sd_mod' -f "+
+			"/boot/initramfs-%s.img %s", version, version)
+	}
+
+	return
+}
+
+func Cleanup(km config.KernelMask, pkgname string) {
+	return
+}
diff --git a/kernel/kernel.go b/kernel/kernel.go
index 6547dfb..e45d9c9 100644
--- a/kernel/kernel.go
+++ b/kernel/kernel.go
@@ -226,6 +226,7 @@ func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (e
 	// TODO use list of commands instead of appending to string
 	cmd := "true"
 
+	// TODO install/cleanup kernel interface
 	switch sk.DistroType {
 	case config.Ubuntu:
 		var headerspkg string
@@ -235,32 +236,19 @@ func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (e
 
 		cmd += fmt.Sprintf(" && apt-get install -y %s %s", pkgname, headerspkg)
 	case config.OracleLinux, config.CentOS:
-		var headerspkg string
-		if headers {
-			if strings.Contains(pkgname, "uek") {
-				headerspkg = strings.Replace(pkgname,
-					"kernel-uek", "kernel-uek-devel", -1)
-			} else {
-				headerspkg = strings.Replace(pkgname,
-					"kernel", "kernel-devel", -1)
+		var commands []string
+		commands, err = oraclelinux.Install(sk, pkgname, headers)
+		if err != nil {
+			return
+		}
+		defer func() {
+			if err != nil {
+				oraclelinux.Cleanup(sk, pkgname)
 			}
-		}
+		}()
 
-		cmd += fmt.Sprintf(" && yum -y install %s %s", pkgname, headerspkg)
-
-		var version string
-		if strings.Contains(pkgname, "uek") {
-			version = strings.Replace(pkgname, "kernel-uek-", "", -1)
-		} else {
-			version = strings.Replace(pkgname, "kernel-", "", -1)
-		}
-
-		if sk.DistroRelease <= "7" {
-			cmd += fmt.Sprintf(" && dracut -v --add-drivers 'e1000 ext4' -f "+
-				"/boot/initramfs-%s.img %s", version, version)
-		} else {
-			cmd += fmt.Sprintf(" && dracut -v --add-drivers 'ata_piix libata' --force-drivers 'e1000 ext4 sd_mod' -f "+
-				"/boot/initramfs-%s.img %s", version, version)
+		for _, command := range commands {
+			cmd += fmt.Sprintf(" && %s", command)
 		}
 	case config.Debian:
 		var commands []string