diff --git a/src/cmd/create.go b/src/cmd/create.go
index b4e923651..67e6449e4 100644
--- a/src/cmd/create.go
+++ b/src/cmd/create.go
@@ -419,7 +419,7 @@ func createContainer(container, image, release string, showCommandToEnter bool)
 	createArgs = append(createArgs, xdgRuntimeDirEnv...)
 
 	createArgs = append(createArgs, []string{
-		"--hostname", "toolbox",
+		"--hostname", strings.NewReplacer("_", "-", ".", "-").Replace(container),
 		"--ipc", "host",
 		"--label", "com.github.containers.toolbox=true",
 	}...)