diff --git a/.github/workflows/test-mlperf-inference-rgat.yml b/.github/workflows/test-mlperf-inference-rgat.yml
index 87a9314ca..03941023e 100644
--- a/.github/workflows/test-mlperf-inference-rgat.yml
+++ b/.github/workflows/test-mlperf-inference-rgat.yml
@@ -1,7 +1,7 @@
 name: MLPerf inference rgat
 
 on:
-  pull_request_target:
+  pull_request:
     branches: [ "main", "dev" ]
     paths:
       - '.github/workflows/test-mlperf-inference-rgat.yml'
@@ -31,7 +31,7 @@ jobs:
         cm pull repo --url=${{ github.event.pull_request.head.repo.html_url }} --checkout=${{ github.event.pull_request.head.ref }}
     - name: Test MLPerf Inference R-GAT using ${{ matrix.backend }} on ${{ matrix.os }}
       run: |
-        cm run script --tags=run,mlperf,inference,generate-run-cmds,_submission,_short --adr.inference-src.tags=_branch.fix_submission_generation --adr.mlperf-implementation.tags=_branch.fix_submission_generation --submitter="MLCommons" --hw_name=gh_${{ matrix.os }}_x86 --model=rgat --implementation=${{ matrix.implementation }} --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --category=datacenter --quiet  -v --target_qps=1
+        cm run script --tags=run,mlperf,inference,generate-run-cmds,_submission,_short  --submitter="MLCommons" --hw_name=gh_${{ matrix.os }}_x86 --model=rgat --implementation=${{ matrix.implementation }} --backend=${{ matrix.backend }} --device=cpu --scenario=Offline --test_query_count=500 --adr.compiler.tags=gcc --category=datacenter --quiet  -v --target_qps=1
     - name: Push Results
       if: github.repository_owner == 'gateoverflow'
       env:
diff --git a/script/app-image-classification-onnx-py/_cm.yaml b/script/app-image-classification-onnx-py/_cm.yaml
index 740a8a18a..e53b91ec2 100644
--- a/script/app-image-classification-onnx-py/_cm.yaml
+++ b/script/app-image-classification-onnx-py/_cm.yaml
@@ -22,7 +22,6 @@ default_env:
 
 deps:
 - tags: detect,os
-#- tags: get,sys-utils-cm
 - names:
   - python
   - python3
diff --git a/script/app-mlperf-inference-mlcommons-python/_cm.yaml b/script/app-mlperf-inference-mlcommons-python/_cm.yaml
index 89646244b..45401431f 100644
--- a/script/app-mlperf-inference-mlcommons-python/_cm.yaml
+++ b/script/app-mlperf-inference-mlcommons-python/_cm.yaml
@@ -1239,8 +1239,8 @@ variations:
       CM_MODEL: rgat
     add_deps_recursive:
       pytorch:
-        version_max: "2.4.1"
-        version_max_usable: "2.4.1"
+        version_max: "2.4.0"
+        version_max_usable: "2.4.0"
     deps:
       - tags: get,generic-python-lib,_package.colorama
       - tags: get,generic-python-lib,_package.tqdm
diff --git a/script/generate-mlperf-inference-submission/customize.py b/script/generate-mlperf-inference-submission/customize.py
index 040e7cb09..a27086237 100644
--- a/script/generate-mlperf-inference-submission/customize.py
+++ b/script/generate-mlperf-inference-submission/customize.py
@@ -160,11 +160,15 @@ def generate_submission(env, state, inp, submission_division):
     print('* MLPerf inference submitter: {}'.format(submitter))
 
     if env.get('CM_MLPERF_SUT_SW_NOTES_EXTRA', '') != '':
-        sw_notes = f"{system_meta_tmp['sw_notes']} {env['CM_MLPERF_SUT_SW_NOTES_EXTRA']}"
+        sw_notes = f"""{
+            system_meta_tmp['sw_notes']} {
+            env['CM_MLPERF_SUT_SW_NOTES_EXTRA']}"""
         system_meta_tmp['sw_notes'] = sw_notes
 
     if env.get('CM_MLPERF_SUT_HW_NOTES_EXTRA', '') != '':
-        hw_notes = f"{system_meta_tmp['hw_notes']} {env['CM_MLPERF_SUT_HW_NOTES_EXTRA']}"
+        hw_notes = f"""{
+            system_meta_tmp['hw_notes']} {
+            env['CM_MLPERF_SUT_HW_NOTES_EXTRA']}"""
         system_meta_tmp['hw_notes'] = hw_notes
 
     path_submission = os.path.join(path_submission_division, submitter)
@@ -297,6 +301,10 @@ def generate_submission(env, state, inp, submission_division):
         system_path = os.path.join(path_submission, "systems")
         submission_system_path = system_path
 
+        if not os.path.isdir(submission_path):
+            os.makedirs(submission_path)
+        if not os.path.isdir(measurement_path):
+            os.makedirs(measurement_path)
         if not os.path.isdir(submission_system_path):
             os.makedirs(submission_system_path)
         system_file = os.path.join(submission_system_path, sub_res + ".json")
diff --git a/script/get-mlperf-inference-src/_cm.yaml b/script/get-mlperf-inference-src/_cm.yaml
index c100e32e8..b8bd39092 100644
--- a/script/get-mlperf-inference-src/_cm.yaml
+++ b/script/get-mlperf-inference-src/_cm.yaml
@@ -134,10 +134,10 @@ variations:
 versions:
   custom:
     env:
-      CM_MLPERF_LAST_RELEASE: v4.1
+      CM_MLPERF_LAST_RELEASE: v5.0
   deepsparse:
     env:
-      CM_MLPERF_LAST_RELEASE: v4.1
+      CM_MLPERF_LAST_RELEASE: v5.0
       CM_TMP_GIT_CHECKOUT: deepsparse
       CM_TMP_GIT_URL: https://github.com/neuralmagic/inference
   main: