diff --git a/README.md b/README.md
index 401de24ba..a1e1036fe 100644
--- a/README.md
+++ b/README.md
@@ -35,15 +35,13 @@ npm install
 ng serve
 ```
 
-The application is using the demo server with basic authentication by default. The credentials for the same are:
+The application is using the development server with basic authentication by default. The credentials for the same are:
  
     Username - mifos
     Password - password
 
 **Important Note:** Please do not make any alterations to these credentials.
 
-If you are running into issues with the demo server, please see available alternatives [here](https://groups.google.com/d/msg/mifosdeveloper/7hi_fpunnqE/uD0yQytwFwAJ).
-
 ### Development server
 
 Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index e63a71d2b..33b0576f5 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -4,7 +4,7 @@ import env from './.env';
 export const environment = {
   production: true,
   version: env.npm_package_version,
-  fineractPlatformTenantId: 'default',  // For connecting to server running elsewhere update the tenant identifier
+  fineractPlatformTenantId: 'staging',  // For connecting to server running elsewhere update the tenant identifier
   baseApiUrl: 'https://staging.mifos.io',  // For connecting to server running elsewhere update the base API URL
   apiProvider: '/fineract-provider/api',
   apiVersion: '/v1',
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 061ca763a..9722d2536 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -10,7 +10,7 @@ export const environment = {
   production: false,
   version: env.npm_package_version + '-dev',
   fineractPlatformTenantId: 'default',  // For connecting to server running elsewhere update the tenant identifier
-  baseApiUrl: 'https://demo.mifos.io',  // For connecting to server running elsewhere update the base API URL
+  baseApiUrl: 'https://dev.mifos.io',  // For connecting to server running elsewhere update the base API URL
   apiProvider: '/fineract-provider/api',
   apiVersion: '/v1',
   serverUrl: '',