diff --git a/webapp/src/components/GeoMap/CountryMap.js b/webapp/src/components/GeoMap/CountryMap.js
index 6e8faa4b..90e4c64c 100644
--- a/webapp/src/components/GeoMap/CountryMap.js
+++ b/webapp/src/components/GeoMap/CountryMap.js
@@ -105,7 +105,7 @@ const ClusterMap = ({ data, map, mapCode }) => {
                 const producer = this?.point?.producer
 
                 return producer?.owner
-                  ? `<a href=/${eosConfig.producersRoute}/${producer?.owner}>${producer?.owner}</a>`
+                  ? `<a href=/${eosConfig.producersRoute}/${producer?.owner}>${producer?.fio_address || producer?.owner}</a>`
                   : ''
               },
             },
diff --git a/webapp/src/components/ProducersChart/index.js b/webapp/src/components/ProducersChart/index.js
index eeff10f6..f8ffef65 100644
--- a/webapp/src/components/ProducersChart/index.js
+++ b/webapp/src/components/ProducersChart/index.js
@@ -105,7 +105,7 @@ const CustomBarLabel = memo(
           fontFamily="Roboto, Helvetica, Arial, sans-serif;"
           fontWeight={isProducing ? 'bold' : 'normal'}
         >
-          {payload.owner}
+          {payload.name ? payload.name?.replace('@fiotestnet','')?.substring(0, 12) + '...' : payload.owner}
         </text>
       )
 
diff --git a/webapp/src/gql/producer.gql.js b/webapp/src/gql/producer.gql.js
index 8e94134d..a7b37622 100644
--- a/webapp/src/gql/producer.gql.js
+++ b/webapp/src/gql/producer.gql.js
@@ -20,6 +20,7 @@ export const PRODUCERS_QUERY = gql`
     ) {
       id
       owner
+      fio_address
       url
       total_votes
       bp_json
@@ -35,7 +36,6 @@ export const PRODUCERS_QUERY = gql`
         type
         value
       }
-      fio_address
     }
   }
 `
@@ -51,6 +51,7 @@ export const PRODUCER_INFO_QUERY = gql`
     ) {
       id
       owner
+      fio_address
       url
       bp_json
       total_votes_eos
@@ -91,6 +92,7 @@ export const SMALL_PRODUCERS_QUERY = gql`
     ) {
       id
       owner
+      fio_address
       url
       bp_json
       total_votes_eos
@@ -146,6 +148,7 @@ const NODES_OPERATION = type => gql`
     ) {
       id
       owner
+      fio_address
       rank
       producer_key
       bp_json
@@ -190,6 +193,7 @@ const ENDPOINTS_OPERATION = type => gql`
     ) {
       id
       owner
+      fio_address
       updated_at
       endpoints: endpoints_list(where: $endpointFilter, order_by: { value: asc }) {
         type
@@ -308,6 +312,7 @@ export const ALL_NODES_QUERY = gql`
     ) {
       id
       owner
+      fio_address
       bp_json
       updated_at
     }
diff --git a/webapp/src/hooks/customHooks/useEndpointsState.js b/webapp/src/hooks/customHooks/useEndpointsState.js
index b7e2f4fb..8cea128e 100644
--- a/webapp/src/hooks/customHooks/useEndpointsState.js
+++ b/webapp/src/hooks/customHooks/useEndpointsState.js
@@ -32,7 +32,8 @@ const useEndpointsState = () => {
         const inserted = []
 
         const bpName =
-          producer.bp_json?.org?.candidate_name ||
+          producer?.fio_address ||
+          producer?.bp_json?.org?.candidate_name ||
           producer?.bp_json?.org?.organization_name ||
           producer?.owner
 
diff --git a/webapp/src/routes/ProducerProfile/ProfileCard.js b/webapp/src/routes/ProducerProfile/ProfileCard.js
index 7961a838..bcd58ce6 100644
--- a/webapp/src/routes/ProducerProfile/ProfileCard.js
+++ b/webapp/src/routes/ProducerProfile/ProfileCard.js
@@ -119,7 +119,7 @@ const ProfileCard = ({ producer }) => {
       <div className={classes.profile}>
         <ProducerName
           name={producer?.media?.name || producer?.owner}
-          account={producer?.media?.name ? producer?.owner : ''}
+          account={producer?.media?.name ? (producer?.fio_address || producer?.owner) : ''}
           text={t('BPonNetwork', {
             networkName: eosConfig.networkLabel,
             position: producer?.media?.account,