diff --git a/Dockerfile.agnos b/Dockerfile.agnos
index 0a4a4b4..000a1dc 100644
--- a/Dockerfile.agnos
+++ b/Dockerfile.agnos
@@ -83,16 +83,11 @@ FROM agnos-base
 # Hardware rootfs overlay
 COPY ./userspace/root/etc/ /etc/
 COPY ./userspace/root/lib/ /usr/lib/
-COPY ./userspace/root/lib64/ /usr/lib64/
 COPY ./userspace/root/sbin/ /usr/sbin/
 COPY ./userspace/root/system/ /system/
 COPY ./userspace/root/usr/ /usr/
 RUN mkdir -p /dsp /firmware /persist /data /cache /rwtmp
 
-# Hardware setup
-COPY ./userspace/hardware_setup.sh /tmp/agnos
-RUN /tmp/agnos/hardware_setup.sh
-
 COPY --from=agnos-compiler-libqmi /tmp/libqmi.deb /tmp/
 COPY --from=agnos-compiler-modemmanager /tmp/modemmanager.deb /tmp/
 
diff --git a/userspace/base_setup.sh b/userspace/base_setup.sh
index 329586e..58500e6 100755
--- a/userspace/base_setup.sh
+++ b/userspace/base_setup.sh
@@ -8,6 +8,10 @@ HOST=comma
 touch /TICI
 touch /AGNOS
 
+# Set up usr-merged lib64 since it's not done by default in 24.04-base.
+mkdir -p /usr/lib64
+ln -sTfn usr/lib64 /lib64
+
 # Install apt-fast
 apt-get update
 apt-get install -yq curl sudo wget
@@ -29,6 +33,7 @@ adduser $USERNAME adm
 adduser $USERNAME gpu
 adduser $USERNAME audio
 adduser $USERNAME disk
+adduser $USERNAME netdev
 adduser $USERNAME dialout
 adduser $USERNAME systemd-journal
 
diff --git a/userspace/hardware_setup.sh b/userspace/hardware_setup.sh
deleted file mode 100755
index ff14b91..0000000
--- a/userspace/hardware_setup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-
-# Setting up usr merged lib64 since it's not done by default (in 24.04-base)
-# https://wiki.debian.org/UsrMerge
-# https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/
-mkdir -p /usr/lib64
-if [ -d /lib64 ] && [ ! -L /lib64 ]; then
-  cp -a /lib64/. /usr/lib64/
-  rm -rf /lib64
-fi
-ln -sfn usr/lib64 /lib64
-
-# Install 16.04 version of libjson-c2
-cd /tmp
-wget http://ports.ubuntu.com/pool/main/j/json-c/libjson-c2_0.11-4ubuntu2.6_arm64.deb -O /tmp/libjson-c2_0.11-4ubuntu2.6_arm64.deb
-apt install -yq /tmp/libjson-c2_0.11-4ubuntu2.6_arm64.deb
-
-# Remove apt cache
-rm -rf /var/lib/apt/lists/*
-
-USERNAME=comma
-adduser $USERNAME netdev
diff --git a/userspace/root/usr/lib/aarch64-linux-gnu/libjson-c.so.2 b/userspace/root/usr/lib/aarch64-linux-gnu/libjson-c.so.2
new file mode 120000
index 0000000..f3ff981
--- /dev/null
+++ b/userspace/root/usr/lib/aarch64-linux-gnu/libjson-c.so.2
@@ -0,0 +1 @@
+libjson-c.so.2.0.0
\ No newline at end of file
diff --git a/userspace/root/usr/lib/aarch64-linux-gnu/libjson-c.so.2.0.0 b/userspace/root/usr/lib/aarch64-linux-gnu/libjson-c.so.2.0.0
new file mode 100644
index 0000000..2733adc
Binary files /dev/null and b/userspace/root/usr/lib/aarch64-linux-gnu/libjson-c.so.2.0.0 differ
diff --git a/userspace/root/lib64/ld-linux-aarch64.so.1 b/userspace/root/usr/lib64/ld-linux-aarch64.so.1
similarity index 100%
rename from userspace/root/lib64/ld-linux-aarch64.so.1
rename to userspace/root/usr/lib64/ld-linux-aarch64.so.1