diff --git a/automation/script/module.py b/automation/script/module.py
index f0e57b4d2..939d6d984 100644
--- a/automation/script/module.py
+++ b/automation/script/module.py
@@ -4483,7 +4483,7 @@ def prepare_and_run_script_with_postprocessing(i, postprocess="postprocess"):
     posthook_deps = i.get('posthook_deps', [])
     add_deps_recursive = i.get('add_deps_recursive', {})
     recursion_spaces = i['recursion_spaces']
-    remembered_selections = i.get('remembered_selections', {})
+    remembered_selections = i.get('remembered_selections', [])
     variation_tags_string = i.get('variation_tags_string', '')
     found_cached = i.get('found_cached', False)
     script_automation = i['self']
diff --git a/automation/script/module_misc.py b/automation/script/module_misc.py
index 2db29879b..eef21e637 100644
--- a/automation/script/module_misc.py
+++ b/automation/script/module_misc.py
@@ -1447,7 +1447,6 @@ def dockerfile(i):
 
         run_cmd  = r['run_cmd_string']
 
-
         cm_repo = i.get('docker_cm_repo', docker_settings.get('cm_repo', 'mlcommons@cm4mlops'))
         cm_repo_flags = i.get('docker_cm_repo_flags', docker_settings.get('cm_repo_flags', ''))
 
@@ -1769,7 +1768,7 @@ def docker(i):
             run_state = {'deps':[], 'fake_deps':[], 'parent': None}
             run_state['script_id'] = script_alias + "," + script_uid
             run_state['script_variation_tags'] = variation_tags
-            r = script_automation._run_deps(deps, [], env, {}, {}, {}, {}, '', {}, '', False, '', verbose, show_time, ' ', run_state)
+            r = script_automation._run_deps(deps, [], env, {}, {}, {}, {}, '', [], '', False, '', verbose, show_time, ' ', run_state)
             if r['return'] > 0:
                 return r
 
diff --git a/script/app-mlperf-inference/_cm.yaml b/script/app-mlperf-inference/_cm.yaml
index a8f363c23..72602d737 100644
--- a/script/app-mlperf-inference/_cm.yaml
+++ b/script/app-mlperf-inference/_cm.yaml
@@ -1246,6 +1246,7 @@ docker:
   shm_size: '32gb'
   extra_run_args: ' --ulimit memlock=-1 --cap-add SYS_ADMIN --cap-add SYS_TIME --security-opt apparmor=unconfined --security-opt seccomp=unconfined'
   docker_os: ubuntu
+  docker_cm_repo: gateoverflow@cm4mlops
   docker_real_run: False
   docker_os_version: '22.04'
   docker_input_mapping:
diff --git a/script/run-mlperf-inference-app/customize.py b/script/run-mlperf-inference-app/customize.py
index 4cde135db..1e7b13761 100644
--- a/script/run-mlperf-inference-app/customize.py
+++ b/script/run-mlperf-inference-app/customize.py
@@ -215,6 +215,8 @@ def preprocess(i):
             r = cm.access(ii)
             if r['return'] > 0:
                 return r
+            if state.get('docker', {}):
+                del(state['docker'])
 
         if env.get("CM_MLPERF_LOADGEN_COMPLIANCE", "") == "yes":
             for test in test_list:
@@ -229,6 +231,8 @@ def preprocess(i):
                 r = cm.access(ii)
                 if r['return'] > 0:
                     return r
+                if state.get('docker', {}):
+                    del(state['docker'])
 
     if state.get("cm-mlperf-inference-results"):
         #print(state["cm-mlperf-inference-results"])