diff --git a/script/get-generic-sys-util/meta.yaml b/script/get-generic-sys-util/meta.yaml
index 4516a506a..a3faa4254 100644
--- a/script/get-generic-sys-util/meta.yaml
+++ b/script/get-generic-sys-util/meta.yaml
@@ -743,6 +743,17 @@ variations:
       wkhtmltopdf:
         apt: wkhtmltopdf
         brew: wkhtmltopdf
+  xfonts-base:
+    env:
+      MLC_SYS_UTIL_NAME: xfonts_base
+    new_env_keys:
+    - MLC_XFONTS_BASE_VERSION
+    state:
+      xfonts_base:
+        apt: xfonts-base
+        dnf: xorg-x11-fonts-misc
+        yum: xorg-x11-fonts-misc
+        zypper: xorg-x11-fonts
   xz:
     env:
       MLC_SYS_UTIL_NAME: xz
diff --git a/script/get-wkhtmltopdf/meta.yaml b/script/get-wkhtmltopdf/meta.yaml
index eca50da63..3b3b13677 100755
--- a/script/get-wkhtmltopdf/meta.yaml
+++ b/script/get-wkhtmltopdf/meta.yaml
@@ -8,7 +8,13 @@ tags:
 deps:
   - tags: detect,os
   - tags: detect,sudo
+    skip_if_env:
+      MLC_HOST_OS_TYPE:
+        - windows
 uid: 67ec874a3dfe4b87
+docker:
+  pre_run_cmds:
+    - mlc pull repo
 variations:
   with-qt:
     group: qt
diff --git a/script/get-wkhtmltopdf/run-fedora.sh b/script/get-wkhtmltopdf/run-fedora.sh
index cd3c713a6..d91b05b34 100644
--- a/script/get-wkhtmltopdf/run-fedora.sh
+++ b/script/get-wkhtmltopdf/run-fedora.sh
@@ -5,12 +5,7 @@
 wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.centos6.x86_64.rpm
 
 # Install the package
-sudo yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm
+${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm --nobest --skip-broken
 
-# Install dependencies
-sudo yum install -y xorg-x11-fonts-75dpi
-
-# Verify the installation
 wkhtmltopdf --version
-
-
+test $? -eq 0 || exit $?
diff --git a/script/get-wkhtmltopdf/run-ubuntu.sh b/script/get-wkhtmltopdf/run-ubuntu.sh
index 13a1c642a..ebafe84ef 100644
--- a/script/get-wkhtmltopdf/run-ubuntu.sh
+++ b/script/get-wkhtmltopdf/run-ubuntu.sh
@@ -2,4 +2,6 @@
 wget -nc https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
 test $? -eq 0 || exit $?
 ${MLC_SUDO} dpkg -i wkhtmltox_0.12.6.1-2.jammy_amd64.deb
+${MLC_SUDO} DEBIAN_FRONTEND=noninteractive apt-get install -f -y
 test $? -eq 0 || exit $?
+