diff --git a/etc/taskcluster/docker/base.dockerfile b/etc/taskcluster/docker/base.dockerfile
index c4ce6839952..abfa98fda41 100644
--- a/etc/taskcluster/docker/base.dockerfile
+++ b/etc/taskcluster/docker/base.dockerfile
@@ -19,8 +19,12 @@ RUN \
         python-pip \
         python-dev \
         #
+        # Compiling C modules when installing Python packages in a virtualenv
+        gcc \
+        #
         # Installing rustup and sccache (build dockerfile) or fetching build artifacts (run tasks)
-        curl && \
+        curl \
+    && \
     # Running mach
     pip install virtualenv
 
diff --git a/etc/taskcluster/docker/run.dockerfile b/etc/taskcluster/docker/run.dockerfile
index 6cd56e935a6..4be9181f40e 100644
--- a/etc/taskcluster/docker/run.dockerfile
+++ b/etc/taskcluster/docker/run.dockerfile
@@ -1,10 +1,15 @@
 % include base.dockerfile
 
-# Servo’s runtime dependencies
+# Servo’s runtime dependencies:
 RUN apt-get install -qy --no-install-recommends \
     libgl1 \
     libssl1.1 \
     libdbus-1-3 \
-    libgstreamer-plugins-bad1.0-0 \
-    gstreamer1.0-plugins-good
-
+    gstreamer1.0-plugins-good \
+    gstreamer1.0-plugins-bad \
+    gstreamer1.0-libav \
+    gstreamer1.0-gl \
+    libunwind8 \
+    #
+    # Compiling shaders in OSMesa:
+    llvm \