diff --git a/apps/token/.env.stagnet3 b/apps/token/.env.stagnet3
index 41f2862ab..f8c16548c 100644
--- a/apps/token/.env.stagnet3
+++ b/apps/token/.env.stagnet3
@@ -5,4 +5,4 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://sta
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_EXPLORER_URL=https://staging3.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/docs/testnet
-
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
diff --git a/apps/trading-e2e/.env b/apps/trading-e2e/.env
index 417627db8..bda1b5d9a 100644
--- a/apps/trading-e2e/.env
+++ b/apps/trading-e2e/.env
@@ -1,3 +1,2 @@
-NX_USE_ENV_OVERRIDES=0
 NX_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
\ No newline at end of file
diff --git a/apps/trading/.env b/apps/trading/.env
index de8b3a239..4b229dd07 100644
--- a/apps/trading/.env
+++ b/apps/trading/.env
@@ -1,11 +1,10 @@
-# App configuration variables
-NX_VEGA_ENV=TESTNET
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
-NX_USE_ENV_OVERRIDES=1
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_WALLET_URL=http://localhost:1789
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
+NX_VEGA_ENV=TESTNET
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
+NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_WALLET_URL=http://localhost:1789
diff --git a/apps/trading/.env.devnet b/apps/trading/.env.devnet
index e058f4e36..87191af85 100644
--- a/apps/trading/.env.devnet
+++ b/apps/trading/.env.devnet
@@ -1,9 +1,10 @@
-# App configuration variables
-NX_VEGA_ENV=DEVNET
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
-NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
+NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
+NX_VEGA_WALLET_URL=http://localhost:1789
\ No newline at end of file
diff --git a/apps/trading/.env.mainnet b/apps/trading/.env.mainnet
index a4f80c8b7..c1c0cd355 100644
--- a/apps/trading/.env.mainnet
+++ b/apps/trading/.env.mainnet
@@ -1,9 +1,9 @@
-# App configuration variables
-NX_VEGA_ENV=MAINNET
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
-NX_VEGA_URL=https://api.vega.xyz/query
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
+NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
-NX_VEGA_TOKEN_URL=https://token.vega.xyz
\ No newline at end of file
+NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
+NX_VEGA_TOKEN_URL=https://token.vega.xyz
+NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_WALLET_URL=http://localhost:1789
\ No newline at end of file
diff --git a/apps/trading/.env.stagnet1 b/apps/trading/.env.stagnet1
index 6b4d2bc44..9d5e42cee 100644
--- a/apps/trading/.env.stagnet1
+++ b/apps/trading/.env.stagnet1
@@ -1,12 +1,10 @@
-# App configuration variables
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_USE_ENV_OVERRIDES=1
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
+NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
\ No newline at end of file
+NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
+NX_VEGA_WALLET_URL=http://localhost:1789
\ No newline at end of file
diff --git a/apps/trading/.env.stagnet3 b/apps/trading/.env.stagnet3
index 4f1ead324..28e6252bd 100644
--- a/apps/trading/.env.stagnet3
+++ b/apps/trading/.env.stagnet3
@@ -1,9 +1,10 @@
-# App configuration variables
-NX_VEGA_ENV=STAGNET3
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
-NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
+NX_VEGA_ENV=STAGNET3
 NX_VEGA_EXPLORER_URL=https://staging3.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
+NX_VEGA_WALLET_URL=http://localhost:1789
\ No newline at end of file
diff --git a/apps/trading/.env.testnet b/apps/trading/.env.testnet
index c9c07cebc..4b229dd07 100644
--- a/apps/trading/.env.testnet
+++ b/apps/trading/.env.testnet
@@ -1,11 +1,10 @@
-# App configuration variables
-NX_VEGA_ENV=TESTNET
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_USE_ENV_OVERRIDES=1
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_WALLET_URL=http://localhost:1789
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
+NX_VEGA_ENV=TESTNET
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
+NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_WALLET_URL=http://localhost:1789