diff --git a/procyon_ai/config/ai_computer_vision_openvino_gpu.def b/procyon_ai/config/ai_computer_vision_openvino_gpu.def
index 170c84d..ba7ca7a 100644
--- a/procyon_ai/config/ai_computer_vision_openvino_gpu.def
+++ b/procyon_ai/config/ai_computer_vision_openvino_gpu.def
@@ -18,7 +18,7 @@
   <settings>
     <setting>
       <name>ai_device_type</name>
-      <value>GPU</value><!--Options: CPU, GPU, GPU.0, GPU.1, NPU. Run "ProcyonCmd.exe list-openvino-devices" to list the options. Check "ProcyonCmd.exe -h" for the correct parameter syntax. -->
+      <value></value><!--Options: CPU, GPU, GPU.0, GPU.1, NPU. Run "ProcyonCmd.exe list-openvino-devices" to list the options. Check "ProcyonCmd.exe -h" for the correct parameter syntax. -->
     </setting>
     <setting>
       <name>ai_inference_precision</name>
diff --git a/procyon_ai/manifest.yaml b/procyon_ai/manifest.yaml
index 80ccc28..c54cea8 100644
--- a/procyon_ai/manifest.yaml
+++ b/procyon_ai/manifest.yaml
@@ -8,9 +8,11 @@ options:
     type: select
     values:
       - "AMD_CPU"
-      - "AMD_GPU"
+      - "AMD_GPU0"
+      - "AMD_GPU1"
       - "Intel_CPU"
-      - "Intel_GPU"
+      - "Intel_GPU0"
+      - "Intel_GPU1"
       - "Intel_NPU"
       - "NVIDIA_GPU"
       - "Qualcomm_HTP"
diff --git a/procyon_ai/ulprocai.py b/procyon_ai/ulprocai.py
index 5dd2936..3b0c8c5 100644
--- a/procyon_ai/ulprocai.py
+++ b/procyon_ai/ulprocai.py
@@ -62,14 +62,14 @@ BENCHMARK_CONFIG = {
     "Intel_GPU0": {
         "config": f"\"{CONFIG_DIR}\\ai_computer_vision_openvino_gpu.def\"",
         "process_name":  "OpenVino.exe",
-        "device_id": "GPU.0",
+        "device_id": "GPU.0" if "GPU.0" in list(OPENVINO_DEVICES.keys()) else "GPU",
         "device_name": get_openvino_gpu(OPENVINO_DEVICES ,"GPU.0"),
         "test_name": "Intel OpenVINO GPU 0 (FLOAT32)"
     },
     "Intel_GPU1": {
         "config": f"\"{CONFIG_DIR}\\ai_computer_vision_openvino_gpu.def\"",
         "process_name":  "OpenVino.exe",
-        "device_id": "GPU.1",
+        "device_id": "GPU.1" if "GPU.1" in list(OPENVINO_DEVICES.keys()) else "GPU",
         "device_name": get_openvino_gpu(OPENVINO_DEVICES ,"GPU.0"),
         "test_name": "Intel OpenVINO GPU 1 (FLOAT32)"
     },
@@ -77,7 +77,7 @@ BENCHMARK_CONFIG = {
         "config": f"\"{CONFIG_DIR}\\ai_computer_vision_openvino_npu.def\"",
         "process_name":  "OpenVino.exe",
         "device_id": "NPU",
-        "device_name": OPENVINO_DEVICES["NPU"],
+        "device_name": OPENVINO_DEVICES.get("NPU", "None"),
         "test_name": "Intel OpenVINO NPU (FLOAT32)"
     },
     "NVIDIA_GPU": {