diff --git a/Dockerfile.agnos b/Dockerfile.agnos
index aca37e3..baad9a7 100644
--- a/Dockerfile.agnos
+++ b/Dockerfile.agnos
@@ -40,15 +40,10 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
 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/
+COPY ./userspace/power_burn_max.c /tmp/agnos/
 RUN gcc -O2 -o /tmp/power_burn_max /tmp/agnos/power_burn_max.c \
     -lOpenCL -lpthread -ldl
 
-# irsc_util
-FROM agnos-compiler AS agnos-compiler-irsc-util
-COPY ./userspace/irsc_util/irsc_util.c /tmp/agnos/
-RUN gcc -O2 -Wall -Wextra -o /tmp/irsc_util /tmp/agnos/irsc_util.c
-
 # ################## #
 # ###### Base ###### #
 # ################## #
@@ -136,9 +131,9 @@ RUN touch -r /lib/systemd/systemd /etc/fstab
 # 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
+COPY ./userspace/irsc_util.c /tmp/agnos/
+RUN gcc -O2 -Wall -Wextra -o /tmp/irsc_util /home/$USERNAME/power_burn_max
 RUN chown $USERNAME: /home/$USERNAME/power_burn_max
-COPY --from=agnos-compiler-irsc-util /tmp/irsc_util /usr/bin/irsc_util
 
 # Setup systemd services
 COPY ./userspace/services.sh /tmp/agnos
diff --git a/userspace/irsc_util/irsc_util.c b/userspace/irsc_util.c
similarity index 100%
rename from userspace/irsc_util/irsc_util.c
rename to userspace/irsc_util.c
diff --git a/userspace/power_burn/power_burn_max.c b/userspace/power_burn_max.c
similarity index 100%
rename from userspace/power_burn/power_burn_max.c
rename to userspace/power_burn_max.c