diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c80d9b36..40a5a19f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1834,7 +1834,7 @@ jobs:
         fi
 
         # Set toolchain variant
-        export ZEPHYR_TOOLCHAIN_VARIANT=zephyr-${{ matrix.toolchain }}
+        export ZEPHYR_TOOLCHAIN_VARIANT=zephyr/${{ matrix.toolchain }}
 
         # Run tests with twister
         TWISTER="${ZEPHYR_ROOT}/scripts/twister"
diff --git a/VERSION b/VERSION
index be46deaf..50e0b1dc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.18.0-alpha3
+0.18.0-alpha4
diff --git a/cmake/Zephyr-sdkConfig.cmake b/cmake/Zephyr-sdkConfig.cmake
index 26c0481a..e9662d5e 100644
--- a/cmake/Zephyr-sdkConfig.cmake
+++ b/cmake/Zephyr-sdkConfig.cmake
@@ -13,7 +13,7 @@ get_filename_component(ZEPHYR_SDK_INSTALL_DIR ${CMAKE_CURRENT_LIST_DIR}/.. ABSOL
 set(ZEPHYR_SDK_INSTALL_DIR ${ZEPHYR_SDK_INSTALL_DIR})
 
 if(NOT DEFINED ZEPHYR_TOOLCHAIN_VARIANT)
-  set(ZEPHYR_TOOLCHAIN_VARIANT zephyr-gnu)
+  set(ZEPHYR_TOOLCHAIN_VARIANT "zephyr/gnu")
 endif()
 
 # Those are CMake package parameters.
diff --git a/cmake/zephyr/Kconfig b/cmake/zephyr/Kconfig
index 1c8b8834..86a70119 100644
--- a/cmake/zephyr/Kconfig
+++ b/cmake/zephyr/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
-config TOOLCHAIN_ZEPHYR_0_17
+config TOOLCHAIN_ZEPHYR_0_18
 	def_bool y
 
 config TOOLCHAIN_ZEPHYR_SUPPORTS_THREAD_LOCAL_STORAGE
@@ -13,8 +13,7 @@ config TOOLCHAIN_ZEPHYR_SUPPORTS_GNU_EXTENSIONS
 
 config PICOLIBC_SUPPORTED
 	def_bool y
-	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr-gnu" \
-		|| "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr-llvm"
+	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr"
 	help
 	  Zephyr SDK >=0.16 always supports Picolibc for C and C++ development.
 
@@ -25,5 +24,5 @@ config PICOLIBC_DEFAULT
 	  Zephyr SDK >=0.17.1 always uses Picolibc
 
 choice COMPILER_OPTIMIZATIONS
-	default SPEED_OPTIMIZATIONS if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr" || "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr-gnu") && CPP_EXCEPTIONS
+	default SPEED_OPTIMIZATIONS if ("$(TOOLCHAIN_VARIANT_COMPILER)" = "gnu") && CPP_EXCEPTIONS
 endchoice
diff --git a/crosstool-ng b/crosstool-ng
index 35934f2c..0ebeeecd 160000
--- a/crosstool-ng
+++ b/crosstool-ng
@@ -1 +1 @@
-Subproject commit 35934f2cfb285b4197c2ef2a900bf315beff108d
+Subproject commit 0ebeeecd80763ccc335caa9651da0bd29135f716
diff --git a/gcc b/gcc
index 45ac4a33..60e8f09a 160000
--- a/gcc
+++ b/gcc
@@ -1 +1 @@
-Subproject commit 45ac4a338c2d24f4c9b7c543f7a66d6ec794237c
+Subproject commit 60e8f09ae1bf83ad35453f28ed70f17b5aeb54cc
diff --git a/gcc_arc b/gcc_arc
index dca43c4a..60e8f09a 160000
--- a/gcc_arc
+++ b/gcc_arc
@@ -1 +1 @@
-Subproject commit dca43c4af7047bc03d723a2d57c99d738cbd7e03
+Subproject commit 60e8f09ae1bf83ad35453f28ed70f17b5aeb54cc
diff --git a/llvm b/llvm
index 3dc6eb42..c6f1d7e2 160000
--- a/llvm
+++ b/llvm
@@ -1 +1 @@
-Subproject commit 3dc6eb42407bb419e36f061ad6b80d5ac3db71ec
+Subproject commit c6f1d7e2e3e1183a19b75d27aa4e126d90053cfa
diff --git a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_10.0.0.bb b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_10.0.2.bb
similarity index 99%
rename from meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_10.0.0.bb
rename to meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_10.0.2.bb
index 66b35de1..da5a8fce 100644
--- a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_10.0.0.bb
+++ b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_10.0.2.bb
@@ -63,7 +63,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
 UPSTREAM_CHECK_URI = "https://www.qemu.org"
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
-SRC_URI[sha256sum] = "22c075601fdcf8c7b2671a839ebdcef1d4f2973eb6735254fd2e1bd0f30b3896"
+SRC_URI[sha256sum] = "ef786f2398cb5184600f69aef4d5d691efd44576a3cff4126d38d4c6fec87759"
 CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default."
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11
diff --git a/release-notes.md b/release-notes.md
index 094c98ea..3208a5d1 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -4,7 +4,7 @@
 
 - general:
 
-  * Added Clang/LLVM 19.1.1 toolchain with Arm and RISC-V architecture support.
+  * Added Clang/LLVM 19.1.7 toolchain with Arm and RISC-V architecture support.
   * Update to GCC 14.2
   * Picolibc is configured as the main and default C library.
   * Dropped support for newlib and newlib-nano
@@ -22,6 +22,10 @@
   * Zephyr SDK GNU toolchain now declares `TOOLCHAIN_HAS_GLIBCXX`.
   * Zephyr SDK LLVM toolchain now declares `TOOLCHAIN_HAS_LIBCXX`.
 
+- hosttools:
+
+  * Update qemu to 10.0.2
+
 ## Zephyr SDK 0.18.0-alpha2
 
 - general: