diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb819582..b796cd38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Fix bug in determining default nvidia-container-runtime.user config value on SUSE-based systems.
 * Add `crun` to the list of configured low-level runtimes.
 * Added support for `--ldconfig-path` to `nvidia-ctk cdi generate` command.
+* Fix `nvidia-ctk runtime configure --cdi.enabled` for Docker.
 
 * [toolkit-container] Bump CUDA base image version to 12.3.1.
 
diff --git a/cmd/nvidia-ctk/runtime/configure/configure.go b/cmd/nvidia-ctk/runtime/configure/configure.go
index a3da3e76..d1583ed1 100644
--- a/cmd/nvidia-ctk/runtime/configure/configure.go
+++ b/cmd/nvidia-ctk/runtime/configure/configure.go
@@ -310,7 +310,7 @@ func enableCDI(config *config, cfg engine.Interface) error {
 	case "containerd":
 		cfg.Set("enable_cdi", true)
 	case "docker":
-		cfg.Set("experimental", true)
+		cfg.Set("features", map[string]bool{"cdi": true})
 	default:
 		return fmt.Errorf("enabling CDI in %s is not supported", config.runtime)
 	}