diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 17d1dbeaa50b..ec5da0ba766b 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -142,7 +142,7 @@ services:
       ZENDESK_SUBDOMAIN: ${ZENDESK_SUBDOMAIN}
       TZ: ${TZ:-America/New_York}
     ports:
-      - 7437:7437
+      - "${AGIXT_PORT:-7437}:7437"
     volumes:
       - ./models:/agixt/models
       - ./agixt/WORKSPACE:/agixt/WORKSPACE
@@ -228,7 +228,7 @@ services:
     volumes:
       - ./WORKSPACE:/app/WORKSPACE
     ports:
-      - "8501:8501"
+      - "${AGIXT_STREAMLIT_PORT:-8501}:8501"
   agixtinteractive:
     image: joshxt/agixt-interactive:main
     init: true
@@ -307,6 +307,8 @@ services:
       STACKEXCHANGE_CLIENT_ID: ${STACKEXCHANGE_CLIENT_ID}
       STRAVA_CLIENT_ID: ${STRAVA_CLIENT_ID}
       STRIPE_CLIENT_ID: ${STRIPE_CLIENT_ID}
+      STRIPE_PRICING_TABLE_ID: ${STRIPE_PRICING_TABLE_ID}
+      STRIPE_PUBLISHABLE_KEY: ${STRIPE_PUBLISHABLE_KEY}
       TWITCH_CLIENT_ID: ${TWITCH_CLIENT_ID}
       VIADEO_CLIENT_ID: ${VIADEO_CLIENT_ID}
       VIMEO_CLIENT_ID: ${VIMEO_CLIENT_ID}
@@ -324,7 +326,7 @@ services:
       ZENDESK_SUBDOMAIN: ${ZENDESK_SUBDOMAIN}
       TZ: ${TZ:-America/New_York}
     ports:
-      - 3437:3437
+      - "${AGIXT_INTERACTIVE_PORT:-3437}:3437"
     restart: unless-stopped
     volumes:
       - ./node_modules:/app/node_modules
diff --git a/docker-compose-nostreamlit-dev.yml b/docker-compose-nostreamlit-dev.yml
index 492b6ec8047b..577c6047f608 100644
--- a/docker-compose-nostreamlit-dev.yml
+++ b/docker-compose-nostreamlit-dev.yml
@@ -109,6 +109,8 @@ services:
       STRAVA_CLIENT_SECRET: ${STRAVA_CLIENT_SECRET}
       STRIPE_CLIENT_ID: ${STRIPE_CLIENT_ID}
       STRIPE_CLIENT_SECRET: ${STRIPE_CLIENT_SECRET}
+      STRIPE_API_KEY: ${STRIPE_API_KEY}
+      STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
       TWITCH_CLIENT_ID: ${TWITCH_CLIENT_ID}
       TWITCH_CLIENT_SECRET: ${TWITCH_CLIENT_SECRET}
       VIADEO_CLIENT_ID: ${VIADEO_CLIENT_ID}
@@ -140,7 +142,7 @@ services:
       ZENDESK_SUBDOMAIN: ${ZENDESK_SUBDOMAIN}
       TZ: ${TZ:-America/New_York}
     ports:
-      - 7437:7437
+      - "${AGIXT_PORT:-7437}:7437"
     volumes:
       - ./models:/agixt/models
       - ./WORKSPACE:/agixt/WORKSPACE
@@ -228,6 +230,8 @@ services:
       STACKEXCHANGE_CLIENT_ID: ${STACKEXCHANGE_CLIENT_ID}
       STRAVA_CLIENT_ID: ${STRAVA_CLIENT_ID}
       STRIPE_CLIENT_ID: ${STRIPE_CLIENT_ID}
+      STRIPE_PRICING_TABLE_ID: ${STRIPE_PRICING_TABLE_ID}
+      STRIPE_PUBLISHABLE_KEY: ${STRIPE_PUBLISHABLE_KEY}
       TWITCH_CLIENT_ID: ${TWITCH_CLIENT_ID}
       VIADEO_CLIENT_ID: ${VIADEO_CLIENT_ID}
       VIMEO_CLIENT_ID: ${VIMEO_CLIENT_ID}
@@ -245,7 +249,7 @@ services:
       ZENDESK_SUBDOMAIN: ${ZENDESK_SUBDOMAIN}
       TZ: ${TZ:-America/New_York}
     ports:
-      - 3437:3437
+      - "${AGIXT_INTERACTIVE_PORT:-3437}:3437"
     restart: unless-stopped
     volumes:
       - ./node_modules:/app/node_modules
diff --git a/docker-compose-nostreamlit.yml b/docker-compose-nostreamlit.yml
index 82c934707a23..814bd1e68903 100644
--- a/docker-compose-nostreamlit.yml
+++ b/docker-compose-nostreamlit.yml
@@ -107,6 +107,8 @@ services:
       STACKEXCHANGE_CLIENT_SECRET: ${STACKEXCHANGE_CLIENT_SECRET}
       STRAVA_CLIENT_ID: ${STRAVA_CLIENT_ID}
       STRAVA_CLIENT_SECRET: ${STRAVA_CLIENT_SECRET}
+      STRIPE_API_KEY: ${STRIPE_API_KEY}
+      STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
       STRIPE_CLIENT_ID: ${STRIPE_CLIENT_ID}
       STRIPE_CLIENT_SECRET: ${STRIPE_CLIENT_SECRET}
       TWITCH_CLIENT_ID: ${TWITCH_CLIENT_ID}
@@ -140,7 +142,7 @@ services:
       ZENDESK_SUBDOMAIN: ${ZENDESK_SUBDOMAIN}
       TZ: ${TZ:-America/New_York}
     ports:
-      - 7437:7437
+      - "${AGIXT_PORT:-7437}:7437"
     volumes:
       - ./models:/agixt/models
       - ./WORKSPACE:/agixt/WORKSPACE
@@ -228,6 +230,8 @@ services:
       STACKEXCHANGE_CLIENT_ID: ${STACKEXCHANGE_CLIENT_ID}
       STRAVA_CLIENT_ID: ${STRAVA_CLIENT_ID}
       STRIPE_CLIENT_ID: ${STRIPE_CLIENT_ID}
+      STRIPE_PRICING_TABLE_ID: ${STRIPE_PRICING_TABLE_ID}
+      STRIPE_PUBLISHABLE_KEY: ${STRIPE_PUBLISHABLE_KEY}
       TWITCH_CLIENT_ID: ${TWITCH_CLIENT_ID}
       VIADEO_CLIENT_ID: ${VIADEO_CLIENT_ID}
       VIMEO_CLIENT_ID: ${VIMEO_CLIENT_ID}
@@ -245,7 +249,7 @@ services:
       ZENDESK_SUBDOMAIN: ${ZENDESK_SUBDOMAIN}
       TZ: ${TZ:-America/New_York}
     ports:
-      - 3437:3437
+      - "${AGIXT_INTERACTIVE_PORT:-3437}:3437"
     restart: unless-stopped
     volumes:
       - ./node_modules:/app/node_modules
diff --git a/docker-compose.yml b/docker-compose.yml
index 5474824b1f5f..9585e9c4439f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -140,7 +140,7 @@ services:
       ZENDESK_SUBDOMAIN: ${ZENDESK_SUBDOMAIN}
       TZ: ${TZ:-America/New_York}
     ports:
-      - 7437:7437
+      - "${AGIXT_PORT:-7437}:7437"
     volumes:
       - ./models:/agixt/models
       - ./WORKSPACE:/agixt/WORKSPACE
@@ -226,7 +226,7 @@ services:
     volumes:
       - ./agixt/WORKSPACE:/app/WORKSPACE
     ports:
-      - "8501:8501"
+      - "${AGIXT_STREAMLIT_PORT:-8501}:8501"
   agixtinteractive:
     image: joshxt/agixt-interactive:latest
     init: true
@@ -322,7 +322,7 @@ services:
       ZENDESK_SUBDOMAIN: ${ZENDESK_SUBDOMAIN}
       TZ: ${TZ:-America/New_York}
     ports:
-      - 3437:3437
+      - "${AGIXT_INTERACTIVE_PORT:-3437}:3437"
     restart: unless-stopped
     volumes:
       - ./node_modules:/app/node_modules
diff --git a/start.py b/start.py
index 69f0d2d08213..23daa9e2f28d 100644
--- a/start.py
+++ b/start.py
@@ -173,6 +173,9 @@ def get_default_env_vars():
         "AGIXT_API_KEY": "",
         "STREAMLIT_AGIXT_URI": "http://agixt:7437",
         "AGIXT_URI": "http://localhost:7437",
+        "AGIXT_PORT": "7437",
+        "AGIXT_INTERACTIVE_PORT": "3437",
+        "AGIXT_STREAMLIT_PORT": "8501",
         "AGIXT_AGENT": "AGiXT",
         "AGIXT_BRANCH": "stable",
         "AGIXT_FILE_UPLOAD_ENABLED": "true",
@@ -311,6 +314,8 @@ def get_default_env_vars():
         "STRAVA_CLIENT_SECRET": "",
         "STRIPE_CLIENT_ID": "",
         "STRIPE_CLIENT_SECRET": "",
+        "STRIPE_PUBLISHABLE_KEY": "",
+        "STRIPE_PRICING_TABLE_ID": "",
         "STRIPE_API_KEY": "",
         "STRIPE_WEBHOOK_SECRET": "",
         "TWITCH_CLIENT_ID": "",