diff --git a/packages/grafana-prometheus/src/querybuilder/aggregations.ts b/packages/grafana-prometheus/src/querybuilder/aggregations.ts
index d4129c3665e..8fff6505173 100644
--- a/packages/grafana-prometheus/src/querybuilder/aggregations.ts
+++ b/packages/grafana-prometheus/src/querybuilder/aggregations.ts
@@ -28,6 +28,10 @@ export function getAggregationOperations(): QueryBuilderOperationDef[] {
       params: [{ name: 'Identifier', type: 'string' }],
       defaultParams: ['count'],
     }),
+    ...createAggregationOperationWithParam(PromOperationId.Quantile, {
+      params: [{ name: 'Value', type: 'number' }],
+      defaultParams: [1],
+    }),
     createAggregationOverTime(PromOperationId.SumOverTime),
     createAggregationOverTime(PromOperationId.AvgOverTime),
     createAggregationOverTime(PromOperationId.MinOverTime),
diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/state/templates.ts b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/templates.ts
index 330de01da2f..6e455accdb9 100644
--- a/packages/grafana-prometheus/src/querybuilder/components/promQail/state/templates.ts
+++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/state/templates.ts
@@ -76,6 +76,10 @@ export const generalTemplates: TemplateData[] = [
     template: 'count_values("aaaa",metric_a{})',
     description: 'Count number of label values for a label named "aaaa"',
   },
+  {
+    template: 'quantile by(l) (1,metric_a)',
+    description: 'Quantile of series in the metric "metric_a" grouped by the label "l"',
+  },
 ];
 
 export const counterTemplates: TemplateData[] = [
diff --git a/packages/grafana-prometheus/src/querybuilder/operations.ts b/packages/grafana-prometheus/src/querybuilder/operations.ts
index cb83b0a44d6..afd77331239 100644
--- a/packages/grafana-prometheus/src/querybuilder/operations.ts
+++ b/packages/grafana-prometheus/src/querybuilder/operations.ts
@@ -230,12 +230,6 @@ export function getOperationDefinitions(): QueryBuilderOperationDef[] {
       id: PromOperationId.Pi,
       renderer: (model) => `${model.id}()`,
     }),
-    createFunction({
-      id: PromOperationId.Quantile,
-      params: [{ name: 'Value', type: 'number' }],
-      defaultParams: [1],
-      renderer: functionRendererLeft,
-    }),
     createFunction({ id: PromOperationId.Rad }),
     createRangeFunction(PromOperationId.Resets),
     createFunction({