diff --git a/app/server/appsmith-server/src/main/resources/application-docker.properties b/app/server/appsmith-server/src/main/resources/application-docker.properties
index 0340c739b2..873c03a48b 100644
--- a/app/server/appsmith-server/src/main/resources/application-docker.properties
+++ b/app/server/appsmith-server/src/main/resources/application-docker.properties
@@ -1,6 +1,9 @@
 # Appsmith Configurations
 appsmith.baseUri=http://localhost:8080
 
+# This property allows the server to run behind a proxy server and still resolve all the urls correctly
+server.use-forward-headers=true
+
 #Mongo properties
 spring.data.mongodb.database=mobtools
 spring.data.mongodb.host=mongo
@@ -16,7 +19,6 @@ logging.pattern.console=%X - %m%n
 #Spring security
 spring.security.oauth2.client.registration.google.client-id=869021686091-9b84bbf7ea683t1aaefqnmefcnmk6fq6.apps.googleusercontent.com
 spring.security.oauth2.client.registration.google.client-secret=9dvITt4OayEY1HfeY8bHX74p
-spring.security.oauth2.client.registration.google.redirect-uri=${appsmith.baseUri}/login/oauth2/code/google
 
 # Accounts from specific domains are allowed to login
 oauth2.allowed-domains=appsmith.com
diff --git a/app/server/appsmith-server/src/main/resources/application-local.properties b/app/server/appsmith-server/src/main/resources/application-local.properties
index a6d691d1ad..728d69785a 100644
--- a/app/server/appsmith-server/src/main/resources/application-local.properties
+++ b/app/server/appsmith-server/src/main/resources/application-local.properties
@@ -1,6 +1,9 @@
 # Appsmith Configurations
 appsmith.baseUri=http://localhost:8080
 
+# This property allows the server to run behind a proxy server and still resolve all the urls correctly
+server.use-forward-headers=true
+
 #Mongo properties
 spring.data.mongodb.database=mobtools
 spring.data.mongodb.host=localhost
@@ -16,7 +19,6 @@ logging.pattern.console=%X - %m%n
 #Spring security
 spring.security.oauth2.client.registration.google.client-id=869021686091-9b84bbf7ea683t1aaefqnmefcnmk6fq6.apps.googleusercontent.com
 spring.security.oauth2.client.registration.google.client-secret=9dvITt4OayEY1HfeY8bHX74p
-spring.security.oauth2.client.registration.google.redirect-uri=${appsmith.baseUri}/login/oauth2/code/google
 
 # Accounts from specific domains are allowed to login
 oauth2.allowed-domains=appsmith.com
diff --git a/app/server/appsmith-server/src/main/resources/application-staging.properties b/app/server/appsmith-server/src/main/resources/application-staging.properties
index 5c9a8119d1..56e995d4db 100644
--- a/app/server/appsmith-server/src/main/resources/application-staging.properties
+++ b/app/server/appsmith-server/src/main/resources/application-staging.properties
@@ -1,6 +1,9 @@
 # Appsmith Configurations
 appsmith.baseUri=https://release-api.appsmith.com
 
+# This property allows the server to run behind a proxy server and still resolve all the urls correctly
+server.use-forward-headers=true
+
 #Mongo properties
 spring.data.mongodb.database=mobtools
 spring.data.mongodb.uri=mongodb+srv://admin:Y9PuxM52gcP3Dgfo@mobtools-test-cluster-swrsq.mongodb.net/mobtools?retryWrites=true
@@ -14,7 +17,6 @@ logging.pattern.console=%X - %m%n
 #Spring security
 spring.security.oauth2.client.registration.google.client-id=869021686091-9b84bbf7ea683t1aaefqnmefcnmk6fq6.apps.googleusercontent.com
 spring.security.oauth2.client.registration.google.client-secret=9dvITt4OayEY1HfeY8bHX74p
-spring.security.oauth2.client.registration.google.redirect-uri=${appsmith.baseUri}/login/oauth2/code/google
 
 # Accounts from specific domains are allowed to login
 oauth2.allowed-domains=appsmith.com