diff --git a/script/app-mlperf-inference-nvidia/_cm.yaml b/script/app-mlperf-inference-nvidia/_cm.yaml
index 1dd39f879..337c64375 100644
--- a/script/app-mlperf-inference-nvidia/_cm.yaml
+++ b/script/app-mlperf-inference-nvidia/_cm.yaml
@@ -261,7 +261,10 @@ deps:
       CM_MLPERF_NVIDIA_HARNESS_RUN_MODE:
       - run_harness
 
-  - tags: get,generic-python-lib,_package.nvmitten,_path./opt/nvmitten-0.1.3-cp38-cp38-linux_x86_64.whl
+  - tags: get,generic-python-lib,_package.nvmitten
+    update_tags_from_env_with_prefix:
+      _path.:
+        - CM_ENV_NVMITTEN_DOCKER_WHEEL_PATH
     enable_if_env:
       CM_RUN_STATE_DOCKER:
         - 'yes'
diff --git a/script/app-mlperf-inference/_cm.yaml b/script/app-mlperf-inference/_cm.yaml
index 116a71b6c..a4bb7b6a3 100644
--- a/script/app-mlperf-inference/_cm.yaml
+++ b/script/app-mlperf-inference/_cm.yaml
@@ -1149,6 +1149,8 @@ variations:
     default_env:
       CM_SKIP_SYS_UTILS: 'yes'
       CM_REGENERATE_MEASURE_FILES: 'yes'
+    env:
+      CM_ENV_NVMITTEN_DOCKER_WHEEL_PATH: '/opt/nvmitten-0.1.3-cp38-cp38-linux_x86_64.whl'
 
   r4.1_default:
     group:
@@ -1163,6 +1165,8 @@ variations:
     default_env:
       CM_SKIP_SYS_UTILS: 'yes'
       CM_REGENERATE_MEASURE_FILES: 'yes'
+    env:
+      CM_ENV_NVMITTEN_DOCKER_WHEEL_PATH: '/opt/nvmitten-0.1.3b0-cp38-cp38-linux_x86_64.whl'
 
 
 invalid_variation_combinations:
diff --git a/script/build-mlperf-inference-server-nvidia/_cm.yaml b/script/build-mlperf-inference-server-nvidia/_cm.yaml
index 23d0530ab..359614e34 100644
--- a/script/build-mlperf-inference-server-nvidia/_cm.yaml
+++ b/script/build-mlperf-inference-server-nvidia/_cm.yaml
@@ -164,6 +164,11 @@ variations:
     add_deps_recursive:
       nvidia-inference-common-code:
         tags: _ctuning
+  go:
+    group: code
+    add_deps_recursive:
+      nvidia-inference-common-code:
+        tags: _go
   nvidia-only:
     group: code
     add_deps_recursive:
@@ -180,6 +185,23 @@ variations:
       nvidia-inference-common-code:
         tags: _mlcommons
 
+  r4.0:
+    group: version
+    add_deps_recursive:
+      nvidia-inference-common-code:
+        version: r4.0
+      nvidia-scratch-space:
+        tags: _version.4_1
+    deps:
+      - tags: install,pytorch,from.src,_for-nvidia-mlperf-inference-v4.0
+        names:
+        - pytorch
+        - torch
+      - tags: install,torchvision,from.src,_for-nvidia-mlperf-inference-v4.0
+        names:
+        - pytorchvision
+        - torchvision
+      - tags: install,nccl,libs,_cuda
 
 versions:
   r2.1: