diff --git a/Dockerfile.l4t.bionic b/Dockerfile.l4t.bionic
index 1f6f703..bb0cfa2 100644
--- a/Dockerfile.l4t.bionic
+++ b/Dockerfile.l4t.bionic
@@ -17,6 +17,7 @@ RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*
 
+COPY dav1d /opt/dav1d
 COPY FFmpeg-l4t /opt/FFmpeg
 COPY SDL2 /opt/SDL2
 COPY SDL_ttf /opt/SDL_ttf
diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh
index ebb9e8f..9c212c6 100755
--- a/scripts/build-deps.sh
+++ b/scripts/build-deps.sh
@@ -1,6 +1,6 @@
 set -e
 
-BASE_FFMPEG_ARGS="--enable-pic --enable-static --disable-shared --disable-all --disable-vulkan --enable-avcodec --enable-swscale --enable-decoder=h264 --enable-decoder=hevc --enable-decoder=av1 --enable-libdrm --enable-decoder=h264_v4l2m2m --enable-decoder=hevc_v4l2m2m --extra-cflags=-I/usr/include/libdrm"
+BASE_FFMPEG_ARGS="--enable-pic --enable-static --disable-shared --disable-all --disable-vulkan --enable-avcodec --enable-swscale --enable-decoder=h264 --enable-decoder=hevc --enable-decoder=av1 --enable-libdav1d --enable-decoder=libdav1d --enable-libdrm --enable-decoder=h264_v4l2m2m --enable-decoder=hevc_v4l2m2m --extra-cflags=-I/usr/include/libdrm"
 
 echo "Building dependencies for $TARGET"
 if [ "$TARGET" == "rpi" ] || [ "$TARGET" == "rpi64" ]; then
@@ -66,17 +66,11 @@ sed -i 's/-lSDL2_ttf/-lSDL2_ttf -lfreetype/g' SDL2_ttf.pc
 cat SDL2_ttf.pc
 make install
 
-# FFmpeg-l4t is too old to support dav1d 1.2.1
-if [ "$TARGET" != "l4t" ] || [ "$DISTRO" != "bionic" ]; then
-    # Build and install libdav1d
-    cd /opt/dav1d
-    meson setup build -Ddefault_library=static -Dbuildtype=debugoptimized -Denable_tools=false -Denable_tests=false
-    ninja -C build
-    ninja install -C build
-
-    # Enable libdav1d during FFmpeg build
-    DAV1D_FFMPEG_ARGS="--enable-libdav1d --enable-decoder=libdav1d"
-fi
+# Build and install libdav1d
+cd /opt/dav1d
+meson setup build -Ddefault_library=static -Dbuildtype=debugoptimized -Denable_tools=false -Denable_tests=false
+ninja -C build
+ninja install -C build
 
 cd /opt/FFmpeg
 ./configure $BASE_FFMPEG_ARGS $EXTRA_FFMPEG_ARGS $DAV1D_FFMPEG_ARGS
diff --git a/scripts/install-base-deps.sh b/scripts/install-base-deps.sh
index 3c60515..43b89f5 100755
--- a/scripts/install-base-deps.sh
+++ b/scripts/install-base-deps.sh
@@ -2,7 +2,7 @@ set -e
 export DEBIAN_FRONTEND=noninteractive
 
 apt-get update
-apt-get install -y curl g++ make ninja-build meson devscripts fakeroot debhelper git nasm libgbm-dev libdrm-dev libasound2-dev libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev cmake
+apt-get install -y curl g++ make ninja-build devscripts fakeroot debhelper git nasm libgbm-dev libdrm-dev libasound2-dev libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev cmake
 apt-get install -y --no-install-recommends libssl-dev qtbase5-dev qtquickcontrols2-5-dev qtdeclarative5-dev libqt5svg5-dev libopus-dev
 
 if [ "$DISTRO" != "buster" ] && [ "$DISTRO" != "bionic" ]; then
@@ -12,9 +12,10 @@ else
 fi
 
 if [ "$DISTRO" != "bionic" ]; then
-    apt-get install -y libgl-dev
+    apt-get install -y libgl-dev meson
 else
-    apt-get install -y libgl1-mesa-dev
+    apt-get install -y libgl1-mesa-dev python3-pip
+    pip3 install meson==0.61.5 # Last version compatible with Python 3.6 on Bionic
 fi
 
 if [ "$DISTRO" != "buster" ] && [ "$DISTRO" != "bullseye" ] && [ "$DISTRO" != "bionic" ]; then