diff --git a/systemd/aitbc-agent-coordinator.service b/systemd/aitbc-agent-coordinator.service
index 6b0b9f26..ab28cfd0 100644
--- a/systemd/aitbc-agent-coordinator.service
+++ b/systemd/aitbc-agent-coordinator.service
@@ -9,7 +9,7 @@ Group=root
 WorkingDirectory=/opt/aitbc/apps/agent-coordinator
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
 Environment=PYTHONPATH=/opt/aitbc/apps/agent-coordinator/src
-EnvironmentFile=/etc/aitbc/production.env
+EnvironmentFile=/etc/aitbc/.env
 EnvironmentFile=/etc/aitbc/node.env
 
 # Agent coordinator execution
diff --git a/systemd/aitbc-blockchain-node.service b/systemd/aitbc-blockchain-node.service
index 020010e9..d1a22bd1 100644
--- a/systemd/aitbc-blockchain-node.service
+++ b/systemd/aitbc-blockchain-node.service
@@ -10,7 +10,7 @@ Group=root
 WorkingDirectory=/opt/aitbc
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
 Environment=PYTHONPATH=/opt/aitbc/apps/blockchain-node/src
-EnvironmentFile=/etc/aitbc/production.env
+EnvironmentFile=/etc/aitbc/.env
 EnvironmentFile=/etc/aitbc/node.env
 
 # Production execution
diff --git a/systemd/aitbc-blockchain-p2p.service b/systemd/aitbc-blockchain-p2p.service
index ef0f649b..60329be1 100644
--- a/systemd/aitbc-blockchain-p2p.service
+++ b/systemd/aitbc-blockchain-p2p.service
@@ -9,7 +9,6 @@ Group=root
 WorkingDirectory=/opt/aitbc/apps/blockchain-node
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
 Environment=PYTHONPATH=/opt/aitbc/apps/blockchain-node/src:/opt/aitbc/apps/blockchain-node/scripts
-EnvironmentFile=/etc/aitbc/blockchain.env
 EnvironmentFile=/etc/aitbc/.env
 EnvironmentFile=/etc/aitbc/node.env
 ExecStart=/opt/aitbc/venv/bin/python -m aitbc_chain.p2p_network --host ${p2p_bind_host} --port ${p2p_bind_port} --peers ${p2p_peers} --node-id ${p2p_node_id}
diff --git a/systemd/aitbc-blockchain-rpc.service b/systemd/aitbc-blockchain-rpc.service
index 44a92598..20e23f12 100644
--- a/systemd/aitbc-blockchain-rpc.service
+++ b/systemd/aitbc-blockchain-rpc.service
@@ -7,7 +7,6 @@ Type=simple
 User=root
 Group=root
 WorkingDirectory=/opt/aitbc/apps/blockchain-node
-EnvironmentFile=/etc/aitbc/blockchain.env
 EnvironmentFile=/etc/aitbc/.env
 EnvironmentFile=/etc/aitbc/node.env
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
diff --git a/systemd/aitbc-blockchain-sync.service b/systemd/aitbc-blockchain-sync.service
index 18cb1d17..7871b0b4 100644
--- a/systemd/aitbc-blockchain-sync.service
+++ b/systemd/aitbc-blockchain-sync.service
@@ -7,7 +7,6 @@ Type=simple
 User=root
 Group=root
 WorkingDirectory=/opt/aitbc/apps/blockchain-node
-EnvironmentFile=/etc/aitbc/blockchain.env
 EnvironmentFile=/etc/aitbc/.env
 EnvironmentFile=/etc/aitbc/node.env
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
diff --git a/systemd/aitbc-marketplace.service b/systemd/aitbc-marketplace.service
index 6c5a17ee..3982bfdb 100644
--- a/systemd/aitbc-marketplace.service
+++ b/systemd/aitbc-marketplace.service
@@ -10,7 +10,6 @@ Group=root
 WorkingDirectory=/opt/aitbc
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
 Environment=PYTHONPATH=/opt/aitbc/services
-EnvironmentFile=/etc/aitbc/production.env
 EnvironmentFile=/etc/aitbc/.env
 EnvironmentFile=/etc/aitbc/node.env
 
diff --git a/systemd/aitbc-monitor.service b/systemd/aitbc-monitor.service
index e648cbf1..687dadfb 100644
--- a/systemd/aitbc-monitor.service
+++ b/systemd/aitbc-monitor.service
@@ -8,7 +8,7 @@ User=root
 Group=root
 WorkingDirectory=/opt/aitbc
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
-EnvironmentFile=/etc/aitbc/production.env
+EnvironmentFile=/etc/aitbc/.env
 EnvironmentFile=/etc/aitbc/node.env
 
 # Monitor execution