diff --git a/public/app/plugins/datasource/stackdriver/partials/query.aggregation.html b/public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
index ecbbeddf133..254c7b812cb 100755
--- a/public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
+++ b/public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
@@ -1,16 +1,16 @@
 <div class="gf-form-inline">
   <div class="gf-form">
     <label class="gf-form-label query-keyword width-9">Aggregation</label>
-    <div class="gf-form-select-wrapper gf-form-select-wrapper--caret-indent">
-      <stackdriver-picker
-        onChange="ctrl.handleAggregationChange"
-        selected="ctrl.target.aggregation.crossSeriesReducer"
-        options="ctrl.aggOptions"
-        searchable="true"
-        placeholder="'Select Aggregation'"
-        className="'width-15'"
-      ></stackdriver-picker>
-    </div>
+    <stackdriver-picker
+      onChange="ctrl.handleAggregationChange"
+      selected="ctrl.target.aggregation.crossSeriesReducer"
+      options="ctrl.aggOptions"
+      searchable="true"
+      placeholder="'Select Aggregation'"
+      className="'width-15'"
+      template-variables="ctrl.templateSrv.variables"
+      group-name="'Aggregations'"
+    ></stackdriver-picker>
   </div>
   <div class="gf-form gf-form--grow">
     <label class="gf-form-label gf-form-label--grow">
@@ -24,16 +24,16 @@
 <div class="gf-form-group" ng-if="ctrl.target.showAggregationOptions">
   <div class="gf-form offset-width-9">
     <label class="gf-form-label query-keyword width-15">Aligner</label>
-    <div class="gf-form-select-wrapper gf-form-select-wrapper--caret-indent">
-      <stackdriver-picker
-        onChange="ctrl.handleAlignmentChange"
-        selected="ctrl.target.aggregation.perSeriesAligner"
-        options="ctrl.alignOptions"
-        searchable="true"
-        placeholder="'Select Alignment'"
-        className="'width-15'"
-      ></stackdriver-picker>
-    </div>
+    <stackdriver-picker
+      onChange="ctrl.handleAlignmentChange"
+      selected="ctrl.target.aggregation.perSeriesAligner"
+      options="ctrl.alignOptions"
+      searchable="true"
+      placeholder="'Select Alignment'"
+      className="'width-15'"
+      template-variables="ctrl.templateSrv.variables"
+      group-name="'Alignment Options'"
+    ></stackdriver-picker>
 
     <div class="gf-form gf-form--grow"><div class="gf-form-label gf-form-label--grow"></div></div>
   </div>
@@ -41,16 +41,16 @@
 <div class="gf-form-inline">
   <div class="gf-form">
     <label class="gf-form-label query-keyword width-9">Alignment Period</label>
-    <div class="gf-form-select-wrapper gf-form-select-wrapper--caret-indent">
-      <stackdriver-picker
-        onChange="ctrl.handleAlignmentPeriodChange"
-        selected="ctrl.target.aggregation.alignmentPeriod"
-        options="ctrl.alignmentPeriods"
-        searchable="true"
-        placeholder="'Select Alignment'"
-        className="'width-15'"
-      ></stackdriver-picker>
-    </div>
+    <stackdriver-picker
+      onChange="ctrl.handleAlignmentPeriodChange"
+      selected="ctrl.target.aggregation.alignmentPeriod"
+      options="ctrl.alignmentPeriods"
+      searchable="true"
+      placeholder="'Select Alignment'"
+      className="'width-15'"
+      template-variables="ctrl.templateSrv.variables"
+      group-name="'Alignment Periods'"
+    ></stackdriver-picker>
   </div>
 
   <div class="gf-form gf-form--grow">