diff --git a/.env b/.env
index 28a2ed5a02..6bf5abf8f8 100644
--- a/.env
+++ b/.env
@@ -1,20 +1,20 @@
-ETHEREUM_DEV_CLUSTER=1
-RPC_NETWORKS_ONLY=0
-LOG_LEVEL=debug
-LOG_LEVEL_STATUS_GO=info
-FLEET=eth.beta
-RN_BRIDGE_THRESHOLD_WARNINGS=0
-POW_TARGET=0.002
-POW_TIME=1
-DEFAULT_NETWORK=mainnet_rpc
-DEBUG_WEBVIEW=1
-GROUP_CHATS_ENABLED=1
-PAIRING_ENABLED=1
 CACHED_WEBVIEWS_ENABLED=1
-EXTENSIONS=1
-HARDWALLET_ENABLED=0
-PFS_ENCRYPTION_ENABLED=1
+DEBUG_WEBVIEW=1
+DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
 ERC20_CONTRACT_WARNINGS=1
+ETHEREUM_DEV_CLUSTER=1
+EXTENSIONS=1
+FLEET=eth.beta
+GROUP_CHATS_ENABLED=1
+HARDWALLET_ENABLED=0
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
+PAIRING_ENABLED=1
+PFS_ENCRYPTION_ENABLED=1
+POW_TARGET=0.002
+POW_TIME=1
+RN_BRIDGE_THRESHOLD_WARNINGS=0
+RPC_NETWORKS_ONLY=0
 STICKERS_ENABLED=1
diff --git a/.env.e2e b/.env.e2e
index 6d796bc34c..ee8619cf27 100644
--- a/.env.e2e
+++ b/.env.e2e
@@ -1,16 +1,16 @@
+DEBUG_WEBVIEW=1
+DEFAULT_NETWORK=testnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
-LOG_LEVEL=debug
-LOG_LEVEL_STATUS_GO=info
+EXTENSIONS=1
 FLEET=eth.beta
-RN_BRIDGE_THRESHOLD_WARNINGS=0
+GROUP_CHATS_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
+MAILSERVER_CONFIRMATIONS_ENABLED=0
+PAIRING_ENABLED=1
+PFS_ENCRYPTION_ENABLED=1
 POW_TARGET=0.002
 POW_TIME=1
-DEFAULT_NETWORK=testnet_rpc
-DEBUG_WEBVIEW=1
-GROUP_CHATS_ENABLED=1
-PAIRING_ENABLED=1
-EXTENSIONS=1
-PFS_ENCRYPTION_ENABLED=1
-ERC20_CONTRACT_WARNINGS=1
-MAILSERVER_CONFIRMATIONS_ENABLED=0
-STICKERS_ENABLED=0
\ No newline at end of file
+RN_BRIDGE_THRESHOLD_WARNINGS=0
+STICKERS_ENABLED=0
diff --git a/.env.jenkins b/.env.jenkins
index aec02d6ebd..97c4d77f5c 100644
--- a/.env.jenkins
+++ b/.env.jenkins
@@ -1,20 +1,20 @@
-RPC_NETWORKS_ONLY=0
+CACHED_WEBVIEWS_ENABLED=1
+DEBUG_WEBVIEW=1
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
-LOG_LEVEL=debug
-LOG_LEVEL_STATUS_GO=info
+EXTENSIONS=1
 FLEET=eth.beta
-RN_BRIDGE_THRESHOLD_WARNINGS=0
+GROUP_CHATS_ENABLED=1
+HARDWALLET_ENABLED=0
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
+MAILSERVER_CONFIRMATIONS_ENABLED=0
+MAINNET_WARNING_ENABLED=1
+PAIRING_ENABLED=1
+PFS_ENCRYPTION_ENABLED=1
 POW_TARGET=0.002
 POW_TIME=1
-DEFAULT_NETWORK=mainnet_rpc
-DEBUG_WEBVIEW=1
-GROUP_CHATS_ENABLED=1
-MAINNET_WARNING_ENABLED=1
-CACHED_WEBVIEWS_ENABLED=1
-EXTENSIONS=1
-PFS_ENCRYPTION_ENABLED=1
-PAIRING_ENABLED=1
-ERC20_CONTRACT_WARNINGS=1
-MAILSERVER_CONFIRMATIONS_ENABLED=0
-HARDWALLET_ENABLED=0
+RN_BRIDGE_THRESHOLD_WARNINGS=0
+RPC_NETWORKS_ONLY=0
 STICKERS_ENABLED=1
diff --git a/.env.nightly b/.env.nightly
index eec6d6a11b..bdffc383b8 100644
--- a/.env.nightly
+++ b/.env.nightly
@@ -1,18 +1,18 @@
+DEBUG_WEBVIEW=1
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
-RPC_NETWORKS_ONLY=0
-LOG_LEVEL=debug
-LOG_LEVEL_STATUS_GO=info
+EXTENSIONS=1
 FLEET=eth.beta
-RN_BRIDGE_THRESHOLD_WARNINGS=0
+GROUP_CHATS_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
+MAILSERVER_CONFIRMATIONS_ENABLED=0
+MAINNET_WARNING_ENABLED=1
+PAIRING_ENABLED=1
+PFS_ENCRYPTION_ENABLED=1
 POW_TARGET=0.002
 POW_TIME=1
-DEFAULT_NETWORK=mainnet_rpc
-DEBUG_WEBVIEW=1
-GROUP_CHATS_ENABLED=1
-PAIRING_ENABLED=1
-MAINNET_WARNING_ENABLED=1
-EXTENSIONS=1
-PFS_ENCRYPTION_ENABLED=1
-ERC20_CONTRACT_WARNINGS=1
-MAILSERVER_CONFIRMATIONS_ENABLED=0
+RN_BRIDGE_THRESHOLD_WARNINGS=0
+RPC_NETWORKS_ONLY=0
 STICKERS_ENABLED=0
diff --git a/.env.nightly.staging.fleet b/.env.nightly.staging.fleet
index d415e7f2cf..654d13a409 100644
--- a/.env.nightly.staging.fleet
+++ b/.env.nightly.staging.fleet
@@ -1,17 +1,17 @@
+DEBUG_WEBVIEW=1
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
-LOG_LEVEL=debug
-LOG_LEVEL_STATUS_GO=info
+EXTENSIONS=1
 FLEET=eth.staging
-RN_BRIDGE_THRESHOLD_WARNINGS=0
+GROUP_CHATS_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
+MAILSERVER_CONFIRMATIONS_ENABLED=0
+MAINNET_WARNING_ENABLED=1
+PAIRING_ENABLED=1
+PFS_ENCRYPTION_ENABLED=1
 POW_TARGET=0.002
 POW_TIME=1
-DEFAULT_NETWORK=mainnet_rpc
-DEBUG_WEBVIEW=1
-PAIRING_ENABLED=1
-GROUP_CHATS_ENABLED=1
-MAINNET_WARNING_ENABLED=1
-EXTENSIONS=1
-PFS_ENCRYPTION_ENABLED=1
-ERC20_CONTRACT_WARNINGS=1
-MAILSERVER_CONFIRMATIONS_ENABLED=0
+RN_BRIDGE_THRESHOLD_WARNINGS=0
 STICKERS_ENABLED=0
diff --git a/.env.prod b/.env.prod
index b65108bc69..71d6581125 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,18 +1,17 @@
+DEBUG_WEBVIEW=0
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=0
-MAINNET_WARNING_ENABLED=1
-RPC_NETWORKS_ONLY=1
-LOG_LEVEL=info
-LOG_LEVEL_STATUS_GO=
+EXTENSIONS=1
 FLEET=eth.beta
-RN_BRIDGE_THRESHOLD_WARNINGS=0
+GROUP_CHATS_ENABLED=1
+LOG_LEVEL_STATUS_GO=
+LOG_LEVEL=info
+MAINNET_WARNING_ENABLED=1
+PAIRING_ENABLED=1
+PFS_ENCRYPTION_ENABLED=1
 POW_TARGET=0.002
 POW_TIME=1
-DEFAULT_NETWORK=mainnet_rpc
-DEBUG_WEBVIEW=0
-GROUP_CHATS_ENABLED=1
-PAIRING_ENABLED=1
-MAINNET_WARNING_ENABLED=1
-EXTENSIONS=1
-PFS_ENCRYPTION_ENABLED=1
-ERC20_CONTRACT_WARNINGS=0
+RN_BRIDGE_THRESHOLD_WARNINGS=0
+RPC_NETWORKS_ONLY=1
 STICKERS_ENABLED=0