diff --git a/script/generate-mlperf-inference-submission/_cm.yaml b/script/generate-mlperf-inference-submission/_cm.yaml
index 5e43dd787..8dad87f25 100644
--- a/script/generate-mlperf-inference-submission/_cm.yaml
+++ b/script/generate-mlperf-inference-submission/_cm.yaml
@@ -101,9 +101,9 @@ post_deps:
     - 'yes'
     - true
   tags: preprocess,mlperf,submission
-- enable_if_env:
+- skip_if_env:
     CM_RUN_SUBMISSION_CHECKER:
-    - 'yes'
+    - 'no'
   names:
   - mlperf-inference-submission-checker
   - submission-checker
diff --git a/script/generate-mlperf-inference-submission/customize.py b/script/generate-mlperf-inference-submission/customize.py
index 73cd70052..d3ab67a2b 100644
--- a/script/generate-mlperf-inference-submission/customize.py
+++ b/script/generate-mlperf-inference-submission/customize.py
@@ -190,7 +190,7 @@ def generate_submission(env, state, inp, submission_division):
             result_path, 'system_meta.json')
         # checks for json file containing system meta
         sut_info = {
-            "hardware_name": None,
+            "system_name": None,
             "implementation": None,
             "device": None,
             "framework": None,
@@ -276,7 +276,7 @@ def generate_submission(env, state, inp, submission_division):
                             {model: returned_model_name})
 
         if check_dict_filled(sut_info.keys(), sut_info):
-            system = sut_info["hardware_name"]
+            system = env.get('CM_HW_NAME', sut_info["system_name"])
             implementation = sut_info["implementation"]
             device = sut_info["device"]
             framework = sut_info["framework"].replace(" ", "_")