diff --git a/.gitignore b/.gitignore
index c1190c7a..5d1225da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -245,13 +245,20 @@ config.json
 secrets.json
 
 # Temporary files
->>>>>>> Stashed changes
 *.tmp
 *.temp
 *.bak
 *.backup
 
-<<<<<<< Updated upstream
+# ===================
+# Environment Files
+# ===================
+.env
+.env.local
+.env.production
+*.env
+.env.*.local
+
 # ===================
 # Windsurf IDE
 # ===================
diff --git a/apps/agent-protocols/.env.example b/apps/agent-protocols/.env.example
new file mode 100644
index 00000000..bf8ed394
--- /dev/null
+++ b/apps/agent-protocols/.env.example
@@ -0,0 +1,19 @@
+# AITBC Agent Protocols Environment Configuration
+# Copy this file to .env and update with your secure values
+
+# Agent Protocol Encryption Key (generate a strong, unique key)
+AITBC_AGENT_PROTOCOL_KEY=your-secure-encryption-key-here
+
+# Agent Protocol Salt (generate a unique salt value)
+AITBC_AGENT_PROTOCOL_SALT=your-unique-salt-value-here
+
+# Agent Registry Configuration
+AGENT_REGISTRY_HOST=0.0.0.0
+AGENT_REGISTRY_PORT=8003
+
+# Database Configuration
+AGENT_REGISTRY_DB_PATH=agent_registry.db
+
+# Security Settings
+AGENT_PROTOCOL_TIMEOUT=300
+AGENT_PROTOCOL_MAX_RETRIES=3
diff --git a/scripts/implement-agent-protocols.sh b/scripts/implement-agent-protocols.sh
index db503026..3674d69a 100755
--- a/scripts/implement-agent-protocols.sh
+++ b/scripts/implement-agent-protocols.sh
@@ -330,6 +330,7 @@ Secure cross-chain agent communication
 """
 
 import json
+import os
 import time
 import uuid
 import hashlib
@@ -351,8 +352,12 @@ class MessageProtocol:
     
     def _generate_key(self) -> bytes:
         """Generate encryption key"""
-        password = b"aitbc-agent-protocol-2026"
-        salt = b"aitbc-salt-agent-protocol"
+        password = os.environ.get('AITBC_AGENT_PROTOCOL_KEY', b"default-key-change-in-production")
+        salt = os.environ.get('AITBC_AGENT_PROTOCOL_SALT', b"aitbc-salt-agent-protocol")
+        if isinstance(password, str):
+            password = password.encode()
+        if isinstance(salt, str):
+            salt = salt.encode()
         kdf = PBKDF2HMAC(
             algorithm=hashes.SHA256(),
             length=32,