diff --git a/Build and Run for first time.bat b/Build and Run for first time.bat
index d0ac034..2c144d8 100644
--- a/Build and Run for first time.bat	
+++ b/Build and Run for first time.bat	
@@ -156,7 +156,9 @@ echo Updating docker-compose.yml with APP_MODE=%APP_MODE%...
   echo       - FLASK_APP=app.py
   echo       - FLASK_ENV=development
   echo       - NODE_PATH=/usr/lib/node_modules
-  echo       - APP_MODE=%APP_MODE% 
+  echo       - APP_MODE=%APP_MODE%
+  echo       - APP_BASE_URL=https://localhost:5000
+  echo       - HAPI_FHIR_URL=https://loclhost:8080/fhir 
   echo     command: supervisord -c /etc/supervisord.conf
 ) > docker-compose.yml.tmp
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 66b2ad0..51ac111 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,6 @@ services:
       - FLASK_ENV=development
       - NODE_PATH=/usr/lib/node_modules
       - APP_MODE=lite
-      - APP_BASE_URL=https://yourdomain.com
-      - HAPI_FHIR_URL=https://hapi.yourdomain.com/fhir 
+      - APP_BASE_URL=https://localhost:5000
+      - HAPI_FHIR_URL=https://loclhost:8080/fhir
     command: supervisord -c /etc/supervisord.conf
diff --git a/setup_linux.sh b/setup_linux.sh
index 14978e6..b25eed3 100644
--- a/setup_linux.sh
+++ b/setup_linux.sh
@@ -195,6 +195,8 @@ services:
       - FLASK_ENV=development
       - NODE_PATH=/usr/lib/node_modules
       - APP_MODE=${APP_MODE}
+      - APP_BASE_URL=https://localhost:5000
+      - HAPI_FHIR_URL=https://loclhost:8080/fhir
     command: supervisord -c /etc/supervisord.conf
 EOF