diff --git a/internal/liquids/manila/liquid.go b/internal/liquids/manila/liquid.go
index 67f2d3e9..271cb4b2 100644
--- a/internal/liquids/manila/liquid.go
+++ b/internal/liquids/manila/liquid.go
@@ -215,10 +215,10 @@ const (
 	snapshotCapacityQuery = `sum   by (availability_zone_name, project_id, share_type_id) (max by (availability_zone_name, id, project_id, share_id, share_type_id) (last_over_time(openstack_manila_snapshot_size_gauge[15m])))`
 
 	// queries for netapp-exporter metrics
-	sharePhysicalUsageQuery      = `sum by (availability_zone, project_id, share_type) (max by (availability_zone, project_id, share_id, share_type) (last_over_time(netapp_volume_used_bytes         {project_id!="",share_type!="",volume_type!="dp",volume_state="online"}[15m])))`
-	snapshotPhysicalUsageQuery   = `sum by (availability_zone, project_id, share_type) (max by (availability_zone, project_id, share_id, share_type) (last_over_time(netapp_volume_snapshot_used_bytes{project_id!="",share_type!="",volume_type!="dp",volume_state="online"}[15m])))`
-	snapmirrorUsageQuery         = `sum by (availability_zone, project_id, share_type) (max by (availability_zone, project_id, share_id, share_type) (last_over_time(netapp_volume_total_bytes        {project_id!="",share_type!="",volume_type!="dp",volume_state="online",snapshot_policy="EC2_Backups"}[15m])))`
-	snapmirrorPhysicalUsageQuery = `sum by (availability_zone, project_id, share_type) (max by (availability_zone, project_id, share_id, share_type) (last_over_time(netapp_volume_used_bytes         {project_id!="",share_type!="",volume_type!="dp",volume_state="online",snapshot_policy="EC2_Backups"}[15m])))`
+	sharePhysicalUsageQuery      = `sum by (project_id, availability_zone, share_type) (max by (availability_zone, project_id, share_id, share_type) (last_over_time(netapp_volume_size_used{app="netapp-harvest-exporter-manila"}[15m])		* on(app, volume) group_left() max by (app, volume) (netapp_volume_labels{project_id!="",share_type!="",volume_type!="dp",state="online"})))`
+	snapshotPhysicalUsageQuery   = `sum by (project_id, availability_zone, share_type) (max by (availability_zone, project_id, share_id, share_type) (last_over_time(netapp_volume_snapshots_size_used{app="netapp-harvest-exporter-manila"}[15m])  * on(app, volume) group_left() max by (app, volume) (netapp_volume_labels{project_id!="",share_type!="",volume_type!="dp",state="online"})))`
+	snapmirrorUsageQuery         = `sum by (project_id, availability_zone, share_type) (max by (availability_zone, project_id, share_id, share_type) (last_over_time(netapp_volume_size_total{app="netapp-harvest-exporter-manila"}[15m])		* on(app, volume) group_left() max by (app, volume) (netapp_volume_labels{project_id!="",share_type!="",volume_type!="dp",state="online",snapshot_policy="EC2_Backups"})))`
+	snapmirrorPhysicalUsageQuery = `sum by (project_id, availability_zone, share_type) (max by (availability_zone, project_id, share_id, share_type) (last_over_time(netapp_volume_size_used{app="netapp-harvest-exporter-manila"}[15m])		* on(app, volume) group_left() max by (app, volume) (netapp_volume_labels{project_id!="",share_type!="",volume_type!="dp",state="online",snapshot_policy="EC2_Backups"})))`
 )
 
 type azMetricsKey struct {