diff --git a/.github/workflows/build-test.sh b/.github/workflows/build-test.sh
index 68242ac922a..3d3a5e8bcca 100755
--- a/.github/workflows/build-test.sh
+++ b/.github/workflows/build-test.sh
@@ -159,8 +159,8 @@ if [ -n "$bpftool_dir" ]; then
 fi
 
 if [[ -n "$CUSTOM_PYTHON" ]]; then
-    # If CUSTOM_PYTHON is set we need to pull jinja2 from pip, as a local interpreter is used
-    pip3 install --user --break-system-packages jinja2
+    # If CUSTOM_PYTHON is set we need to pull dependencies from pip, as a local interpreter is used
+    pip3 install --user --break-system-packages jinja2 pefile
 fi
 
 $CC --version
diff --git a/meson.build b/meson.build
index e84303c9cba..fc1885ce837 100644
--- a/meson.build
+++ b/meson.build
@@ -1624,7 +1624,7 @@ if have and efi_arch == 'x64' and cc.links('''
         efi_cpu_family_alt = 'x86'
 endif
 
-want_ukify = pymod.find_installation('python3', required: get_option('ukify'), modules : ['pefile']).found()
+want_ukify = get_option('ukify').allowed()
 conf.set10('ENABLE_UKIFY', want_ukify)
 
 #####################################################################