diff --git a/hook/config.toml.centos7 b/hook/config.toml.centos7
index c0c06a86cb933eafc44553d3ab3d0533a343a008..a0c73a1d3898305b809b9278659c16db8994aefa 100644
--- a/hook/config.toml.centos7
+++ b/hook/config.toml.centos7
@@ -2,7 +2,7 @@ disable-require = false
 #swarm-resource = "DOCKER_RESOURCE_GPU"
 
 [nvidia-container-cli]
-#root = "/run/nvidia"
+#root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
 #debug = "/var/log/nvidia-container-runtime-hook.log"
diff --git a/hook/config.toml.stretch b/hook/config.toml.stretch
index c0c06a86cb933eafc44553d3ab3d0533a343a008..a0c73a1d3898305b809b9278659c16db8994aefa 100644
--- a/hook/config.toml.stretch
+++ b/hook/config.toml.stretch
@@ -2,7 +2,7 @@ disable-require = false
 #swarm-resource = "DOCKER_RESOURCE_GPU"
 
 [nvidia-container-cli]
-#root = "/run/nvidia"
+#root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
 #debug = "/var/log/nvidia-container-runtime-hook.log"
diff --git a/hook/config.toml.xenial b/hook/config.toml.xenial
index 9bd693f82788fea7c38ce5d1ac9d25da090ee1ed..33644579f69f23f3e9290b99d84ad7b400ec9c4a 100644
--- a/hook/config.toml.xenial
+++ b/hook/config.toml.xenial
@@ -2,7 +2,7 @@ disable-require = false
 #swarm-resource = "DOCKER_RESOURCE_GPU"
 
 [nvidia-container-cli]
-#root = "/run/nvidia"
+#root = "/run/nvidia/driver"
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
 #debug = "/var/log/nvidia-container-runtime-hook.log"
diff --git a/hook/nvidia-container-runtime-hook/main.go b/hook/nvidia-container-runtime-hook/main.go
index 0a6a6914bde4cf80705052374673a40f0a7a5340..cfe158ee9e63678c1b945e0df6a91c0824ecd69b 100644
--- a/hook/nvidia-container-runtime-hook/main.go
+++ b/hook/nvidia-container-runtime-hook/main.go
@@ -53,7 +53,6 @@ func capabilityToCLI(cap string) string {
 	return ""
 }
 
-// getCLIPath must be called after the chroot.
 func getCLIPath(config CLIConfig) string {
 	if config.Path != nil {
 		return *config.Path
@@ -73,7 +72,6 @@ func getCLIPath(config CLIConfig) string {
 }
 
 // getRootfsPath returns an absolute path. We don't need to resolve symlinks for now.
-// Must be called *before* the chroot.
 func getRootfsPath(config containerConfig) string {
 	rootfs, err := filepath.Abs(config.Rootfs)
 	if err != nil {
@@ -99,11 +97,6 @@ func doPrestart() {
 	}
 
 	rootfs := getRootfsPath(container)
-	if cli.Root != nil {
-		if err := syscall.Chroot(*cli.Root); err != nil {
-			log.Panicf("couldn't chroot to %s: %s", *cli.Root, err)
-		}
-	}
 
 	args := []string{getCLIPath(cli)}
 	if cli.Root != nil {