diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index 40bb68d26..257e03534 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -1192,20 +1192,30 @@ compiler.rv64-clang.options=-target riscv64-unknown-linux-gnu -march=rv64gc -mab
 
 ################################
 # Clang for WebAssembly
-group.wasmclang.compilers=wasm32clang
+group.wasmclang.compilers=wasm32clang:wasm32clang-wasi25
 group.wasmclang.groupName=Clang WebAssembly
-group.wasmclang.supportsBinary=false
+group.wasmclang.supportsBinary=true
 group.wasmclang.licenseName=LLVM Apache 2
 group.wasmclang.licenseLink=https://github.com/llvm/llvm-project/blob/main/LICENSE.TXT
 group.wasmclang.licensePreamble=The LLVM Project is under the Apache License v2.0 with LLVM Exceptions
 group.wasmclang.compilerCategories=clang
 group.wasmclang.demangler=/opt/compiler-explorer/clang-trunk/bin/llvm-cxxfilt
+group.wasmclang.intelAsm=
 
 compiler.wasm32clang.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
 compiler.wasm32clang.objdumper=/opt/compiler-explorer/gcc-snapshot/bin/objdump
 compiler.wasm32clang.name=WebAssembly clang (trunk)
 compiler.wasm32clang.options=-target wasm32
 compiler.wasm32clang.isNightly=true
+compiler.wasm32clang-wasi25.exe=/opt/compiler-explorer/clang-trunk/bin/clang++
+compiler.wasm32clang-wasi25.objdumper=/opt/compiler-explorer/wasi/sdk/v25/bin/objdump
+compiler.wasm32clang-wasi25.objdumperType=llvm
+compiler.wasm32clang-wasi25.name=WASI 25 clang (trunk)
+compiler.wasm32clang-wasi25.options=-target wasm32-wasi --sysroot=/opt/compiler-explorer/wasi/sysroot/v25/
+compiler.wasm32clang-wasi25.isNightly=true
+compiler.wasm32clang-wasi25.supportsExecute=true
+compiler.wasm32clang-wasi25.executionWrapper=/opt/compiler-explorer/wasmtime-22.0.0/wasmtime
+
 
 ################################
 # Clang for Hexagon
diff --git a/etc/config/wasm.amazon.properties b/etc/config/wasm.amazon.properties
index 41b276894..2ccc087dd 100644
--- a/etc/config/wasm.amazon.properties
+++ b/etc/config/wasm.amazon.properties
@@ -2,12 +2,14 @@ compilers=&wasmtime
 objdumper=/opt/compiler-explorer/clang-18.1.0/bin/llvm-objdump
 objdumperType=llvm
 binaryHideFuncRe=^.*::(:?native_to_wasm_trampoline|wasm_to_native_trampoline|array_to_wasm_trampoline).*$
+defaultCompiler=wasmtime2200
 
 group.wasmtime.compilers=wasmtime2200:wasmtime2101:wasmtime2001
 group.wasmtime.compilerType=wasmtime
 group.wasmtime.options=-Ddebug-info=y -Ccache=n
 group.wasmtime.supportsBinary=true
 group.wasmtime.supportsBinaryObject=true
+group.wasmtime.supportsExecution=false # I couldn't get the execution stuff to work
 group.wasmtime.versionFlag=--version
 group.wasmtime.isSemVer=true
 group.wasmtime.baseName=Wasmtime