diff --git a/wasm-base/Dockerfile b/wasm-base/Dockerfile
index ea81a6b..6bbc4d9 100644
--- a/wasm-base/Dockerfile
+++ b/wasm-base/Dockerfile
@@ -64,11 +64,16 @@ RUN apt-get update \
     wabt \
  && apt-get clean
 
-COPY --from=wamr-builder /wasm-micro-runtime/build /opt/wamr-vmcore
-COPY --from=wamr-builder /wasm-micro-runtime/wamr-compiler/build /opt/wamr-wamrc
-COPY --from=wamr-builder /wasm-micro-runtime/product-mini/platforms/linux/build /opt/wamr-iwasm
-COPY ./examples /home/ubuntu/examples
+COPY --from=wamr-builder /wasm-micro-runtime /opt/wamr
+# COPY --from=wamr-builder /wasm-micro-runtime/build /opt/wamr-vmcore
+# COPY --from=wamr-builder /wasm-micro-runtime/wamr-compiler/build /opt/wamr-wamrc
+# COPY --from=wamr-builder /wasm-micro-runtime/product-mini/platforms/linux/build /opt/wamr-iwasm
 
+RUN ln -sf /opt/wamr/build /opt/wamr-vmcore \
+ && ln -sf /opt/wamr/wamr-compiler/build /opt/wamr-wamrc \
+ && ln -sf /opt/wamr/product-mini/platforms/linux/build /opt/wamr-iwasm
+
+COPY ./examples /home/ubuntu/examples
 WORKDIR /home/ubuntu/examples
 
 ENV PATH="$PATH:/opt/wasi-sdk/bin:/opt/wamr-iwasm:/opt/wamr-wamrc"
diff --git a/wasm-base/examples/Makefile b/wasm-base/examples/Makefile
index ff9af99..8598af5 100644
--- a/wasm-base/examples/Makefile
+++ b/wasm-base/examples/Makefile
@@ -16,11 +16,13 @@ AOTS     := $(WASMS:.wasm=.aot)
 
 build-all: build-wasms build-aots
 
+# Compile to wasm bytecode using wasi-sdk
 build-wasms: $(WASMS)
 
 %.wasm: %.c
 	$(CLANG) $(CFLAGS) $< -o $@
 
+# Compile ahead-of-time module using wamrc
 build-aots: $(AOTS)
 
 %.aot: %.wasm