diff --git a/README.md b/README.md
index 9b47ab6a..da8b1760 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ cd server
 npm run dev   or   yarn run dev
 ```
 
-- Open http://127.0.0.1:5050/ping
+- Open http://127.0.0.1:22664/ping
 - Open another terminal in vscode and run
 
 ```
diff --git a/backend/package.json b/backend/package.json
index a7872010..51558a47 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -10,6 +10,7 @@
     "axios": "^0.21.1",
     "canvas": "^2.8.0",
     "cors": "^2.8.5",
+    "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "express-async-errors": "^3.1.1",
     "global-time": "1.5.0",
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index 61b2a8fc..73aa13cc 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -1,6 +1,8 @@
+require('dotenv').config();
+
 module.exports = {
   // Port to run the server on
-  PORT: process.env.PORT || 5050,
+  PORT: process.env.PORT || 22664,
 
   // Cetrifugo Credentials
   SOCKER_KEY: process.env.SOCKER_TOKEN || '58c2400b-831d-411d-8fe8-31b6e337738b',
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f4ba839a..e830ae43 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -784,6 +784,11 @@ dot-prop@^5.2.0:
   dependencies:
     is-obj "^2.0.0"
 
+dotenv@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
diff --git a/frontend/package.json b/frontend/package.json
index 5dabd68a..eebeff87 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -34,7 +34,7 @@
     "watch-tests": "cross-env BABEL_ENV=test jest --watch",
     "coverage": "cross-env BABEL_ENV=test jest --coverage"
   },
-  "proxy": "http://127.0.0.1:5050/",
+  "proxy": "http://127.0.0.1:22664/",
   "eslintConfig": {
     "extends": [
       "react-app",
diff --git a/frontend/src/adapters/xhr/index.js b/frontend/src/adapters/xhr/index.js
index 49623adb..050e96a1 100644
--- a/frontend/src/adapters/xhr/index.js
+++ b/frontend/src/adapters/xhr/index.js
@@ -4,7 +4,7 @@ import { getCurrentOrganisation, getAuthToken, getLoggedInUserData } from '../au
 function returnAxiosInstance() {
   return Axios.create({
     baseURL: 'https://chess.zuri.chat/api/v1/',
-    // baseURL: "//localhost:5050/api/v1/",
+    // baseURL: "//localhost:22664/api/v1/",
     headers: {
       'Content-Type': 'application/json',
       Organisation: getCurrentOrganisation(),