diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..f8c15c3
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,5 @@
+# Development environment variables
+# These are automatically loaded when running 'npm start'
+
+REACT_APP_DEX_SERVER=http://localhost:5700
+#REACT_APP_NOSTR_REST_API_URL=http://localhost:5942
\ No newline at end of file
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..bef8bc9
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,5 @@
+# Production environment variables
+# These are automatically loaded when running 'npm run build'
+
+REACT_APP_DEX_SERVER=https://dex-api.fullstack.cash
+REACT_APP_NOSTR_REST_API_URL=https://nostr-relay-api.psfoundation.info
\ No newline at end of file
diff --git a/src/config/index.js b/src/config/index.js
index 316bd88..97d319f 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -14,8 +14,9 @@ const config = {
   ghRepo: 'https://github.com/Permissionless-Software-Foundation/bch-dex-taker-v2',
   radicleUrl: 'https://app.radicle.network/seeds/maple.radicle.garden/rad:git:hnrkd5cjwwb5tzx37hq9uqm5ubon7ee468xcy/remotes/hyyycncbn9qzqmobnhjq9rry6t4mbjiadzjoyhaknzxjcz3cxkpfpc',
 
-  dexServer: 'https://dex-api.fullstack.cash',
+  // dexServer: 'https://dex-api.fullstack.cash',
   // dexServer: 'http://localhost:5700',
+  dexServer: process.env.REACT_APP_DEX_SERVER || 'https://dex-api.fullstack.cash',
 
   nostrTopic: 'bch-dex-test-topic-02',