diff --git a/core/web/resolver/feeds_manager_chain_config_test.go b/core/web/resolver/feeds_manager_chain_config_test.go
index 957583dbb7d..b4118cfa873 100644
--- a/core/web/resolver/feeds_manager_chain_config_test.go
+++ b/core/web/resolver/feeds_manager_chain_config_test.go
@@ -375,6 +375,81 @@ func Test_CreateFeedsManagerChainConfig(t *testing.T) {
 				}
 			}`,
 		},
+		{
+			name:          "success Tron",
+			authenticated: true,
+			before: func(ctx context.Context, f *gqlTestFramework) {
+				f.App.On("GetFeedsService").Return(f.Mocks.feedsSvc)
+				f.Mocks.feedsSvc.On("CreateChainConfig", mock.Anything, feeds.ChainConfig{
+					FeedsManagerID:          mgrID,
+					ChainType:               feeds.ChainTypeTron,
+					ChainID:                 chainID,
+					AccountAddress:          accountAddr,
+					AccountAddressPublicKey: null.StringFrom(acctAddrPubKey),
+					AdminAddress:            adminAddr,
+					FluxMonitorConfig: feeds.FluxMonitorConfig{
+						Enabled: false,
+					},
+					OCR1Config: feeds.OCR1Config{
+						Enabled:     true,
+						P2PPeerID:   peerID,
+						KeyBundleID: keyBundleID,
+					},
+					OCR2Config: feeds.OCR2ConfigModel{
+						Enabled:          true,
+						P2PPeerID:        peerID,
+						KeyBundleID:      keyBundleID,
+						ForwarderAddress: null.StringFrom(forwarderAddr),
+						Plugins: feeds.Plugins{
+							Commit:     true,
+							Execute:    true,
+							Median:     false,
+							Mercury:    true,
+							Rebalancer: true,
+						},
+					},
+				}).Return(cfgID, nil)
+				f.Mocks.feedsSvc.On("GetChainConfig", mock.Anything, cfgID).Return(&feeds.ChainConfig{
+					ID:                      cfgID,
+					ChainType:               feeds.ChainTypeTron,
+					ChainID:                 chainID,
+					AccountAddress:          accountAddr,
+					AccountAddressPublicKey: null.StringFrom(acctAddrPubKey),
+					AdminAddress:            adminAddr,
+					FluxMonitorConfig: feeds.FluxMonitorConfig{
+						Enabled: false,
+					},
+					OCR1Config: feeds.OCR1Config{
+						Enabled:     true,
+						P2PPeerID:   peerID,
+						KeyBundleID: keyBundleID,
+					},
+					OCR2Config: feeds.OCR2ConfigModel{
+						Enabled:          true,
+						P2PPeerID:        peerID,
+						KeyBundleID:      keyBundleID,
+						ForwarderAddress: null.StringFrom(forwarderAddr),
+						Plugins: feeds.Plugins{
+							Commit:     true,
+							Execute:    true,
+							Median:     false,
+							Mercury:    true,
+							Rebalancer: true,
+						},
+					},
+				}, nil)
+			},
+			query:     mutation,
+			variables: withVariables("TRON"),
+			result: `
+			{
+				"createFeedsManagerChainConfig": {
+					"chainConfig": {
+						"id": "1"
+					}
+				}
+			}`,
+		},
 		{
 			name:          "create call not found",
 			authenticated: true,
diff --git a/core/web/resolver/ocr2_keys.go b/core/web/resolver/ocr2_keys.go
index d04ebbd0e2f..345dd07d984 100644
--- a/core/web/resolver/ocr2_keys.go
+++ b/core/web/resolver/ocr2_keys.go
@@ -27,6 +27,8 @@ const (
 	OCR2ChainTypeStarkNet = "STARKNET"
 	// OCRChainTypeAptos defines OCR Aptos Chain Type
 	OCRChainTypeAptos = "APTOS"
+	// OCRChainTypeTron defines OCR2 Tron Chain Type
+	OCRChainTypeTron = "TRON"
 )
 
 // ToOCR2ChainType turns a valid string into a OCR2ChainType
@@ -42,6 +44,8 @@ func ToOCR2ChainType(s string) (OCR2ChainType, error) {
 		return OCR2ChainTypeStarkNet, nil
 	case string(chaintype.Aptos):
 		return OCRChainTypeAptos, nil
+	case string(chaintype.Tron):
+		return OCRChainTypeTron, nil
 	default:
 		return "", errors.New("unknown ocr2 chain type")
 	}
@@ -60,6 +64,8 @@ func FromOCR2ChainType(ct OCR2ChainType) string {
 		return string(chaintype.StarkNet)
 	case OCRChainTypeAptos:
 		return string(chaintype.Aptos)
+	case OCRChainTypeTron:
+		return string(chaintype.Tron)
 	default:
 		return strings.ToLower(string(ct))
 	}
diff --git a/core/web/resolver/query.go b/core/web/resolver/query.go
index ae33e5688bb..6348b805b3a 100644
--- a/core/web/resolver/query.go
+++ b/core/web/resolver/query.go
@@ -625,6 +625,19 @@ func (r *Resolver) StarkNetKeys(ctx context.Context) (*StarkNetKeysPayloadResolv
 	return NewStarkNetKeysPayload(keys), nil
 }
 
+func (r *Resolver) TronKeys(ctx context.Context) (*TronKeysPayloadResolver, error) {
+	if err := authenticateUser(ctx); err != nil {
+		return nil, err
+	}
+
+	keys, err := r.App.GetKeyStore().Tron().GetAll()
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTronKeysPayload(keys), nil
+}
+
 func (r *Resolver) SQLLogging(ctx context.Context) (*GetSQLLoggingPayloadResolver, error) {
 	if err := authenticateUser(ctx); err != nil {
 		return nil, err