diff --git a/script/app-mlperf-inference-nvidia/meta.yaml b/script/app-mlperf-inference-nvidia/meta.yaml
index 1fbba99d6..15e66aa40 100644
--- a/script/app-mlperf-inference-nvidia/meta.yaml
+++ b/script/app-mlperf-inference-nvidia/meta.yaml
@@ -274,7 +274,6 @@ deps:
   - tags: get,generic-python-lib,_package.pycuda
     names:
     - pycuda
-    version: "2022.2.2"
 
   - tags: get,generic-python-lib,_package.nvmitten
     update_tags_from_env_with_prefix:
diff --git a/script/detect-sudo/customize.py b/script/detect-sudo/customize.py
index a749acd2a..2a56f6d33 100644
--- a/script/detect-sudo/customize.py
+++ b/script/detect-sudo/customize.py
@@ -174,7 +174,7 @@ def prompt_sudo(logger):
             if not prompt_retry():  # If the user chooses not to retry or times out
                 return -1
         except subprocess.CalledProcessError as e:
-            logger.error(f"Command failed: {e.output.decode('utf-8')}")
+            logger.error(f"Command failed: {e.output}")
             reset_terminal()  # Reset terminal in case of failure
             return -1
         except Exception as e:
diff --git a/script/get-nvidia-mitten/customize.py b/script/get-nvidia-mitten/customize.py
index 77e4bac46..8d8693ca0 100644
--- a/script/get-nvidia-mitten/customize.py
+++ b/script/get-nvidia-mitten/customize.py
@@ -6,12 +6,6 @@ def preprocess(i):
 
     os_info = i['os_info']
     env = i['env']
-    script_path = i['artifact'].path
-
-    if env.get('MLC_MLPERF_INFERENCE_VERSION', '') == "5.0":
-        extra_run_cmd = 'patch -p1 < {}'.format(os.path.join(
-            script_path, 'patch', 'numpy-mitten-v5.0.patch'))
-        env['EXTRA_RUN_CMD'] = extra_run_cmd
 
     return {'return': 0}
 
diff --git a/script/get-nvidia-mitten/meta.yaml b/script/get-nvidia-mitten/meta.yaml
index c5452c480..80e414a32 100644
--- a/script/get-nvidia-mitten/meta.yaml
+++ b/script/get-nvidia-mitten/meta.yaml
@@ -3,7 +3,7 @@ automation_alias: script
 automation_uid: 5b4e0237da074764
 cache: true
 category: MLPerf benchmark support
-default_version: master
+default_version: main
 deps:
 - tags: detect,os
 - names:
@@ -18,6 +18,7 @@ deps:
   extra_cache_tags: nvidia,mitten,src
   force_env_keys:
   - MLC_GIT_CHECKOUT
+  - MLC_GIT_PATCH_FILEPATHS
   names:
   - nvidia-mitten-git-src
   tags: get,git,_repo.https://github.com/NVIDIA/mitten
@@ -32,3 +33,14 @@ tags:
 - mitten
 - nvidia-mitten
 uid: 1c045f2902374de9
+variations:
+  patched:
+    group: numpy-patch
+    default: true
+    adr:
+      nvidia-mitten-git-src:
+        tags: _patch
+    env: 
+      MLC_GIT_PATCH_FILEPATHS: <<<MLC_TMP_CURRENT_SCRIPT_PATH>>>/patch/numpy-mitten-v5.0.patch
+  default:
+    group: numpy-patch
diff --git a/script/get-nvidia-mitten/run.sh b/script/get-nvidia-mitten/run.sh
index 81f38f829..33f3f5b90 100644
--- a/script/get-nvidia-mitten/run.sh
+++ b/script/get-nvidia-mitten/run.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 cd ${MLC_NVIDIA_MITTEN_SRC}
-echo "EXTRA_RUN_CMD = ${EXTRA_RUN_CMD}"
-eval "${EXTRA_RUN_CMD}"
 test $? -eq 0 || exit $?
-${MLC_PYTHON_BIN_WITH_PATH} -m pip install .
+PIP_EXTRA=`python3 -c "import importlib.metadata; print(' --break-system-packages ' if int(importlib.metadata.version('pip').split('.')[0]) >= 23 else '')"`
+${MLC_PYTHON_BIN_WITH_PATH} -m pip install . ${PIP_EXTRA}
 test $? -eq 0 || exit $?