diff --git a/examples/arch/bochs.mk b/examples/arch/bochs.mk
index 06bcd45..af2695d 100644
--- a/examples/arch/bochs.mk
+++ b/examples/arch/bochs.mk
@@ -1,6 +1,8 @@
 WASI_ROOT := /opt/wasi-sdk
 WAMR := /opt/wamr
-OPT := -O3
+
+# -O3 generates more code than -O2 (unrolling/inlining etc.)
+OPT := -O2
 
 ################################################################
 # C -> WASM
@@ -52,7 +54,7 @@ ${BUILD_DIR}/%/module_wasm.c: ${BUILD_DIR}/%/module.aot
 	${XXD} -i $< > $@
 
 ################################################################
-# WASM loaded by Runtime (FAIL+Baremetal platform)
+# AOT loaded by Runtime (FAIL+Baremetal platform)
 
 # NOTE: make build-sum: "error: bp cannot be used in ‘asm’ here"
 #       could remove "ebp" from the clobber list (ARCH_ASM_CLOBBER_ALL) or
@@ -104,7 +106,7 @@ ${BUILD_DIR}/%/system.elf: ${BUILD_DIR}/%/system.o ${BUILD_DIR}/syscalls.o ${BUI
 	${CC} ${LDFLAGS} -o $@
 
 ################################################################
-# WASM loaded by Runtime (Host+Linux platform)
+# AOT loaded by Runtime (Host+Linux platform)
 
 CC_LINUX := gcc
 CFLAGS_LINUX := \
@@ -142,7 +144,7 @@ ${BUILD_DIR}/%/system-linux.elf: ${BUILD_DIR}/%/system-linux.o
 	${CC_LINUX} ${LDFLAGS_LINUX} -o $@
 
 ################################################################
-# WASM loaded by Runtime (Host+Baremetal platform)
+# AOT loaded by Runtime (Host+Baremetal platform)
 
 CC_BAREMETAL := /opt/crosscompiler/bin/i386-elf-gcc
 CFLAGS_BAREMETAL := \
diff --git a/wasm-base.dockerfile b/wasm-base.dockerfile
index 44c3065..4ce5ff5 100644
--- a/wasm-base.dockerfile
+++ b/wasm-base.dockerfile
@@ -174,8 +174,8 @@ RUN mkdir build_libiwasm_baremetal_release && cd build_libiwasm_baremetal_releas
     -DCMAKE_ASM_COMPILER=/opt/crosscompiler/bin/i386-elf-gcc \
     -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS_RELEASE="-O3 -ggdb -DNDEBUG" \
-    -DCMAKE_CXX_FLAGS_RELEASE="-O3 -ggdb -DNDEBUG" \
+    -DCMAKE_C_FLAGS_RELEASE="-O2 -DNDEBUG" \
+    -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
     -DWAMR_BUILD_PLATFORM=baremetal \
     -DWAMR_BUILD_TARGET=X86_32 \
@@ -225,8 +225,8 @@ WORKDIR /wamrlib
 RUN mkdir build_libiwasm_linux_release && cd build_libiwasm_linux_release \
  && cmake \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS_RELEASE="-O3 -ggdb -DNDEBUG" \
-    -DCMAKE_CXX_FLAGS_RELEASE="-O3 -ggdb -DNDEBUG" \
+    -DCMAKE_C_FLAGS_RELEASE="-O2 -DNDEBUG" \
+    -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \
     -DWAMR_BUILD_PLATFORM=linux \
     -DWAMR_BUILD_TARGET=X86_32 \
     -DWAMR_BUILD_AOT=1 \