diff --git a/packages/apps-config/src/api/spec/origintrail.ts b/packages/apps-config/src/api/spec/origintrail.ts
index 98d8189d00..5ebd2d8897 100644
--- a/packages/apps-config/src/api/spec/origintrail.ts
+++ b/packages/apps-config/src/api/spec/origintrail.ts
@@ -1,203 +1,22 @@
 // Copyright 2017-2022 @polkadot/apps-config authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { DefinitionRpc, DefinitionRpcSub, OverrideBundleDefinition, OverrideBundleType } from '@polkadot/types/types';
+import type { OverrideBundleDefinition } from '@polkadot/types/types';
 
 // structs need to be in order
 /* eslint-disable sort-keys */
 
-export const rpcDefinitions: Record<string, Record<string, DefinitionRpc | DefinitionRpcSub>> = {
-  txpool: {
-    content: {
-      aliasSection: 'txpool',
-      description:
-                'The detailed information regarding Ethereum transactions that are currently in the ' +
-                'Substrate transaction pool.',
-      params: [],
-      type: 'TxPoolResultContent'
-    },
-    inspect: {
-      aliasSection: 'txpool',
-      description:
-                'Summarized information of the Ethereum transactions that are currently in the Substrate' +
-                ' transaction pool.',
-      params: [],
-      type: 'TxPoolResultInspect'
-    },
-    status: {
-      aliasSection: 'txpool',
-      description:
-                'The number of Ethereum transaction that are currently in the Substrate transaction pool.',
-      params: [],
-      type: 'TxPoolResultStatus'
-    }
-  }
-};
-
-// structs need to be in order
-/* eslint-disable sort-keys */
-
-const origintrailDefinitions = {
-  rpc: rpcDefinitions,
+const definitions: OverrideBundleDefinition = {
   types: [
     {
+      // on all versions
       minmax: [0, undefined],
       types: {
-        AccountId: 'EthereumAccountId',
-        AccountId32: 'H256',
-        AccountInfo: 'AccountInfoWithTripleRefCount',
         Address: 'AccountId',
-        AuthorId: 'AccountId32',
-        Balance: 'u128',
-        LookupSource: 'AccountId',
-        Account: {
-          nonce: 'U256',
-          balance: 'u128'
-        },
-        ExtrinsicSignature: 'EthereumSignature',
-        RoundIndex: 'u32',
-        Candidate: {
-          id: 'AccountId',
-          fee: 'Perbill',
-          bond: 'Balance',
-          nominators: 'Vec<Bond>',
-          total: 'Balance',
-          state: 'CollatorStatus'
-        },
-        Nominator: {
-          nominations: 'Vec<Bond>',
-          total: 'Balance'
-        },
-        NominatorStatus: {
-          _enum: ['Active', { Leaving: 'RoundIndex' }]
-        },
-        Nominator2: {
-          nominations: 'Vec<Bond>',
-          revocations: 'Vec<AccountId>',
-          total: 'Balance',
-          scheduled_revocations_count: 'u32',
-          scheduled_revocations_total: 'Balance',
-          status: 'NominatorStatus'
-        },
-        Bond: {
-          owner: 'AccountId',
-          amount: 'Balance'
-        },
-        CollatorStatus: {
-          _enum: ['Active', 'Idle', { Leaving: 'RoundIndex' }]
-        },
-        TxPoolResultContent: {
-          pending: 'HashMap<H160, HashMap<U256, PoolTransaction>>',
-          queued: 'HashMap<H160, HashMap<U256, PoolTransaction>>'
-        },
-        TxPoolResultInspect: {
-          pending: 'HashMap<H160, HashMap<U256, Summary>>',
-          queued: 'HashMap<H160, HashMap<U256, Summary>>'
-        },
-        TxPoolResultStatus: {
-          pending: 'U256',
-          queued: 'U256'
-        },
-        Summary: 'Bytes',
-        PoolTransaction: {
-          hash: 'H256',
-          nonce: 'U256',
-          block_hash: 'Option<H256>',
-          block_number: 'Option<U256>',
-          from: 'H160',
-          to: 'Option<H160>',
-          value: 'U256',
-          gas_price: 'U256',
-          gas: 'U256',
-          input: 'Bytes'
-        },
-        // Staking inflation
-        Range: 'RangeBalance',
-        RangeBalance: {
-          min: 'Balance',
-          ideal: 'Balance',
-          max: 'Balance'
-        },
-        RangePerbill: {
-          min: 'Perbill',
-          ideal: 'Perbill',
-          max: 'Perbill'
-        },
-        InflationInfo: {
-          expect: 'RangeBalance',
-          annual: 'RangePerbill',
-          round: 'RangePerbill'
-        },
-        OrderedSet: 'Vec<Bond>',
-        Collator: {
-          id: 'AccountId',
-          bond: 'Balance',
-          nominators: 'Vec<Bond>',
-          total: 'Balance',
-          state: 'CollatorStatus'
-        },
-        Collator2: {
-          id: 'AccountId',
-          bond: 'Balance',
-          nominators: 'Vec<AccountId>',
-          top_nominators: 'Vec<Bond>',
-          bottom_nominators: 'Vec<Bond>',
-          total_counted: 'Balance',
-          total_backing: 'Balance',
-          state: 'CollatorStatus'
-        },
-        NominatorAdded: {
-          _enum: [{ AddedToTop: 'Balance' }, 'AddedToBottom']
-        },
-        CollatorSnapshot: {
-          bond: 'Balance',
-          nominators: 'Vec<Bond>',
-          total: 'Balance'
-        },
-        SystemInherentData: {
-          validation_data: 'PersistedValidationData',
-          relay_chain_state: 'StorageProof',
-          downward_messages: 'Vec<InboundDownwardMessage>',
-          horizontal_messages: 'BTreeMap<ParaId, Vec<InboundHrmpMessage>>'
-        },
-        RelayChainAccountId: 'AccountId32',
-        RoundInfo: {
-          current: 'RoundIndex',
-          first: 'BlockNumber',
-          length: 'u32'
-        },
-        RewardInfo: {
-          total_reward: 'Balance',
-          claimed_reward: 'Balance'
-        },
-        RegistrationInfo: {
-          account: 'AccountId',
-          deposit: 'Balance'
-        },
-        ParachainBondConfig: {
-          account: 'AccountId',
-          deposit: 'Balance'
-        },
-        EthereumSignature: {
-          r: 'H256',
-          s: 'H256',
-          v: 'U8'
-        },
-        ExitQ: {
-          candidates: 'Vec<AccountId>',
-          nominators_leaving: 'Vec<AccountId>',
-          candidate_schedule: 'Vec<(AccountId, RoundIndex)>',
-          nominator_schedule: 'Vec<(AccountId, Option<AccountId>, RoundIndex)>'
-        }
+        LookupSource: 'AccountId'
       }
     }
   ]
-} as OverrideBundleDefinition;
+};
 
-export default origintrailDefinitions;
-
-export const typesBundle = {
-  spec: {
-    'origintrail-parachain': origintrailDefinitions
-  }
-} as OverrideBundleType;
+export default definitions;
diff --git a/packages/apps-config/src/endpoints/productionRelayPolkadot.ts b/packages/apps-config/src/endpoints/productionRelayPolkadot.ts
index 681af0f1e4..6409213138 100644
--- a/packages/apps-config/src/endpoints/productionRelayPolkadot.ts
+++ b/packages/apps-config/src/endpoints/productionRelayPolkadot.ts
@@ -250,6 +250,16 @@ export function createPolkadot (t: TFunction): EndpointOption {
           Dwellir: 'wss://eden-rpc.dwellir.com'
         }
       },
+      {
+        info: 'origintrail-parachain',
+        homepage: 'https://parachain.origintrail.io',
+        isUnreachable: true,
+        text: t('rpc.polkadot.origintrail', 'OriginTrail Parachain', { ns: 'apps-config' }),
+        paraId: 2042,
+        providers: {
+          TraceLabs: 'wss://parachain-rpc.origin-trail.network'
+        }
+      },
       {
         info: 'parallel',
         homepage: 'https://parallel.fi',
diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts
index 673d588081..adaa8b05c4 100644
--- a/packages/apps-config/src/endpoints/testing.ts
+++ b/packages/apps-config/src/endpoints/testing.ts
@@ -368,13 +368,6 @@ export function createTesting (t: TFunction, firstOnly: boolean, withSort: boole
         'Standard Protocol': 'wss://rpc.opportunity.standard.tech'
       }
     },
-    {
-      info: 'origintrail-parachain-testnet',
-      text: t('rpc.test.origintrail', 'OriginTrail Parachain Testnet', { ns: 'apps-config' }),
-      providers: {
-        'Trace Labs': 'wss://parachain-rpc.origin-trail.network'
-      }
-    },
     {
       info: 'pangolin',
       text: t('rpc.test.pangolin', 'Pangolin', { ns: 'apps-config' }),
diff --git a/packages/apps-config/src/settings/ethereumChains.ts b/packages/apps-config/src/settings/ethereumChains.ts
index 8ce421602f..5ef8cddf9f 100644
--- a/packages/apps-config/src/settings/ethereumChains.ts
+++ b/packages/apps-config/src/settings/ethereumChains.ts
@@ -7,6 +7,5 @@ export const ethereumChains = [
   'moonbase',
   'moonbeam',
   'moonriver',
-  'moonshadow',
-  'origintrail-parachain'
+  'moonshadow'
 ];
diff --git a/packages/apps-config/src/ui/colors.ts b/packages/apps-config/src/ui/colors.ts
index c4e0c672af..b9011631b3 100644
--- a/packages/apps-config/src/ui/colors.ts
+++ b/packages/apps-config/src/ui/colors.ts
@@ -69,6 +69,7 @@ const chainMoonsama = '#000000';
 const chainNeumann = '#A8278C';
 const chainNFTMart = '#815287';
 const chainNodle = '#1ab394';
+const chainOriginTrail = '#FB5DEB';
 const chainPangolin = '#5744ff';
 const chainPangoro = '#5745de';
 const chainParallel = '#ef18ac';
@@ -185,7 +186,6 @@ const nodeNFTMart = '#307182';
 const nodeNodle = '#1ab394';
 const nodeOdyssey = '#1295F0';
 const nodeOpportunity = '#6143bc';
-const nodeOriginTrail = '#131415';
 const nodePangolin = '#5744ff';
 const nodePangoro = '#5745de';
 const nodeParallel = '#ef18ac';
@@ -358,8 +358,7 @@ export const chainColors: Record<string, string> = Object.entries({
   'Nodle Testing Parachain': chainNodle,
   Odyssey: nodeOdyssey,
   'Opal Node': chainOpal,
-  'OriginTrail Parachain': nodeOriginTrail,
-  'OriginTrail Parachain Testnet': nodeOriginTrail,
+  'OriginTrail Parachain': chainOriginTrail,
   Pangolin: chainPangolin,
   'Pangolin Parachain': chainPangolin,
   Pangoro: chainPangoro,
@@ -490,7 +489,6 @@ export const nodeColors = Object.entries({
   'nodle chain node': nodeNodle,
   'Opal Node': nodeOpal,
   'Opportunity Standalone Testnet': nodeOpportunity,
-  'OriginTrail Parachain': nodeOriginTrail,
   Pangolin: nodePangolin,
   'Pangolin Parachain': nodePangolin,
   Pangoro: nodePangoro,
diff --git a/packages/apps-config/src/ui/logos/chains/origintrail.png b/packages/apps-config/src/ui/logos/chains/origintrail.png
new file mode 100644
index 0000000000..de6692cfe2
Binary files /dev/null and b/packages/apps-config/src/ui/logos/chains/origintrail.png differ
diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts
index 3c96f231d7..f2b9771ffa 100644
--- a/packages/apps-config/src/ui/logos/index.ts
+++ b/packages/apps-config/src/ui/logos/index.ts
@@ -35,6 +35,7 @@ import chainListen from './chains/listen.png';
 import chainMangata from './chains/mangatax.svg';
 import chainMoonsamaDevelopment from './chains/moonsama.png';
 import chainOpal from './chains/opal-logo.png';
+import chainOriginTrail from './chains/origintrail.png';
 import chainParallel from './chains/parallel.svg';
 import chainComposable from './chains/picasso.svg';
 import chainQuartz from './chains/quartz.png';
@@ -136,7 +137,6 @@ import nodeNodle from './nodes/nodle.svg';
 import oak from './nodes/oak.png';
 import nodeUniqueWestend from './nodes/opal-logo.png';
 import nodeOpportunity from './nodes/opportunity.png';
-import nodeOriginTrail from './nodes/origintrail.png';
 import nodePangolin from './nodes/pangolin.svg';
 import nodePangoro from './nodes/pangoro.svg';
 import nodeParallel from './nodes/parallel.svg';
@@ -312,8 +312,7 @@ export const chainLogos = Object.entries({
   'NFTMart Testnet': nodeNFTMart,
   Odyssey: nodeAresGladios,
   'OPAL by UNIQUE': chainOpal,
-  'OriginTrail Parachain': nodeOriginTrail,
-  'OriginTrail Parachain Testnet': nodeOriginTrail,
+  'OriginTrail Parachain': chainOriginTrail,
   Pangolin: nodePangolin,
   Pangoro: nodePangoro,
   Parallel: chainParallel,
@@ -488,8 +487,6 @@ export const nodeLogos = Object.entries({
   'Nodle Chain Node': nodeNodle,
   'Opal Node': nodeUniqueWestend,
   'Opportunity Standalone Testnet': nodeOpportunity,
-  'OriginTrail Parachain': nodeOriginTrail,
-  'OriginTrail Parachain Testnet': nodeOriginTrail,
   Pangolin: nodePangolin,
   Pangoro: nodePangoro,
   Parallel: nodeParallel,
@@ -689,7 +686,7 @@ export const namedLogos: Record<string, unknown> = {
   odyssey: nodeAresGladios,
   opal: nodeUniqueWestend,
   opportunity: nodeOpportunity,
-  'origintrail-parachain-testnet': nodeOriginTrail,
+  'origintrail-parachain': chainOriginTrail,
   pangolin: nodePangolin,
   pangoro: nodePangoro,
   parallel: chainParallel,
@@ -745,7 +742,6 @@ export const namedLogos: Record<string, unknown> = {
   rococoMoonrock: nodeMoonrock,
   rococoMoonsama: chainMoonsamaDevelopment,
   rococoNodle: nodeNodle,
-  rococoOriginTrail: nodeOriginTrail,
   rococoPangolin: nodePangolin,
   rococoParami: nodeParami,
   rococoPhala: nodePhala,
diff --git a/packages/apps-config/src/ui/logos/nodes/origintrail.png b/packages/apps-config/src/ui/logos/nodes/origintrail.png
deleted file mode 100644
index 95480273ce..0000000000
Binary files a/packages/apps-config/src/ui/logos/nodes/origintrail.png and /dev/null differ
diff --git a/packages/apps/public/locales/it/translation.json b/packages/apps/public/locales/it/translation.json
index cf6864047f..4f4d4a45db 100644
--- a/packages/apps/public/locales/it/translation.json
+++ b/packages/apps/public/locales/it/translation.json
@@ -1769,7 +1769,6 @@
   "rpc.mandala": "Mandala (Acala Testnet, ospitato by Acala)",
   "rpc.manta": "",
   "rpc.nodle-arcadia": "Arcadia (Nodle Testnet, ospitato da Nodle)",
-  "rpc.origintrail": "",
   "rpc.phoenix": "PHOENIX Protocol (PHOENIX Mashnet, ospitato da PHOENIX Protocol)",
   "rpc.polkadot.darwinia": "Darwinia",
   "rpc.polkadot.parity": "",
@@ -2135,4 +2134,4 @@
   "{{threshold}}, passing": "{{threshold}}, approvato",
   "{{type}} copied": "{{type}} copiato",
   "{{value}}x voting balance, locked for {{lock}}x enactment ({{period}} days)": "{{value}} x moltiplicatore di voto, fondi bloccati per {{lock}}x = {{period}} giorni"
-}
\ No newline at end of file
+}
diff --git a/packages/apps/public/locales/ru/translation.json b/packages/apps/public/locales/ru/translation.json
index 4aa83deb94..f151c0088e 100644
--- a/packages/apps/public/locales/ru/translation.json
+++ b/packages/apps/public/locales/ru/translation.json
@@ -1893,7 +1893,6 @@
   "rpc.rococo.manta": "",
   "rpc.rococo.mathchain": "",
   "rpc.rococo.moonrock": "",
-  "rpc.rococo.origintrail": "",
   "rpc.rococo.parami": "",
   "rpc.rococo.phala": "",
   "rpc.rococo.phoenix": "",
@@ -1954,7 +1953,6 @@
   "rpc.test.nodle-arcadia": "",
   "rpc.test.oak": "",
   "rpc.test.opportunity": "",
-  "rpc.test.origintrail": "",
   "rpc.test.pangolin": "",
   "rpc.test.pangoro": "",
   "rpc.test.phala": "",
@@ -2214,4 +2212,4 @@
   "{{threshold}}, passing": "{{threshold}}, проходит",
   "{{type}} copied": "",
   "{{value}}x voting balance, locked for {{lock}}x enactment ({{period}} days)": "{{value}}x баланс голосования, заблокировано на {{lock}}x ({{period}} дней)"
-}
\ No newline at end of file
+}