diff --git a/wasm-base.dockerfile b/wasm-base.dockerfile
index 84de10c..7522294 100644
--- a/wasm-base.dockerfile
+++ b/wasm-base.dockerfile
@@ -31,21 +31,21 @@ RUN git clone https://gitea.vps.chriphost.de/christoph/wamr \
 WORKDIR /wamr
 
 # Build WAMR iwasm (vmcore standalone interpreter)
-# RUN cd product-mini/platforms/linux \
-#  && mkdir build_iwasm && cd build_iwasm \
-#  && cmake \
-#     -DWAMR_BUILD_PLATFORM=linux \
-#     -DWAMR_BUILD_TARGET=X86_64 \
-#     -DWAMR_BUILD_AOT=0 \
-#     -DWAMR_BUILD_WAMR_COMPILER=0 \
-#     -DWAMR_BUILD_INTERP=1 \
-#     -DWAMR_BUILD_FAST_INTERP=0 \
-#     -DWAMR_BUILD_JIT=0 \
-#     -DWAMR_BUILD_FAST_JIT=0 \
-#     -DWAMR_BUILD_LIBC_BUILTIN=1 \
-#     -DWAMR_BUILD_LIBC_WASI=1 \
-#     .. \
-#  && make -j$(nproc)
+RUN cd product-mini/platforms/linux \
+ && mkdir build_iwasm && cd build_iwasm \
+ && cmake \
+    -DWAMR_BUILD_PLATFORM=linux \
+    -DWAMR_BUILD_TARGET=X86_64 \
+    -DWAMR_BUILD_AOT=0 \
+    -DWAMR_BUILD_WAMR_COMPILER=0 \
+    -DWAMR_BUILD_INTERP=1 \
+    -DWAMR_BUILD_FAST_INTERP=0 \
+    -DWAMR_BUILD_JIT=0 \
+    -DWAMR_BUILD_FAST_JIT=0 \
+    -DWAMR_BUILD_LIBC_BUILTIN=1 \
+    -DWAMR_BUILD_LIBC_WASI=1 \
+    .. \
+ && make -j$(nproc)
 
 # Build WAMR wamrc (standalone compiler)
 RUN cd wamr-compiler \
@@ -110,6 +110,7 @@ RUN mkdir build_libiwasm && cd build_libiwasm \
     -DWAMR_BUILD_LIBC_BUILTIN=1 \
     -DWAMR_BUILD_LIBC_WASI=0 \
     -DWAMR_BUILD_SIMD=0 \
+    -DCMAKE_COLOR_DIAGNOSTICS=ON \
     .. \
  && make -j$(nproc)
 
@@ -134,12 +135,13 @@ RUN apt-get update \
     grub-pc-bin \
  && apt-get clean
 
-COPY --from=wamr-builder /wamr /opt/wamr
-COPY --from=wamr-builder /wamrlib /opt/wamrlib
+COPY --from=wamr-builder /wamrlib /opt/wamr
+COPY --from=wamr-builder /wamr/wamr-compiler/build_wamrc /opt/wamr/wamr-compiler/build_wamrc
+COPY --from=wamr-builder /wamr/product-mini/platforms/linux/build_iwasm /opt/wamr/product-mini/platforms/linux/build_iwasm
 RUN ln -sf /opt/wamr/product-mini/platforms/linux/build_iwasm /opt/wamr-iwasm \
  && ln -sf /opt/wamr/wamr-compiler/build_wamrc /opt/wamr-wamrc \
- && ln -sf /opt/wamrlib/wamr-compiler/build_libvmlib /opt/wamr-libvmlib \
- && ln -sf /opt/wamrlib/build_libiwasm /opt/wamr-libiwasm
+ && ln -sf /opt/wamr/wamr-compiler/build_libvmlib /opt/wamr-libvmlib \
+ && ln -sf /opt/wamr/build_libiwasm /opt/wamr-libiwasm
 
 COPY ./examples /home/ubuntu/examples
 WORKDIR /home/ubuntu/examples