diff --git a/servers/zetachain/server.yaml b/servers/zetachain/server.yaml
new file mode 100644
index 00000000..b2297f1e
--- /dev/null
+++ b/servers/zetachain/server.yaml
@@ -0,0 +1,45 @@
+name: zetachain
+image: mcp/zetachain:latest
+type: server
+meta:
+  category: blockchain
+  tags:
+    - blockchain
+    - defi
+    - cross-chain
+    - web3
+    - cli
+about:
+  title: ZetaChain MCP Server
+  description: Complete ZetaChain CLI for cross-chain blockchain operations, account management, and omnichain development. Provides real blockchain connectivity to ZetaChain Athens Testnet, Ethereum Sepolia, BSC Testnet, and Avalanche Fuji. Features wallet creation, balance queries, cross-chain deposits/withdrawals, and AI blockchain assistant.
+  icon: https://assets.zetachain.com/favicon.ico
+source:
+  project: https://github.com/ExpertVagabond/universal-blockchain-mcp
+  branch: docker-mcp-registry
+config:
+  description: Configure ZetaChain blockchain connections and network settings
+  env:
+    - name: ZETACHAIN_NETWORK
+      example: athens
+      value: "{{zetachain.network}}"
+    - name: ZETACHAIN_RPC_URL
+      example: https://zetachain-athens-evm.blockpi.network/v1/rpc/public
+      value: "{{zetachain.rpc_url}}"
+    - name: ZETACHAIN_GATEWAY
+      example: 0x6c533f7fe93fae114d0954697069df33c9b74fd7
+      value: "{{zetachain.gateway}}"
+  parameters:
+    type: object
+    properties:
+      network:
+        type: string
+        description: ZetaChain network (athens, mainnet)
+        default: athens
+      rpc_url:
+        type: string
+        description: Custom RPC URL for ZetaChain
+        default: https://zetachain-athens-evm.blockpi.network/v1/rpc/public
+      gateway:
+        type: string
+        description: ZetaChain gateway contract address
+        default: 0x6c533f7fe93fae114d0954697069df33c9b74fd7
\ No newline at end of file
diff --git a/servers/zetachain/tools.json b/servers/zetachain/tools.json
new file mode 100644
index 00000000..260a7694
--- /dev/null
+++ b/servers/zetachain/tools.json
@@ -0,0 +1,180 @@
+{
+  "tools": [
+    {
+      "name": "zetachain_help",
+      "description": "Show comprehensive help for all ZetaChain CLI commands",
+      "inputSchema": {
+        "type": "object",
+        "properties": {},
+        "required": []
+      }
+    },
+    {
+      "name": "zetachain_ask",
+      "description": "AI blockchain assistant for ZetaChain help and guidance",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "question": {
+            "type": "string",
+            "description": "Question about ZetaChain, blockchain, or CLI usage"
+          }
+        },
+        "required": ["question"]
+      }
+    },
+    {
+      "name": "zetachain_accounts_list",
+      "description": "List all wallet accounts",
+      "inputSchema": {
+        "type": "object",
+        "properties": {},
+        "required": []
+      }
+    },
+    {
+      "name": "zetachain_accounts_create",
+      "description": "Create a new wallet account",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Name for the new wallet"
+          }
+        },
+        "required": ["name"]
+      }
+    },
+    {
+      "name": "zetachain_accounts_show",
+      "description": "Show detailed information about a wallet account",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Name of the wallet to show"
+          }
+        },
+        "required": ["name"]
+      }
+    },
+    {
+      "name": "zetachain_query_balances",
+      "description": "Check account balances across all supported chains",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "address": {
+            "type": "string",
+            "description": "Wallet address to check balance for"
+          }
+        },
+        "required": ["address"]
+      }
+    },
+    {
+      "name": "zetachain_query_chains",
+      "description": "List all supported blockchain networks",
+      "inputSchema": {
+        "type": "object",
+        "properties": {},
+        "required": []
+      }
+    },
+    {
+      "name": "zetachain_solana_deposit",
+      "description": "Initiate cross-chain deposit from Solana to ZetaChain",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "amount": {
+            "type": "string",
+            "description": "Amount to deposit (in SOL)"
+          },
+          "recipient": {
+            "type": "string",
+            "description": "Recipient address on ZetaChain"
+          }
+        },
+        "required": ["amount", "recipient"]
+      }
+    },
+    {
+      "name": "zetachain_evm_deposit",
+      "description": "Initiate cross-chain deposit from EVM chains to ZetaChain",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "amount": {
+            "type": "string",
+            "description": "Amount to deposit (in ETH/BNB/MATIC)"
+          },
+          "recipient": {
+            "type": "string",
+            "description": "Recipient address on ZetaChain"
+          }
+        },
+        "required": ["amount", "recipient"]
+      }
+    },
+    {
+      "name": "zetachain_withdraw",
+      "description": "Initiate withdrawal from ZetaChain to other blockchains",
+      "inputSchema": {
+        "type": "object",
+        "properties": {
+          "chain": {
+            "type": "string",
+            "description": "Target blockchain (ethereum, bsc, polygon, etc.)"
+          },
+          "amount": {
+            "type": "string",
+            "description": "Amount to withdraw"
+          },
+          "recipient": {
+            "type": "string",
+            "description": "Recipient address on target chain"
+          }
+        },
+        "required": ["chain", "amount", "recipient"]
+      }
+    },
+    {
+      "name": "zetachain_localnet_check",
+      "description": "Check ZetaChain network connectivity and status",
+      "inputSchema": {
+        "type": "object",
+        "properties": {},
+        "required": []
+      }
+    },
+    {
+      "name": "zetachain_faucet",
+      "description": "Request testnet tokens from ZetaChain faucet",
+      "inputSchema": {
+        "type": "object",
+        "properties": {},
+        "required": []
+      }
+    }
+  ],
+  "resources": [
+    {
+      "uri": "blockchain://zetachain/accounts",
+      "name": "ZetaChain Wallet Accounts",
+      "description": "Manage ZetaChain wallet accounts and addresses"
+    },
+    {
+      "uri": "blockchain://zetachain/network",
+      "name": "ZetaChain Network Info",
+      "description": "Real-time blockchain network information and status"
+    },
+    {
+      "uri": "blockchain://cross-chain/operations",
+      "name": "Cross-Chain Operations",
+      "description": "Cross-chain deposits, withdrawals, and transactions"
+    }
+  ]
+}
\ No newline at end of file