diff --git a/Builds/CMake/deps/WasmEdge.cmake b/Builds/CMake/deps/WasmEdge.cmake
index 225eb29e9..fd6f51a7a 100644
--- a/Builds/CMake/deps/WasmEdge.cmake
+++ b/Builds/CMake/deps/WasmEdge.cmake
@@ -18,6 +18,9 @@ ExternalProject_Add (wasmedge_src
     -DWASMEDGE_BUILD_STATIC_LIB=ON
     -DWASMEDGE_BUILD_AOT_RUNTIME=ON
     -DWASMEDGE_FORCE_DISABLE_LTO=ON
+    -DWASMEDGE_LINK_LLVM_STATIC=ON
+    -DWASMEDGE_LINK_TOOLS_STATIC=ON
+    -DWASMEDGE_BUILD_PLUGINS=OFF
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     -DLLVM_DIR=${LLVM_DIR}
     -DLLVM_LIBRARY_DIR=${LLVM_LIBRARY_DIR}
diff --git a/release-builder.sh b/release-builder.sh
index 26c64db45..3d6819561 100755
--- a/release-builder.sh
+++ b/release-builder.sh
@@ -117,14 +117,32 @@ make install &&
 ln -s /usr/lib64/llvm13/lib/include/lld /usr/include/lld &&
 cp /usr/lib64/llvm13/lib/liblld*.a /usr/local/lib/ &&
 cd ../../../ &&
+echo "-- Build WasmEdge --" &&
+( git clone https://github.com/WasmEdge/WasmEdge.git;  echo "" ) &&
+cd WasmEdge &&
+( mkdir build; echo "" ) &&
+cd build &&
+export BOOST_ROOT="/usr/local/src/boost_1_75_0" &&
+export Boost_LIBRARY_DIRS="/usr/local/lib" &&
+export BOOST_INCLUDEDIR="/usr/local/src/boost_1_75_0" &&
+cmake .. \
+    -DWASMEDGE_BUILD_SHARED_LIB=OFF \
+    -DWASMEDGE_BUILD_STATIC_LIB=ON \
+    -DWASMEDGE_BUILD_AOT_RUNTIME=ON \
+    -DWASMEDGE_FORCE_DISABLE_LTO=ON \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+    -DWASMEDGE_LINK_LLVM_STATIC=ON \
+    -DWASMEDGE_BUILD_PLUGINS=OFF \
+    -DWASMEDGE_LINK_TOOLS_STATIC=ON \
+    -DBoost_NO_BOOST_CMAKE=ON -DLLVM_DIR=/usr/lib64/llvm13/lib/cmake/llvm/ -DLLVM_LIBRARY_DIR=/usr/lib64/llvm13/lib/ &&
+make -j8 &&
+make install &&
+cd ../../ &&
 echo "-- Build Rippled --" &&
 pwd &&
 cp Builds/CMake/deps/Rocksdb.cmake Builds/CMake/deps/Rocksdb.cmake.old &&
 perl -i -pe "s/^(\\s*)-DBUILD_SHARED_LIBS=OFF/\\1-DBUILD_SHARED_LIBS=OFF\\n\\1-DROCKSDB_BUILD_SHARED=OFF/g" Builds/CMake/deps/Rocksdb.cmake &&
 cd release-build &&
-export BOOST_ROOT="/usr/local/src/boost_1_75_0" &&
-export Boost_LIBRARY_DIRS="/usr/local/lib" &&
-export BOOST_INCLUDEDIR="/usr/local/src/boost_1_75_0" &&
 cmake .. -DBoost_NO_BOOST_CMAKE=ON -DLLVM_DIR=/usr/lib64/llvm13/lib/cmake/llvm/ -DLLVM_LIBRARY_DIR=/usr/lib64/llvm13/lib/ &&
 make -j8 VERBOSE=1 &&
 strip -s rippled &&