diff --git a/util/dvsim/Deploy.py b/util/dvsim/Deploy.py
index 0c0f4ee..6cd7eec 100644
--- a/util/dvsim/Deploy.py
+++ b/util/dvsim/Deploy.py
@@ -772,8 +772,7 @@
             "proj_root": False,
             "uvm_test": False,
             "uvm_test_seq": False,
-            "sw_test": False,
-            "sw_test_is_prebuilt": False,
+            "sw_images": False,
             "sw_build_device": False,
             "sw_build_dir": False,
             "run_dir": False,
diff --git a/util/dvsim/Modes.py b/util/dvsim/Modes.py
index 27ee9bd..33b5870 100644
--- a/util/dvsim/Modes.py
+++ b/util/dvsim/Modes.py
@@ -298,8 +298,7 @@
         self.uvm_test_seq = ""
         self.build_mode = ""
         self.en_run_modes = []
-        self.sw_test = ""
-        self.sw_test_is_prebuilt = ""
+        self.sw_images = []
         self.sw_build_device = ""
 
         super().__init__(rdict)
@@ -325,8 +324,7 @@
         "uvm_test": "",
         "uvm_test_seq": "",
         "build_mode": "",
-        "sw_test": "",
-        "sw_test_is_prebuilt": "",
+        "sw_images": [],
         "sw_build_device": "",
     }
 
diff --git a/util/dvsim/SimCfg.py b/util/dvsim/SimCfg.py
index a1800f2..05b571e 100644
--- a/util/dvsim/SimCfg.py
+++ b/util/dvsim/SimCfg.py
@@ -155,7 +155,7 @@
         # TODO: Find a way to set these in sim cfg instead
         ignored_wildcards = [
             "build_mode", "index", "test", "seed", "uvm_test", "uvm_test_seq",
-            "cov_db_dirs", "sw_test", "sw_test_is_prebuilt", "sw_build_device"
+            "cov_db_dirs", "sw_images", "sw_build_device"
         ]
         self.__dict__ = find_and_substitute_wildcards(self.__dict__,
                                                       self.__dict__,