diff --git a/.env.dev.template b/.env.dev.template
index b22055cd..d020a735 100644
--- a/.env.dev.template
+++ b/.env.dev.template
@@ -1,6 +1,7 @@
-NEXT_PUBLIC_CHAIN_ENDPOINTS = 'https://protontestnet.greymass.com/'
+NEXT_PUBLIC_CHAIN_ENDPOINTS = 'https://testnet.protonchain.com, https://tn1.protonnz.com'
 NEXT_PUBLIC_BLOCK_EXPLORER  = 'https://proton-test.bloks.io/block/'
-NEXT_PUBLIC_NFT_ENDPOINT    = 'https://test.proton.api.atomicassets.io'
+NEXT_PUBLIC_NFT_ENDPOINT    = 'https://xpr-testnet-atm-api.bloxprod.io'
+NEXT_PUBLIC_CHAIN_ID        = '71ee83bcf52142d61019d95f9cc5427ba6a0d7ff8accd9e2088ae2abeaf3d3dd'
 BACKEND_ENDPOINT            = 'https://api-dev.protonchain.com/v1'
 NEXT_PUBLIC_ALCHEMY_URL                 = 'https://polygon-mainnet.g.alchemy.com/v2/cZYm3F6HFecKtBJDWBLiYR2Bweqmwlnc'
 NEXT_PUBLIC_NFT_BRIDGE_ADDRESS          = '0xBf9FBCb316dE872170406C07D7CB7783d0068eE3'
diff --git a/Dockerfile b/Dockerfile
index df8b1883..7a0b0dc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,12 @@ ARG NEXT_PUBLIC_GA_TRACKING_ID
 ARG NEXT_PUBLIC_CHAIN_ENDPOINTS
 ARG NEXT_PUBLIC_BLOCK_EXPLORER
 ARG NEXT_PUBLIC_NFT_ENDPOINT
+ARG NEXT_PUBLIC_CHAIN_ID
 ENV NEXT_PUBLIC_CHAIN_ENDPOINTS=$NEXT_PUBLIC_CHAIN_ENDPOINTS
 ENV NEXT_PUBLIC_BLOCK_EXPLORER=$NEXT_PUBLIC_BLOCK_EXPLORER
 ENV NEXT_PUBLIC_GA_TRACKING_ID=$NEXT_PUBLIC_GA_TRACKING_ID
 ENV NEXT_PUBLIC_NFT_ENDPOINT=$NEXT_PUBLIC_NFT_ENDPOINT
+ENV NEXT_PUBLIC_CHAIN_ID=$NEXT_PUBLIC_CHAIN_ID
 
 # COPY .npmrc .npmrc
 COPY package.json .
diff --git a/README.md b/README.md
index e553c2b9..f839fd4e 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@ This application shows the basic functionality of NFTs on the XPR Network blockc
 
 This is built off of atomicassets NFT framework.
 
-- [API Documentation for atomicassets (mainnet)](https://proton.api.atomicassets.io/atomicassets/docs/swagger/)
-- [API Documentation for atomicmarket (mainnet)](https://proton.api.atomicassets.io/atomicmarket/docs/swagger/)
-- [API Documentation for atomicassets (testnet)](https://test.proton.api.atomicassets.io/atomicassets/docs/swagger/)
-- [API Documentation for atomicmarket (testnet)](https://test.proton.api.atomicassets.io/atomicmarket/docs/swagger/)
+- [API Documentation for atomicassets (mainnet)](https://xpr-mainnet-atm-api.bloxprod.io/atomicassets/docs/swagger/)
+- [API Documentation for atomicmarket (mainnet)](https://xpr-mainnet-atm-api.bloxprod.io/atomicmarket/docs/swagger/)
+- [API Documentation for atomicassets (testnet)](https://xpr-testnet-atm-api.bloxprod.io/atomicassets/docs/swagger/)
+- [API Documentation for atomicmarket (testnet)](https://xpr-testnet-atm-api.bloxprod.io/atomicmarket/docs/swagger/)
 
 ## To build and run locally
 
@@ -36,13 +36,14 @@ npm run dev
 
 ## Environment
 
-Create a copy of `.env.template` and name it `.env.local`:
+Create a copy of `.env.dev.template` and name it `.env.local`:
 
 For mainnet:
 ```
-NEXT_PUBLIC_CHAIN_ENDPOINTS='https://proton.eoscafeblock.com, https://proton.greymass.com'
+NEXT_PUBLIC_CHAIN_ENDPOINTS='https://proton.eosusa.io, https://api.protonnz.com'
 NEXT_PUBLIC_BLOCK_EXPLORER='https://proton.bloks.io/block/'
-NEXT_PUBLIC_NFT_ENDPOINT='https://proton.api.atomicassets.io'
+NEXT_PUBLIC_NFT_ENDPOINT='https://xpr-mainnet-atm-api.bloxprod.io'
+NEXT_PUBLIC_CHAIN_ID='384da888112027f0321850a169f737c33e53b388aad48b5adace4bab97f437e0'
 BACKEND_ENDPOINT = string;
 PROTON_MARKET_JWT_SECRET = string;
 
@@ -50,9 +51,10 @@ PROTON_MARKET_JWT_SECRET = string;
 
 For testnet:
 ```
-NEXT_PUBLIC_CHAIN_ENDPOINTS='https://testnet.protonchain.com'
+NEXT_PUBLIC_CHAIN_ENDPOINTS='https://testnet.protonchain.com, https://tn1.protonnz.com'
 NEXT_PUBLIC_BLOCK_EXPLORER='https://proton-test.bloks.io/block/'
-NEXT_PUBLIC_NFT_ENDPOINT='https://test.proton.api.atomicassets.io'
+NEXT_PUBLIC_NFT_ENDPOINT='https://xpr-testnet-atm-api.bloxprod.io'
+NEXT_PUBLIC_CHAIN_ID='71ee83bcf52142d61019d95f9cc5427ba6a0d7ff8accd9e2088ae2abeaf3d3dd'
 BACKEND_ENDPOINT = string;
 PROTON_MARKET_JWT_SECRET = string;
 
diff --git a/services/proton.ts b/services/proton.ts
index 19bf195e..5c77ac50 100644
--- a/services/proton.ts
+++ b/services/proton.ts
@@ -160,10 +160,8 @@ class ProtonSDK {
       linkOptions: {
         endpoints: proton.endpoints,
         chainId:
-          process.env.NEXT_PUBLIC_NFT_ENDPOINT ===
-          'https://test.proton.api.atomicassets.io'
-            ? '71ee83bcf52142d61019d95f9cc5427ba6a0d7ff8accd9e2088ae2abeaf3d3dd'
-            : '384da888112027f0321850a169f737c33e53b388aad48b5adace4bab97f437e0',
+          process.env.NEXT_PUBLIC_CHAIN_ID ||
+            '384da888112027f0321850a169f737c33e53b388aad48b5adace4bab97f437e0',
         restoreSession,
       },
       transportOptions: {