diff --git a/docker/dev/docker-compose.yaml b/docker/dev/docker-compose.yaml
index 73904da37..50b573d38 100755
--- a/docker/dev/docker-compose.yaml
+++ b/docker/dev/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     ports:
       - "80:80"
     environment:
-      UPTIME_APP_API_BASE_URL: "http://localhost:5000/api/v1"
+      UPTIME_APP_API_BASE_URL: "http://localhost:52345/api/v1"
       UPTIME_APP_CLIENT_HOST: "http://localhost"
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d/
@@ -15,7 +15,7 @@ services:
     image: uptime_server:latest
     restart: always
     ports:
-      - "5000:5000"
+      - "52345:52345"
     env_file:
       - server.env
     depends_on:
diff --git a/docker/dev/nginx/conf.d/default.conf b/docker/dev/nginx/conf.d/default.conf
index 9a7690aa5..e2c2a7268 100755
--- a/docker/dev/nginx/conf.d/default.conf
+++ b/docker/dev/nginx/conf.d/default.conf
@@ -12,7 +12,7 @@ server {
     }
     
     # location /api/ {
-    #     proxy_pass http://server:5000/api/;
+    #     proxy_pass http://server:52345/api/;
     #     proxy_http_version 1.1;
     #     proxy_set_header Host $host;
     #     proxy_set_header X-Real-IP $remote_addr;
@@ -24,12 +24,12 @@ server {
     #     proxy_cache off;
     # }
 
-    location /api-docs/ {
-        proxy_pass http://server:5000/api-docs/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
+    # location /api-docs/ {
+    #     proxy_pass http://server:52345/api-docs/;
+    #     proxy_http_version 1.1;
+    #     proxy_set_header Host $host;
+    #     proxy_set_header X-Real-IP $remote_addr;
+    #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #     proxy_set_header X-Forwarded-Proto $scheme;
+    # }
 }
\ No newline at end of file
diff --git a/docker/dev/server.Dockerfile b/docker/dev/server.Dockerfile
index 202422dcc..d9d99a09d 100755
--- a/docker/dev/server.Dockerfile
+++ b/docker/dev/server.Dockerfile
@@ -8,6 +8,6 @@ RUN npm install
 
 COPY ./server/ ./
 
-EXPOSE 5000
+EXPOSE 52345
 
 CMD ["node", "index.js"]
\ No newline at end of file
diff --git a/docker/dist/server.Dockerfile b/docker/dist/server.Dockerfile
index 202422dcc..d9d99a09d 100755
--- a/docker/dist/server.Dockerfile
+++ b/docker/dist/server.Dockerfile
@@ -8,6 +8,6 @@ RUN npm install
 
 COPY ./server/ ./
 
-EXPOSE 5000
+EXPOSE 52345
 
 CMD ["node", "index.js"]
\ No newline at end of file
diff --git a/docker/prod/docker-compose.yaml b/docker/prod/docker-compose.yaml
index bc720862f..db142396d 100755
--- a/docker/prod/docker-compose.yaml
+++ b/docker/prod/docker-compose.yaml
@@ -25,7 +25,7 @@ services:
     image: ghcr.io/bluewave-labs/checkmate:backend-demo
     restart: always
     ports:
-      - "5000:5000"
+      - "52345:52345"
     env_file:
       - server.env
     depends_on:
diff --git a/docker/prod/nginx/conf.d/default.conf b/docker/prod/nginx/conf.d/default.conf
index 98e1bd97d..8afeb93b7 100755
--- a/docker/prod/nginx/conf.d/default.conf
+++ b/docker/prod/nginx/conf.d/default.conf
@@ -16,7 +16,7 @@ server {
     }
     
     location /api/ {
-        proxy_pass http://server:5000/api/;
+        proxy_pass http://server:52345/api/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -25,7 +25,7 @@ server {
     }
 
     location /api-docs/ {
-        proxy_pass http://server:5000/api-docs/;
+        proxy_pass http://server:52345/api-docs/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -50,7 +50,7 @@ server {
     }
 
     location /api/ {
-        proxy_pass http://server:5000/api/;
+        proxy_pass http://server:52345/api/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -59,7 +59,7 @@ server {
     }
 
     location /api-docs/ {
-        proxy_pass http://server:5000/api-docs/;
+        proxy_pass http://server:52345/api-docs/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
diff --git a/docker/prod/server.Dockerfile b/docker/prod/server.Dockerfile
index 998bbe4fe..c80f468f8 100755
--- a/docker/prod/server.Dockerfile
+++ b/docker/prod/server.Dockerfile
@@ -10,6 +10,6 @@ RUN npm install
 
 COPY ./server ./
 
-EXPOSE 5000
+EXPOSE 52345
 
 CMD ["node", "index.js"]
\ No newline at end of file
diff --git a/docker/staging/docker-compose.yaml b/docker/staging/docker-compose.yaml
index d491a729e..b9ca52b6e 100755
--- a/docker/staging/docker-compose.yaml
+++ b/docker/staging/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
     image: ghcr.io/bluewave-labs/checkmate:backend-staging
     restart: always
     ports:
-      - "5000:5000"
+      - "52345:52345"
     env_file:
       - server.env
     depends_on:
diff --git a/docker/staging/nginx/conf.d/default.conf b/docker/staging/nginx/conf.d/default.conf
index 4ea324b11..c755ddef1 100755
--- a/docker/staging/nginx/conf.d/default.conf
+++ b/docker/staging/nginx/conf.d/default.conf
@@ -16,7 +16,7 @@ server {
     }
     
     location /api/ {
-        proxy_pass http://server:5000/api/;
+        proxy_pass http://server:52345/api/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -29,7 +29,7 @@ server {
     }
 
     location /api-docs/ {
-        proxy_pass http://server:5000/api-docs/;
+        proxy_pass http://server:52345/api-docs/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -54,7 +54,7 @@ server {
     }
 
     location /api/ {
-        proxy_pass http://server:5000/api/;
+        proxy_pass http://server:52345/api/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -67,7 +67,7 @@ server {
     }
 
     location /api-docs/ {
-        proxy_pass http://server:5000/api-docs/;
+        proxy_pass http://server:52345/api-docs/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
diff --git a/docker/staging/server.Dockerfile b/docker/staging/server.Dockerfile
index 998bbe4fe..c80f468f8 100755
--- a/docker/staging/server.Dockerfile
+++ b/docker/staging/server.Dockerfile
@@ -10,6 +10,6 @@ RUN npm install
 
 COPY ./server ./
 
-EXPOSE 5000
+EXPOSE 52345
 
 CMD ["node", "index.js"]
\ No newline at end of file
diff --git a/server/index.js b/server/index.js
index f7cab5dbe..f299b32e9 100755
--- a/server/index.js
+++ b/server/index.js
@@ -100,8 +100,6 @@ const openApiSpec = JSON.parse(
 
 let server;
 
-const PORT = 5000;
-
 const shutdown = async () => {
 	if (isShuttingDown) {
 		return;
@@ -217,8 +215,9 @@ const startApp = async () => {
 
 	await translationService.initialize();
 
-	server = app.listen(PORT, () => {
-		logger.info({ message: `server started on port:${PORT}` });
+	const port = appSettings.port || 52345;
+	server = app.listen(port, () => {
+		logger.info({ message: `Server started on port:${port}` });
 	});
 
 	process.on("SIGUSR2", shutdown);
diff --git a/server/service/settingsService.js b/server/service/settingsService.js
index 6a673daa4..548d76eee 100755
--- a/server/service/settingsService.js
+++ b/server/service/settingsService.js
@@ -1,18 +1,21 @@
 const SERVICE_NAME = "SettingsService";
 const envConfig = {
+	nodeEnv: process.env.NODE_ENV,
 	logLevel: process.env.LOG_LEVEL,
-	clientHost: process.env.CLIENT_HOST,
-	jwtSecret: process.env.JWT_SECRET,
-	dbType: process.env.DB_TYPE,
-	dbConnectionString: process.env.DB_CONNECTION_STRING,
-	redisUrl: process.env.REDIS_URL,
-	jwtTTL: process.env.TOKEN_TTL,
-	pagespeedApiKey: process.env.PAGESPEED_API_KEY,
 	systemEmailHost: process.env.SYSTEM_EMAIL_HOST,
 	systemEmailPort: process.env.SYSTEM_EMAIL_PORT,
 	systemEmailUser: process.env.SYSTEM_EMAIL_USER,
 	systemEmailAddress: process.env.SYSTEM_EMAIL_ADDRESS,
 	systemEmailPassword: process.env.SYSTEM_EMAIL_PASSWORD,
+	jwtSecret: process.env.JWT_SECRET,
+	jwtTTL: process.env.TOKEN_TTL,
+	clientHost: process.env.CLIENT_HOST,
+	dbConnectionString: process.env.DB_CONNECTION_STRING,
+	redisUrl: process.env.REDIS_URL,
+	callbackUrl: process.env.CALLBACK_URL,
+	port: process.env.PORT,
+	pagespeedApiKey: process.env.PAGESPEED_API_KEY,
+	uprockApiKey: process.env.UPROCK_API_KEY,
 };
 /**
  * SettingsService