diff --git a/.env.production b/.env.production
index 5a0954c56a..8c8c8133e6 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,4 @@
-VITE_AGGREGATOR_API=https://aggregator-api.kyberswap.com
+VITE_AGGREGATOR_API=https://aggregator-api.stg.kyberengineering.io
 VITE_AGGREGATOR_STATS_API=https://aggregator-stats.kyberswap.com
 VITE_SENTRY_DNS=https://d94ee2d3c22043bdaec966758680b5a8@sentry.ops.kyberengineering.io/4
 
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 6813dab501..6edabcf872 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -118,7 +118,7 @@ jobs:
           VITE_TAG: ${{ needs.prepare.outputs.image_tag }}
           CURRENT_BRANCH: ${{ needs.prepare.outputs.current_branch }}
           NODE_OPTIONS: '--max_old_space_size=4096'
-        run: yarn build-prod
+        run: yarn build-stg
 
       - name: Docker build and push
         uses: docker/build-push-action@v5
diff --git a/src/components/SwapForm/hooks/useBuildRoute.tsx b/src/components/SwapForm/hooks/useBuildRoute.tsx
index bf441ee915..92e4357d8d 100644
--- a/src/components/SwapForm/hooks/useBuildRoute.tsx
+++ b/src/components/SwapForm/hooks/useBuildRoute.tsx
@@ -63,7 +63,7 @@ const useBuildRoute = (args: Args) => {
       recipient: to || account,
       source: clientId || 'kyberswap',
       skipSimulateTx: false,
-      enableGasEstimation: true,
+      enableGasEstimation: false,
       permit,
     }
 
diff --git a/src/hooks/web3/useChangeNetwork.ts b/src/hooks/web3/useChangeNetwork.ts
index 026beee856..28d5bda6c0 100644
--- a/src/hooks/web3/useChangeNetwork.ts
+++ b/src/hooks/web3/useChangeNetwork.ts
@@ -19,7 +19,7 @@ import { useLazyKyberswapConfig } from '../useKyberSwapConfig'
 
 let latestChainId: number | undefined
 export function useChangeNetwork() {
-  const { walletKey, isWrongNetwork } = useActiveWeb3React()
+  const { walletKey, isWrongNetwork, chainId: kyberChainId } = useActiveWeb3React()
   const { chainId, connector, library, active } = useWeb3React()
   const fetchKyberswapConfig = useLazyKyberswapConfig()
 
@@ -255,6 +255,7 @@ export function useChangeNetwork() {
         console.info('[Switch network] success:', { desiredChainId })
         changeNetworkHandler(desiredChainId, wrappedSuccessCallback)
       } catch (error) {
+        if (kyberChainId !== chainId && chainId) dispatch(updateChainId(chainId))
         console.error(
           '[Switch network] error:',
           JSON.stringify({ desiredChainId, error, didUserReject: didUserReject(error) }, null, 2),
@@ -286,7 +287,18 @@ export function useChangeNetwork() {
         }
       }
     },
-    [chainId, active, connector, changeNetworkHandler, successCallback, failureCallback, addNewNetwork, isWrongNetwork],
+    [
+      chainId,
+      kyberChainId,
+      active,
+      connector,
+      dispatch,
+      changeNetworkHandler,
+      successCallback,
+      failureCallback,
+      addNewNetwork,
+      isWrongNetwork,
+    ],
   )
 
   return { changeNetwork, addNewNetwork }