diff --git a/Dockerfile.agnos b/Dockerfile.agnos
index dcff2fd..aca37e3 100644
--- a/Dockerfile.agnos
+++ b/Dockerfile.agnos
@@ -37,7 +37,9 @@ RUN --mount=type=cache,target=/root/.ccache,id=modemmanager,sharing=shared \
 FROM agnos-compiler AS agnos-compiler-power-burn
 RUN apt-get update && apt-get install -yq --no-install-recommends \
     opencl-c-headers
-COPY ./userspace/libs/* /usr/lib/aarch64-linux-gnu/
+COPY ./userspace/root/usr/lib/aarch64-linux-gnu/libOpenCL.so* /usr/lib/aarch64-linux-gnu/
+COPY ./userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so* /usr/lib/aarch64-linux-gnu/
+COPY ./userspace/root/usr/lib/aarch64-linux-gnu/liblog.so* /usr/lib/aarch64-linux-gnu/
 COPY ./userspace/power_burn/power_burn_max.c /tmp/agnos/
 RUN gcc -O2 -o /tmp/power_burn_max /tmp/agnos/power_burn_max.c \
     -lOpenCL -lpthread -ldl
@@ -131,8 +133,7 @@ RUN rm -rf /root/.config && ln -s /home/$USERNAME/.config /root/.config
 RUN chmod 644 /etc/logrotate.conf
 RUN touch -r /lib/systemd/systemd /etc/fstab
 
-# populate /usr
-COPY ./userspace/libs/* /usr/lib/aarch64-linux-gnu/
+# Install kernel headers
 COPY ./output/linux-headers/include/ /usr/include/
 
 COPY --from=agnos-compiler-power-burn /tmp/power_burn_max /home/$USERNAME/power_burn_max
diff --git a/userspace/libs/libOpenCL.so b/userspace/libs/libOpenCL.so
deleted file mode 120000
index bdd7487..0000000
--- a/userspace/libs/libOpenCL.so
+++ /dev/null
@@ -1 +0,0 @@
-libOpenCL.so.1.0.0
\ No newline at end of file
diff --git a/userspace/libs/libCB.so b/userspace/root/usr/lib/aarch64-linux-gnu/libCB.so
similarity index 100%
rename from userspace/libs/libCB.so
rename to userspace/root/usr/lib/aarch64-linux-gnu/libCB.so
diff --git a/userspace/libs/libOpenCL.so.1 b/userspace/root/usr/lib/aarch64-linux-gnu/libOpenCL.so.1
similarity index 100%
rename from userspace/libs/libOpenCL.so.1
rename to userspace/root/usr/lib/aarch64-linux-gnu/libOpenCL.so.1
diff --git a/userspace/libs/libOpenCL.so.1.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libOpenCL.so.1.0.0
similarity index 100%
rename from userspace/libs/libOpenCL.so.1.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libOpenCL.so.1.0.0
diff --git a/userspace/libs/libbase.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libbase.so.0
similarity index 100%
rename from userspace/libs/libbase.so.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libbase.so.0
diff --git a/userspace/libs/libbase.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libbase.so.0.0.0
similarity index 100%
rename from userspace/libs/libbase.so.0.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libbase.so.0.0.0
diff --git a/userspace/libs/libbinder.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libbinder.so.0
similarity index 100%
rename from userspace/libs/libbinder.so.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libbinder.so.0
diff --git a/userspace/libs/libbinder.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libbinder.so.0.0.0
similarity index 100%
rename from userspace/libs/libbinder.so.0.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libbinder.so.0.0.0
diff --git a/userspace/libs/libcutils.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so.0
similarity index 100%
rename from userspace/libs/libcutils.so.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so.0
diff --git a/userspace/libs/libcutils.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so.0.0.0
similarity index 100%
rename from userspace/libs/libcutils.so.0.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libcutils.so.0.0.0
diff --git a/userspace/libs/libffi.so.6 b/userspace/root/usr/lib/aarch64-linux-gnu/libffi.so.6
similarity index 100%
rename from userspace/libs/libffi.so.6
rename to userspace/root/usr/lib/aarch64-linux-gnu/libffi.so.6
diff --git a/userspace/libs/libffi.so.6.0.4 b/userspace/root/usr/lib/aarch64-linux-gnu/libffi.so.6.0.4
similarity index 100%
rename from userspace/libs/libffi.so.6.0.4
rename to userspace/root/usr/lib/aarch64-linux-gnu/libffi.so.6.0.4
diff --git a/userspace/libs/libgsl.so b/userspace/root/usr/lib/aarch64-linux-gnu/libgsl.so
similarity index 100%
rename from userspace/libs/libgsl.so
rename to userspace/root/usr/lib/aarch64-linux-gnu/libgsl.so
diff --git a/userspace/libs/libhardware.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libhardware.so.0
similarity index 100%
rename from userspace/libs/libhardware.so.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libhardware.so.0
diff --git a/userspace/libs/libhardware.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libhardware.so.0.0.0
similarity index 100%
rename from userspace/libs/libhardware.so.0.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libhardware.so.0.0.0
diff --git a/userspace/libs/libllvm-qcom.so b/userspace/root/usr/lib/aarch64-linux-gnu/libllvm-qcom.so
similarity index 100%
rename from userspace/libs/libllvm-qcom.so
rename to userspace/root/usr/lib/aarch64-linux-gnu/libllvm-qcom.so
diff --git a/userspace/libs/liblog.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/liblog.so.0
similarity index 100%
rename from userspace/libs/liblog.so.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/liblog.so.0
diff --git a/userspace/libs/liblog.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/liblog.so.0.0.0
similarity index 100%
rename from userspace/libs/liblog.so.0.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/liblog.so.0.0.0
diff --git a/userspace/libs/libplatformconfig.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libplatformconfig.so.0
similarity index 100%
rename from userspace/libs/libplatformconfig.so.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libplatformconfig.so.0
diff --git a/userspace/libs/libplatformconfig.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libplatformconfig.so.0.0.0
similarity index 100%
rename from userspace/libs/libplatformconfig.so.0.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libplatformconfig.so.0.0.0
diff --git a/userspace/libs/libqdMetaData.so b/userspace/root/usr/lib/aarch64-linux-gnu/libqdMetaData.so
similarity index 100%
rename from userspace/libs/libqdMetaData.so
rename to userspace/root/usr/lib/aarch64-linux-gnu/libqdMetaData.so
diff --git a/userspace/libs/libsync.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libsync.so.0
similarity index 100%
rename from userspace/libs/libsync.so.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libsync.so.0
diff --git a/userspace/libs/libsync.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libsync.so.0.0.0
similarity index 100%
rename from userspace/libs/libsync.so.0.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libsync.so.0.0.0
diff --git a/userspace/libs/libutils.so.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libutils.so.0
similarity index 100%
rename from userspace/libs/libutils.so.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libutils.so.0
diff --git a/userspace/libs/libutils.so.0.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libutils.so.0.0.0
similarity index 100%
rename from userspace/libs/libutils.so.0.0.0
rename to userspace/root/usr/lib/aarch64-linux-gnu/libutils.so.0.0.0