diff --git a/infra/matrix/.env.example b/infra/matrix/.env.example
new file mode 100644
index 00000000..3cf5ee5f
--- /dev/null
+++ b/infra/matrix/.env.example
@@ -0,0 +1,42 @@
+# Matrix/Conduit Environment Configuration
+# Copy to .env and fill in values before deployment
+# Issue: #166 / #183
+
+# =============================================================================
+# REQUIRED: Domain Configuration
+# =============================================================================
+# The public domain where Matrix will be served
+MATRIX_DOMAIN=matrix.timmy.foundation
+
+# =============================================================================
+# REQUIRED: Security Secrets (generate strong random values)
+# =============================================================================
+# Registration token for creating the first admin account
+# Generate with: openssl rand -hex 32
+CONDUIT_REGISTRATION_TOKEN=CHANGE_ME_TO_A_RANDOM_HEX_STRING
+
+# Database encryption key (if using encrypted SQLite)
+# Generate with: openssl rand -hex 32
+CONDUIT_DATABASE_PASSWORD=CHANGE_ME_TO_A_RANDOM_HEX_STRING
+
+# =============================================================================
+# OPTIONAL: Admin Configuration
+# =============================================================================
+# Local admin username (without @domain)
+INITIAL_ADMIN_USERNAME=admin
+INITIAL_ADMIN_PASSWORD=CHANGE_ME_IMMEDIATELY
+
+# =============================================================================
+# OPTIONAL: Federation
+# =============================================================================
+# Comma-separated list of servers to block federation with
+FEDERATION_BLACKLIST=
+
+# Comma-separated list of servers to allow federation with (empty = all)
+FEDERATION_WHITELIST=
+
+# =============================================================================
+# OPTIONAL: Media/Uploads
+# =============================================================================
+# Maximum file upload size in bytes (default: 100MB)
+MAX_UPLOAD_SIZE=104857600