diff --git a/repos/ports/run/noux_tool_chain_auto.run b/repos/ports/run/noux_tool_chain_auto.run
index 24ca5f1ed..61d42b1ee 100644
--- a/repos/ports/run/noux_tool_chain_auto.run
+++ b/repos/ports/run/noux_tool_chain_auto.run
@@ -44,14 +44,13 @@ if {[have_spec arm]} {
 }
 
 if {[have_spec x86]} {
-	set platform_base_dir   "base-nova"
+	set platform_base_dir   "base-hw"
 	set noux_boot_timeout   100
-	set tool_chain_timeout  600
+	set tool_chain_timeout  450
+	set platform            "hw_x86_64"
 
-	if {[have_spec 32bit]} {
-		set platform          "nova_x86_32"
-	} else {
-		set platform          "nova_x86_64"
+	if {[have_spec foc]} {
+		set tool_chain_timeout  800
 	}
 }