diff --git a/Dockerfile b/Dockerfile
index bab6a83..4f37ae0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -186,9 +186,10 @@ RUN \
   echo "**** install selkies fake udev ****" && \
   cd ../fake-udev && \
   make && \
+  mkdir /opt/lib && \
   mv \
     libudev.so.1.0.0-fake \
-    /usr/lib/ && \
+    /opt/lib/ && \
   echo "**** add icon ****" && \
   mkdir -p \
     /usr/share/selkies/www && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 90602c0..660f363 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -182,9 +182,10 @@ RUN \
   echo "**** install selkies fake udev ****" && \
   cd ../fake-udev && \
   make && \
+  mkdir /opt/lib && \
   mv \
     libudev.so.1.0.0-fake \
-    /usr/lib/ && \
+    /opt/lib/ && \
   echo "**** add icon ****" && \
   mkdir -p \
     /usr/share/selkies/www && \
diff --git a/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run b/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run
index 77153fd..2293094 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-selkies-config/run
@@ -59,7 +59,6 @@ fi
 
 
 # set env based on vars
-#printf "${SELKIES_INTERPOSER}${LD_PRELOAD:+:${LD_PRELOAD}}" > /run/s6/container_environment/LD_PRELOAD
 printf "${GST_DEBUG:-*:1}" > /run/s6/container_environment/GST_DEBUG
 printf "${SELKIES_ENCODER:-x264enc}" > /run/s6/container_environment/SELKIES_ENCODER
 printf "${SELKIES_FRAMERATE:-60}" > /run/s6/container_environment/SELKIES_FRAMERATE
@@ -69,7 +68,10 @@ printf "${DISPLAY_SIZEH:-768}" > /run/s6/container_environment/DISPLAY_SIZEH
 printf "${DISPLAY_REFRESH:60}" > /run/s6/container_environment/DISPLAY_REFRESH
 printf "${DISPLAY_DPI:-96}" > /run/s6/container_environment/DISPLAY_DPI
 printf "${DISPLAY_CDEPTH:-24}" > /run/s6/container_environment/DISPLAY_CDEPTH
-printf "/usr/lib/selkies_joystick_interposer.so:/usr/lib/libudev.so.1.0.0-fake" > /run/s6/container_environment/LD_PRELOAD
+if [[ -z ${NO_GAMEPAD+x} ]]; then
+  printf "/usr/lib/selkies_joystick_interposer.so:/opt/lib/libudev.so.1.0.0-fake" > /run/s6/container_environment/LD_PRELOAD
+fi
+
 # JS folder setup
 mkdir -pm1777 /dev/input
 touch /tmp/selkies_js.log