diff --git a/package.json b/package.json
index 7717c6b..f85af54 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quickwit-datasource",
-  "version": "0.8.1+paypay",
+  "version": "0.8.2+paypay_debug",
   "description": "Quickwit datasource",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",
diff --git a/src/datasource/base.ts b/src/datasource/base.ts
index 29add04..b206c0f 100644
--- a/src/datasource/base.ts
+++ b/src/datasource/base.ts
@@ -402,7 +402,12 @@ export class BaseQuickwitDataSource
     }
 
     adhocFilters.forEach((filter) => {
-      finalQuery = addAddHocFilter(finalQuery, filter);
+      // Replace template variables in filter values
+      const interpolatedFilter = {
+        ...filter,
+        value: this.templateSrv.replace(filter.value),
+      };
+      finalQuery = addAddHocFilter(finalQuery, interpolatedFilter);
     });
 
     return finalQuery;