diff --git a/pkg/commands/run.go b/pkg/commands/run.go
index dba619680..d8957786c 100644
--- a/pkg/commands/run.go
+++ b/pkg/commands/run.go
@@ -127,7 +127,7 @@ func addDefaultHOME(u string, envs []string) []string {
 	}
 
 	// If user isn't set, set default value of HOME
-	if u == "" {
+	if u == "" || u == constants.RootUser {
 		return append(envs, fmt.Sprintf("%s=%s", constants.HOME, constants.DefaultHOMEValue))
 	}
 
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
index d8fcc722e..c3a4ac909 100644
--- a/pkg/constants/constants.go
+++ b/pkg/constants/constants.go
@@ -58,6 +58,7 @@ const (
 	HOME = "HOME"
 	// DefaultHOMEValue is the default value Docker sets for $HOME
 	DefaultHOMEValue = "/root"
+	RootUser         = "root"
 
 	// Docker command names
 	Cmd        = "cmd"