diff --git a/examples/arch/bochs.mk b/examples/arch/bochs.mk
index 360f295..6900f98 100644
--- a/examples/arch/bochs.mk
+++ b/examples/arch/bochs.mk
@@ -39,7 +39,8 @@ ${BUILD_DIR}/%/module.wasm: %.c
 WAMRC := /opt/wamr-wamrc/wamrc
 WAMRCFLAGS := \
 	--target=i386 \
-	--cpu=generic
+	--cpu=generic \
+	--opt-level=3
 
 ${BUILD_DIR}/%/module.aot: ${BUILD_DIR}/%/module.wasm
 	${WAMRC} ${WAMRCFLAGS} -o $@ $<
@@ -55,7 +56,7 @@ ${BUILD_DIR}/%/module_wasm.c: ${BUILD_DIR}/%/module.aot
 CC := /opt/crosscompiler/bin/i386-elf-gcc
 CFLAGS := \
 	-I. \
-	-O0 \
+	-O2 \
 	-m32 \
 	-ffunction-sections \
 	-ffreestanding \
@@ -209,8 +210,8 @@ ${BUILD_DIR}/%/trace.pb:
 	-e ${BUILD_DIR}/$*/system.elf \
 	-i ${BUILD_DIR}/$*/system.iso \
 	-- \
-	-Wf,--state-file=${BUILD_DIR}/state \
-	-Wf,--trace-file=${BUILD_DIR}/trace.pb \
+	-Wf,--state-file=${BUILD_DIR}/$*/state \
+	-Wf,--trace-file=${BUILD_DIR}/$*/trace.pb \
 	-Wf,--start-symbol=start_trace \
 	-Wf,--end-symbol=stop_trace \
 	-Wf,--check-bounds
diff --git a/wasm-base.dockerfile b/wasm-base.dockerfile
index 9ccac04..e7eb06c 100644
--- a/wasm-base.dockerfile
+++ b/wasm-base.dockerfile
@@ -173,7 +173,7 @@ RUN mkdir build_libiwasm && cd build_libiwasm \
     -DCMAKE_CXX_COMPILER=/opt/crosscompiler/bin/i386-elf-g++ \
     -DCMAKE_ASM_COMPILER=/opt/crosscompiler/bin/i386-elf-gcc \
     -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
-    -DCMAKE_BUILD_TYPE=Debug \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWAMR_BUILD_PLATFORM=baremetal \
     -DWAMR_BUILD_TARGET=X86_32 \