diff --git a/public/app/plugins/datasource/jaeger/plugin.json b/public/app/plugins/datasource/jaeger/plugin.json
index 884c310d05c..4a0714ca0a3 100644
--- a/public/app/plugins/datasource/jaeger/plugin.json
+++ b/public/app/plugins/datasource/jaeger/plugin.json
@@ -4,7 +4,7 @@
   "id": "jaeger",
   "category": "tracing",
 
-  "metrics": false,
+  "metrics": true,
   "alerting": false,
   "annotations": false,
   "logs": false,
diff --git a/public/app/plugins/datasource/tempo/module.ts b/public/app/plugins/datasource/tempo/module.ts
index 5d301c3855e..595e750d257 100644
--- a/public/app/plugins/datasource/tempo/module.ts
+++ b/public/app/plugins/datasource/tempo/module.ts
@@ -5,6 +5,6 @@ import { TempoDatasource } from './datasource';
 import { TempoQueryField } from './QueryEditor/QueryField';
 
 export const plugin = new DataSourcePlugin(TempoDatasource)
+  .setQueryEditor(TempoQueryField)
   .setConfigEditor(ConfigEditor)
-  .setQueryEditorHelp(CheatSheet)
-  .setExploreQueryField(TempoQueryField);
+  .setQueryEditorHelp(CheatSheet);
diff --git a/public/app/plugins/datasource/tempo/plugin.json b/public/app/plugins/datasource/tempo/plugin.json
index 4451adc8cd2..ab38a4a827f 100644
--- a/public/app/plugins/datasource/tempo/plugin.json
+++ b/public/app/plugins/datasource/tempo/plugin.json
@@ -4,7 +4,7 @@
   "id": "tempo",
   "category": "tracing",
 
-  "metrics": false,
+  "metrics": true,
   "alerting": false,
   "annotations": false,
   "logs": false,
diff --git a/public/app/plugins/datasource/zipkin/module.ts b/public/app/plugins/datasource/zipkin/module.ts
index 25247aad315..4c77c8acd78 100644
--- a/public/app/plugins/datasource/zipkin/module.ts
+++ b/public/app/plugins/datasource/zipkin/module.ts
@@ -4,5 +4,5 @@ import { ZipkinQueryField } from './QueryField';
 import { ConfigEditor } from './ConfigEditor';
 
 export const plugin = new DataSourcePlugin(ZipkinDatasource)
-  .setConfigEditor(ConfigEditor)
-  .setExploreQueryField(ZipkinQueryField);
+  .setQueryEditor(ZipkinQueryField)
+  .setConfigEditor(ConfigEditor);
diff --git a/public/app/plugins/datasource/zipkin/plugin.json b/public/app/plugins/datasource/zipkin/plugin.json
index 46c755b819b..74bb006ff8d 100644
--- a/public/app/plugins/datasource/zipkin/plugin.json
+++ b/public/app/plugins/datasource/zipkin/plugin.json
@@ -4,7 +4,7 @@
   "id": "zipkin",
   "category": "tracing",
 
-  "metrics": false,
+  "metrics": true,
   "alerting": false,
   "annotations": false,
   "logs": false,