diff --git a/affine.yaml b/affine.yaml
index 3903d6c..8605376 100644
--- a/affine.yaml
+++ b/affine.yaml
@@ -24,26 +24,29 @@ services:
       - postgres
       - redis
     ports:
-      - "${AFFINE_PORT}:3010"
+      - "${AFFINE_PORT:-3010}:3010"
     volumes:
       - affine_config:/root/.affine/config
       - affine_storage:/root/.affine/storage
     environment:
-      AFFINE_REVISION: ${AFFINE_REVISION}
-      AFFINE_INDEXER_ENABLED: ${AFFINE_INDEXER_ENABLED}
+      # Config AFFiNE
+      AFFINE_REVISION: ${AFFINE_REVISION:-canary}
+      AFFINE_INDEXER_ENABLED: ${AFFINE_INDEXER_ENABLED:-false}
       PORT: 3010
-      AFFINE_SERVER_HTTPS: ${AFFINE_SERVER_HTTPS}
+      AFFINE_SERVER_HTTPS: ${AFFINE_SERVER_HTTPS:-true}
       AFFINE_SERVER_EXTERNAL_URL: ${AFFINE_EXTERNAL_URL}
+      
+      # SMTP / Mailer
       MAILER_HOST: ${MAILER_HOST}
       MAILER_PORT: ${MAILER_PORT}
       MAILER_USER: ${MAILER_USER}
       MAILER_PASSWORD: ${MAILER_PASSWORD}
       MAILER_SENDER: ${MAILER_SENDER}
+
+      # Backend
       REDIS_SERVER_HOST: redis
       DATABASE_URL: ${DATABASE_URL}
       NODE_ENV: production
-   #   AFFINE_ADMIN_EMAIL: ${AFFINE_ADMIN_EMAIL}
-   #   AFFINE_ADMIN_PASSWORD: ${AFFINE_ADMIN_PASSWORD}
     restart: unless-stopped
 
 volumes: