diff --git a/core/src/validator.rs b/core/src/validator.rs
index b66ac4a0a3..0841b25662 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -17,7 +17,7 @@ use crate::service::Service;
 use crate::storage_stage::StorageState;
 use crate::tpu::Tpu;
 use crate::tvu::{Sockets, Tvu};
-use solana_metrics::inc_new_counter_info;
+use solana_metrics::datapoint_info;
 use solana_sdk::genesis_block::GenesisBlock;
 use solana_sdk::poh_config::PohConfig;
 use solana_sdk::pubkey::Pubkey;
@@ -264,7 +264,7 @@ impl Validator {
             &exit,
         );
 
-        inc_new_counter_info!("fullnode-new", 1);
+        datapoint_info!("validator-new");
         Self {
             id,
             gossip_service,
diff --git a/metrics/scripts/adjust-dashboard-for-channel.py b/metrics/scripts/adjust-dashboard-for-channel.py
index e802e409fd..152c67675c 100755
--- a/metrics/scripts/adjust-dashboard-for-channel.py
+++ b/metrics/scripts/adjust-dashboard-for-channel.py
@@ -46,7 +46,24 @@ if channel == 'local':
                                                 'text': 'testnet',
                                                 'value': 'testnet'}],
                                    'query': 'testnet',
-                                   'type': 'custom'}]
+                                   'type': 'custom'},
+                                   {'allValue': ".*",
+                                    'datasource': '$datasource',
+                                    'hide': 0,
+                                    'includeAll': True,
+                                    'label': 'HostID',
+                                    'multi': False,
+                                    'name': 'hostid',
+                                    'options': [],
+                                    'query': 'SELECT DISTINCT(\"host_id\") FROM \"$testnet\".\"autogen\".\"validator-new\" ',
+                                    'refresh': 2,
+                                    'regex': '',
+                                    'sort': 1,
+                                    'tagValuesQuery': '',
+                                    'tags': [],
+                                    'tagsQuery': '',
+                                    'type': 'query',
+                                    'useTags': False}]
 
 elif channel == 'stable':
     # Stable dashboard only allows the user to select between the stable
@@ -121,7 +138,7 @@ else:
                                     'multi': False,
                                     'name': 'hostid',
                                     'options': [],
-                                    'query': 'SELECT DISTINCT(\"host_id\") FROM \"$testnet\".\"autogen\".\"counter-fullnode-new\" ',
+                                    'query': 'SELECT DISTINCT(\"host_id\") FROM \"$testnet\".\"autogen\".\"validator-new\" ',
                                     'refresh': 2,
                                     'regex': '',
                                     'sort': 1,