diff --git a/app.yml b/app.yml
index 521f67f..552617a 100644
--- a/app.yml
+++ b/app.yml
@@ -30,8 +30,8 @@ env:
 
   DISCOURSE_DEFAULT_LOCALE: en
 
-  ## Temporary domain - will switch to community.cadcad.org later
-  DISCOURSE_HOSTNAME: 'cadcad-forum.jeffemmett.com'
+  ## Primary domain: community.cadcad.org (switched from cadcad-forum.jeffemmett.com)
+  DISCOURSE_HOSTNAME: 'community.cadcad.org'
 
   ## Admin email for initial setup
   DISCOURSE_DEVELOPER_EMAILS: 'jeff@jeffemmett.com'
@@ -41,8 +41,8 @@ env:
   DISCOURSE_SMTP_PORT: 25
   DISCOURSE_SMTP_ENABLE_START_TLS: false
   DISCOURSE_SMTP_OPENSSL_VERIFY_MODE: none
-  DISCOURSE_SMTP_DOMAIN: jeffemmett.com
-  DISCOURSE_NOTIFICATION_EMAIL: noreply@jeffemmett.com
+  DISCOURSE_SMTP_DOMAIN: cadcad.org
+  DISCOURSE_NOTIFICATION_EMAIL: noreply@cadcad.org
 
   ## Serve behind reverse proxy
   DISCOURSE_FORCE_HTTPS: true
@@ -79,5 +79,5 @@ labels:
   app_name: discourse
   traefik.enable: "true"
   traefik.docker.network: traefik-public
-  traefik.http.routers.discourse.rule: "Host(`demo.rforum.online`) || Host(`cadcad-forum.jeffemmett.com`)"
+  traefik.http.routers.discourse.rule: "Host(`demo.rforum.online`) || Host(`community.cadcad.org`)"
   traefik.http.services.discourse.loadbalancer.server.port: "80"