diff --git a/ads/aqua/common/utils.py b/ads/aqua/common/utils.py
index c36fc3cab..a1df4a99b 100644
--- a/ads/aqua/common/utils.py
+++ b/ads/aqua/common/utils.py
@@ -1288,7 +1288,9 @@ def load_gpu_shapes_index(
         try:
             auth = auth or authutil.default_signer()
             # Construct the object storage path. Adjust bucket name and path as needed.
-            storage_path = f"oci://{CONDA_BUCKET_NAME}@{CONDA_BUCKET_NS}/{file_name}/1"
+            storage_path = (
+                f"oci://{CONDA_BUCKET_NAME}@{CONDA_BUCKET_NS}/service_pack/{file_name}"
+            )
             logger.debug("Loading GPU shapes index from Object Storage")
             with fsspec.open(storage_path, mode="r", **auth) as file_obj:
                 data = json.load(file_obj)
diff --git a/ads/aqua/modeldeployment/deployment.py b/ads/aqua/modeldeployment/deployment.py
index 0695c9374..1d55a0dc3 100644
--- a/ads/aqua/modeldeployment/deployment.py
+++ b/ads/aqua/modeldeployment/deployment.py
@@ -1310,7 +1310,8 @@ def list_shapes(self, **kwargs) -> List[ComputeShapeSummary]:
                 memory_in_gbs=oci_shape.memory_in_gbs,
                 shape_series=oci_shape.shape_series,
                 name=oci_shape.name,
-                gpu_specs=gpu_specs.shapes.get(oci_shape.name),
+                gpu_specs=gpu_specs.shapes.get(oci_shape.name)
+                or gpu_specs.shapes.get(oci_shape.name.upper()),
             )
             for oci_shape in oci_shapes
         ]