diff --git a/cli/core/main.py b/cli/core/main.py
index 39721a00..659ac57b 100644
--- a/cli/core/main.py
+++ b/cli/core/main.py
@@ -247,5 +247,10 @@ def version(ctx):
     output(f"AITBC CLI version {__version__}", ctx.obj['output_format'])
 
 
+def main():
+    """Main entry point for AITBC CLI"""
+    return cli()
+
+
 if __name__ == "__main__":
     cli()
diff --git a/cli/requirements.txt b/cli/requirements.txt
new file mode 100644
index 00000000..29958f80
--- /dev/null
+++ b/cli/requirements.txt
@@ -0,0 +1,4 @@
+click>=8.0.0
+requests>=2.25.0
+pydantic>=2.0.0
+cryptography>=3.4.0
diff --git a/systemd/aitbc-blockchain-node-dev.service b/systemd/aitbc-blockchain-node-dev.service
index e54a2a5f..07c3aa40 100644
--- a/systemd/aitbc-blockchain-node-dev.service
+++ b/systemd/aitbc-blockchain-node-dev.service
@@ -8,7 +8,7 @@ User=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=-/opt/aitbc/.env
+EnvironmentFile=/etc/aitbc/blockchain.env
 ExecStart=/usr/bin/python3 -m aitbc_chain.main
 Restart=always
 RestartSec=5
diff --git a/systemd/aitbc-blockchain-node.service b/systemd/aitbc-blockchain-node.service
index b7c02890..f659e904 100644
--- a/systemd/aitbc-blockchain-node.service
+++ b/systemd/aitbc-blockchain-node.service
@@ -7,7 +7,7 @@ Type=simple
 User=root
 Group=root
 WorkingDirectory=/opt/aitbc/apps/blockchain-node
-EnvironmentFile=/opt/aitbc/.env
+EnvironmentFile=/etc/aitbc/blockchain.env
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
 Environment=PYTHONPATH=/opt/aitbc/apps/blockchain-node/src:/opt/aitbc/apps/blockchain-node/scripts
 ExecStart=/opt/aitbc/venv/bin/python -m aitbc_chain.combined_main
diff --git a/systemd/aitbc-blockchain-rpc.service b/systemd/aitbc-blockchain-rpc.service
index a5d15e83..63496374 100644
--- a/systemd/aitbc-blockchain-rpc.service
+++ b/systemd/aitbc-blockchain-rpc.service
@@ -7,7 +7,7 @@ Type=simple
 User=root
 Group=root
 WorkingDirectory=/opt/aitbc/apps/blockchain-node
-EnvironmentFile=/opt/aitbc/.env
+EnvironmentFile=/etc/aitbc/blockchain.env
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
 Environment=PYTHONPATH=/opt/aitbc/apps/blockchain-node/src:/opt/aitbc/apps/blockchain-node/scripts
 ExecStart=/usr/bin/python3 -m uvicorn aitbc_chain.app:app --host ${rpc_bind_host} --port ${rpc_bind_port}
diff --git a/systemd/aitbc-blockchain-sync-dev.service b/systemd/aitbc-blockchain-sync-dev.service
index ac132282..c2226b3c 100644
--- a/systemd/aitbc-blockchain-sync-dev.service
+++ b/systemd/aitbc-blockchain-sync-dev.service
@@ -9,7 +9,7 @@ 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=-/opt/aitbc/.env
+EnvironmentFile=/etc/aitbc/blockchain.env
 ExecStart=/usr/bin/python3 -m aitbc_chain.chain_sync \
   --redis redis://localhost:6379 \
   --node-id follower-dev \
diff --git a/systemd/aitbc-blockchain-sync.service b/systemd/aitbc-blockchain-sync.service
index b573356e..9435b46d 100644
--- a/systemd/aitbc-blockchain-sync.service
+++ b/systemd/aitbc-blockchain-sync.service
@@ -7,7 +7,7 @@ Type=simple
 User=root
 Group=root
 WorkingDirectory=/opt/aitbc/apps/blockchain-node
-EnvironmentFile=/opt/aitbc/.env
+EnvironmentFile=/etc/aitbc/blockchain.env
 Environment=PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin
 Environment=PYTHONPATH=/opt/aitbc/apps/blockchain-node/src:/opt/aitbc/apps/blockchain-node/scripts
 ExecStart=/usr/bin/python3 -m aitbc_chain.chain_sync --redis redis://localhost:6379 --node-id ait18yefwwclgmyu2a74zvv0hj3a3xw6gxsn4akrj963kp069j9xy5ns3kurun --rpc-port 8006 --leader-host 10.1.223.40 --source-host 10.1.223.40 --source-port 8006 --import-host 10.1.223.40 --import-port 8006