diff --git a/pkg/compute/models/capabilities.go b/pkg/compute/models/capabilities.go
index 602dcedc28..40cd0b9463 100644
--- a/pkg/compute/models/capabilities.go
+++ b/pkg/compute/models/capabilities.go
@@ -459,9 +459,11 @@ func getStorageTypes(
 				notFound = true
 				simpleStorage = &SimpleStorageInfo{Storages: []sStorage{}}
 			}
-			addStorageInfo(storage, simpleStorage)
-			sfs[storageType] = simpleStorage
-			hypervisorStorageInfos[storageHypervisor] = sfs
+			if !utils.IsInStringArray(storageHypervisor, api.PUBLIC_CLOUD_HYPERVISORS) {
+				addStorageInfo(storage, simpleStorage)
+				sfs[storageType] = simpleStorage
+				hypervisorStorageInfos[storageHypervisor] = sfs
+			}
 			return notFound
 		}
 	)