diff --git a/hack/make/.integration-daemon-start b/hack/make/.integration-daemon-start
index f696145ab6..0882d510ee 100644
--- a/hack/make/.integration-daemon-start
+++ b/hack/make/.integration-daemon-start
@@ -29,7 +29,7 @@ fi
 # example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G"
 extra_params=""
 if [ "$DOCKER_REMAP_ROOT" ]; then
-	extra_params="--root $DOCKER_REMAP_ROOT"
+	extra_params="--userns-remap $DOCKER_REMAP_ROOT"
 fi
 
 if [ -z "$DOCKER_TEST_HOST" ]; then
diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go
index f0cd31c3e9..070dd86e5b 100644
--- a/integration-cli/docker_utils.go
+++ b/integration-cli/docker_utils.go
@@ -108,7 +108,7 @@ func (d *Daemon) Start(arg ...string) error {
 	)
 
 	if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {
-		args = append(args, []string{"--root", root}...)
+		args = append(args, []string{"--userns-remap", root}...)
 	}
 
 	// If we don't explicitly set the log-level or debug flag(-D) then