diff --git a/Dockerfile.l4t.bionic b/Dockerfile.l4t.bionic
index 04b0c7e..9122e72 100644
--- a/Dockerfile.l4t.bionic
+++ b/Dockerfile.l4t.bionic
@@ -4,8 +4,13 @@ COPY scripts/install-base-deps.sh /opt/scripts/
 RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
     echo "deb https://dl.bintray.com/moonlight-stream/moonlight-l4t bionic main" >> /etc/apt/sources.list && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 379CE192D401AB61 && \
+    echo "deb https://repo.download.nvidia.com/jetson/common r32 main" >> /etc/apt/sources.list && \
+    echo "deb https://repo.download.nvidia.com/jetson/t210 r32 main" >> /etc/apt/sources.list && \
+    apt-key adv --fetch-key https://repo.download.nvidia.com/jetson/jetson-ota-public.asc && \
+    mkdir -p /opt/nvidia/l4t-packages/ && \
+    echo >> /opt/nvidia/l4t-packages/.nv-l4t-disable-boot-fw-update-in-preinstall && \
     apt-get update && \
-    apt-get install -y libnvmpi1.0.0 && \
+    apt-get install -y -o Dpkg::Options::="--force-confold" libnvmpi1.0.0 nvidia-l4t-multimedia-utils && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*
 
@@ -14,7 +19,9 @@ COPY SDL2 /opt/SDL2
 COPY SDL_ttf /opt/SDL_ttf
 
 COPY scripts/build-deps.sh /opt/scripts/
+RUN /bin/bash -c /opt/scripts/build-deps.sh
+
 COPY scripts/build-package.sh /opt/scripts/
 
 VOLUME "/out"
-ENTRYPOINT [ "/bin/bash", "-c", "/opt/scripts/build-deps.sh && /opt/scripts/build-package.sh" ]
+ENTRYPOINT [ "/bin/bash", "-c", "/opt/scripts/build-package.sh" ]
diff --git a/build-l4t.sh b/build-l4t.sh
index 6330d13..74d1e74 100755
--- a/build-l4t.sh
+++ b/build-l4t.sh
@@ -21,4 +21,4 @@ else
   echo Built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 fi
 
-docker run --rm --runtime nvidia --mount type=bind,source="$(pwd)"/$OUT_DIR,target=/out --mount type=bind,source="$(pwd)"/debian,target=/opt/debian -e COMMIT="$1" cgutman/moonlight-packaging:$TAG_NAME
\ No newline at end of file
+docker run --rm --mount type=bind,source="$(pwd)"/$OUT_DIR,target=/out --mount type=bind,source="$(pwd)"/debian,target=/opt/debian -e COMMIT="$1" cgutman/moonlight-packaging:$TAG_NAME