diff --git a/.github/workflows/publish_canary_docker.yml b/.github/workflows/publish_canary_docker.yml
index 38343f092f..18d0107876 100644
--- a/.github/workflows/publish_canary_docker.yml
+++ b/.github/workflows/publish_canary_docker.yml
@@ -9,6 +9,7 @@ on:
       - utils/docker/**
       - browsers.json
       - .github/workflows/publish_canary_docker.yml
+      - src/nativeDeps.ts
 
 jobs:
   publish-canary-docker:
diff --git a/src/nativeDeps.ts b/src/nativeDeps.ts
index fa7131c6ea..8e2cfb32f3 100644
--- a/src/nativeDeps.ts
+++ b/src/nativeDeps.ts
@@ -26,6 +26,15 @@ export const deps = {
       'xvfb',
       'fonts-noto-color-emoji',
       'ttf-unifont',
+      'libfontconfig',
+      'libfreetype6',
+      'xfonts-cyrillic',
+      'xfonts-scalable',
+      'fonts-liberation',
+      'fonts-ipafont-gothic',
+      'fonts-wqy-zenhei',
+      'fonts-tlwg-loma-otf',
+      'ttf-ubuntu-font-family',
     ],
     chromium: [
       'fonts-liberation',
@@ -136,6 +145,15 @@ export const deps = {
       'xvfb',
       'fonts-noto-color-emoji',
       'ttf-unifont',
+      'libfontconfig',
+      'libfreetype6',
+      'xfonts-cyrillic',
+      'xfonts-scalable',
+      'fonts-liberation',
+      'fonts-ipafont-gothic',
+      'fonts-wqy-zenhei',
+      'fonts-tlwg-loma-otf',
+      'ttf-ubuntu-font-family',
     ],
     chromium: [
       'fonts-liberation',
@@ -246,6 +264,15 @@ export const deps = {
       'xvfb',
       'fonts-noto-color-emoji',
       'ttf-unifont',
+      'libfontconfig',
+      'libfreetype6',
+      'xfonts-cyrillic',
+      'xfonts-scalable',
+      'fonts-liberation',
+      'fonts-ipafont-gothic',
+      'fonts-wqy-zenhei',
+      'fonts-tlwg-loma-otf',
+      'ttf-ubuntu-font-family',
     ],
     chromium: [
       'libasound2',
diff --git a/utils/docker/Dockerfile.bionic b/utils/docker/Dockerfile.bionic
index e4735aaca6..b83d1d9aed 100644
--- a/utils/docker/Dockerfile.bionic
+++ b/utils/docker/Dockerfile.bionic
@@ -21,35 +21,6 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
     update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
 
-#================
-# Font libraries
-#================
-# libfontconfig            ~1 MB
-# libfreetype6             ~1 MB
-# xfonts-cyrillic          ~2 MB
-# xfonts-scalable          ~2 MB
-# fonts-liberation         ~3 MB
-# fonts-ipafont-gothic     ~13 MB
-# fonts-wqy-zenhei         ~17 MB
-# fonts-tlwg-loma-otf      ~300 KB
-# ttf-ubuntu-font-family   ~5 MB
-#
-# Layer size: small: 36.28 MB (with --no-install-recommends)
-# Layer size: small: 36.28 MB
-RUN apt-get -qqy update \
-  && apt-get -qqy --no-install-recommends install \
-    libfontconfig \
-    libfreetype6 \
-    xfonts-cyrillic \
-    xfonts-scalable \
-    fonts-liberation \
-    fonts-ipafont-gothic \
-    fonts-wqy-zenhei \
-    fonts-tlwg-loma-otf \
-    ttf-ubuntu-font-family \
-  && rm -rf /var/lib/apt/lists/* \
-  && apt-get -qyy clean
-
 # === BAKE BROWSERS INTO IMAGE ===
 
 ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal
index e096dbc91b..0670490481 100644
--- a/utils/docker/Dockerfile.focal
+++ b/utils/docker/Dockerfile.focal
@@ -21,35 +21,6 @@ RUN apt-get update && apt-get install -y python3.8 python3-pip && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
     update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
 
-#================
-# Font libraries
-#================
-# libfontconfig            ~1 MB
-# libfreetype6             ~1 MB
-# xfonts-cyrillic          ~2 MB
-# xfonts-scalable          ~2 MB
-# fonts-liberation         ~3 MB
-# fonts-ipafont-gothic     ~13 MB
-# fonts-wqy-zenhei         ~17 MB
-# fonts-tlwg-loma-otf      ~300 KB
-# ttf-ubuntu-font-family   ~5 MB
-#
-# Layer size: small: 36.28 MB (with --no-install-recommends)
-# Layer size: small: 36.28 MB
-RUN apt-get -qqy update \
-  && apt-get -qqy --no-install-recommends install \
-    libfontconfig \
-    libfreetype6 \
-    xfonts-cyrillic \
-    xfonts-scalable \
-    fonts-liberation \
-    fonts-ipafont-gothic \
-    fonts-wqy-zenhei \
-    fonts-tlwg-loma-otf \
-    ttf-ubuntu-font-family \
-  && rm -rf /var/lib/apt/lists/* \
-  && apt-get -qyy clean
-
 # === BAKE BROWSERS INTO IMAGE ===
 
 ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright