diff --git a/Accounts/package-lock.json b/Accounts/package-lock.json
index 257d87af50..8803a2ab48 100644
--- a/Accounts/package-lock.json
+++ b/Accounts/package-lock.json
@@ -11,23 +11,18 @@
       "dependencies": {
         "react-scripts": "^5.0.0",
         "react-redux": "^7.2.6",
+        "Common": "file:../Common",
         "@stripe/react-stripe-js": "^1.7.0",
         "@types/react-redux": "^7.1.23",
         "axios": "^0.26.1",
         "@types/react-router-redux": "^5.0.21",
-        "redux-logger": "^3.0.6",
         "compression": "^1.7.4",
-        "redux-thunk": "^2.4.1",
-        "CommonUI": "file:../CommonUI",
-        "redux": "^4.1.2",
         "faker": "^6.6.6",
         "@types/compression": "^1.7.2",
         "cli-table": "^0.3.11",
         "file-saver": "^2.0.5",
         "jest": "^27.5.1",
-        "CommonServer": "file:../CommonServer",
         "valid-url": "^1.0.9",
-        "amplitude-js": "^8.17.0",
         "@types/react-dom": "^17.0.14",
         "query-string": "^7.1.1",
         "@loadable/component": "^5.15.2",
@@ -39,16 +34,16 @@
         "universal-cookie": "^4.0.4",
         "react-router-dom": "^6.2.2",
         "history": "^5.3.0",
+        "CommonServer": "file:../CommonServer",
         "@types/redux-form": "^8.3.3",
         "@types/redux-logger": "^3.0.9",
         "react-router-redux": "^4.0.8",
         "card-validator": "^8.1.1",
         "express": "^4.17.3",
         "react-frontload": "^2.0.0",
-        "react": "^17.0.2",
-        "redux-form": "^8.3.8",
+        "react": "^18.1.0",
         "react-ga": "^3.3.0",
-        "Common": "file:../Common",
+        "CommonUI": "file:../CommonUI",
         "workbox-build": "^6.5.1",
         "prop-types": "^15.8.1",
         "puppeteer": "^13.5.1"
@@ -288,6 +283,29 @@
         "webpack": "^5.20.0"
       }
     },
+    "../Common": {
+      "name": "common",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@types/nanoid-dictionary": "^4.2.0",
+        "@types/uuid": "^8.3.4",
+        "axios": "^0.26.1",
+        "moment": "^2.29.2",
+        "nanoid": "^3.3.2",
+        "nanoid-dictionary": "^4.3.0",
+        "slugify": "^1.6.5",
+        "typeorm": "^0.3.6",
+        "uuid": "^8.3.2"
+      },
+      "devDependencies": {
+        "@faker-js/faker": "^6.3.1",
+        "@types/jest": "^27.4.1",
+        "@types/node": "^17.0.22",
+        "jest": "^27.5.1",
+        "ts-jest": "^27.1.4"
+      }
+    },
     "node_modules/camel-case/node_modules/tslib": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
@@ -2036,39 +2054,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/redux-form": {
-      "version": "8.3.8",
-      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-8.3.8.tgz",
-      "integrity": "sha512-PzXhA0d+awIc4PkuhbDa6dCEiraMrGMyyDlYEVNX6qEyW/G2SqZXrjav5zrpXb0CCeqQSc9iqwbMtYQXbJbOAQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2",
-        "es6-error": "^4.1.1",
-        "hoist-non-react-statics": "^3.3.2",
-        "invariant": "^2.2.4",
-        "is-promise": "^2.1.0",
-        "lodash": "^4.17.15",
-        "prop-types": "^15.6.1",
-        "react-is": "^16.4.2"
-      },
-      "engines": {
-        "node": ">=8.10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/redux-form"
-      },
-      "peerDependencies": {
-        "immutable": "^3.8.2 || ^4.0.0",
-        "react": "^16.4.2 || ^17.0.0",
-        "react-redux": "^6.0.1 || ^7.0.0",
-        "redux": "^3.7.2 || ^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "immutable": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
@@ -2640,19 +2625,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/amplitude-js": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.17.0.tgz",
-      "integrity": "sha512-9Ovx/15Wt4byNSKpesaTaNnHmwgkV9pn0BfI70qHr0iaPgEAtMV0HdA+Zs6555ODp3pvrmj5JTXDl3/DPLmNRQ==",
-      "dependencies": {
-        "@amplitude/analytics-connector": "1.0.0",
-        "@amplitude/ua-parser-js": "0.7.26",
-        "@amplitude/utils": "^1.0.5",
-        "@babel/runtime": "^7.3.4",
-        "blueimp-md5": "^2.10.0",
-        "query-string": "5"
-      }
-    },
     "node_modules/istanbul-lib-source-maps/node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -3149,10 +3121,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/CommonUI": {
-      "resolved": "../CommonUI",
-      "link": true
-    },
     "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -3494,6 +3462,10 @@
         "follow-redirects": "^1.14.8"
       }
     },
+    "node_modules/Common": {
+      "resolved": "../Common",
+      "link": true
+    },
     "node_modules/@sinonjs/commons": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
@@ -3560,17 +3532,25 @@
     },
     "../common": {
       "version": "1.0.0",
+      "extraneous": true,
       "license": "MIT",
       "dependencies": {
         "@types/nanoid-dictionary": "^4.2.0",
+        "@types/uuid": "^8.3.4",
         "axios": "^0.26.1",
         "moment": "^2.29.2",
         "nanoid": "^3.3.2",
         "nanoid-dictionary": "^4.3.0",
-        "slugify": "^1.6.5"
+        "slugify": "^1.6.5",
+        "typeorm": "^0.3.6",
+        "uuid": "^8.3.2"
       },
       "devDependencies": {
-        "@types/node": "^17.0.22"
+        "@faker-js/faker": "^6.3.1",
+        "@types/jest": "^27.4.1",
+        "@types/node": "^17.0.22",
+        "jest": "^27.5.1",
+        "ts-jest": "^27.1.4"
       }
     },
     "node_modules/@csstools/normalize.css": {
@@ -4013,24 +3993,6 @@
         "defaults": "^1.0.3"
       }
     },
-    "node_modules/@amplitude/ua-parser-js": {
-      "version": "0.7.26",
-      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.26.tgz",
-      "integrity": "sha512-62/Rid6YQ7F2KT/5vTre41Y26ivrEoFC8lbrsJZqBKaiXMJWG0YpNv9RgxNSaZS2jPLVQgoB/FFeWxihOLfIcg==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -4132,6 +4094,10 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/CommonServer": {
+      "resolved": "../CommonServer",
+      "link": true
+    },
     "node_modules/is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
@@ -4490,10 +4456,9 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
+    "node_modules/CommonUI": {
+      "resolved": "../CommonUI",
+      "link": true
     },
     "node_modules/clean-stack": {
       "version": "2.2.0",
@@ -5252,19 +5217,6 @@
         "postcss": ">=8"
       }
     },
-    "node_modules/amplitude-js/node_modules/query-string": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-      "dependencies": {
-        "decode-uri-component": "^0.2.0",
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -6551,12 +6503,11 @@
       }
     },
     "node_modules/react": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
-      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.1.0.tgz",
+      "integrity": "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
+        "loose-envify": "^1.1.0"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -7129,6 +7080,41 @@
         "node": ">= 0.8"
       }
     },
+    "../CommonServer": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@types/json2csv": "^5.0.3",
+        "Common": "file:../Common",
+        "jsonwebtoken": "^8.5.1",
+        "node-device-detector": "^2.0.0",
+        "gridfs-stream": "^1.1.1",
+        "dotenv": "^16.0.0",
+        "pg": "^8.7.3",
+        "nodemailer": "^6.7.3",
+        "nodemailer-express-handlebars": "^5.0.0",
+        "handlebars": "^4.7.7",
+        "@types/gridfs-stream": "^0.5.35",
+        "typeorm": "^0.3.6",
+        "airtable": "^0.11.3",
+        "socket.io": "^4.4.1",
+        "express": "^4.17.3",
+        "typeorm-extension": "^2.1.0",
+        "cors": "^2.8.5",
+        "@elastic/elasticsearch": "^8.1.0",
+        "winston": "^3.6.0"
+      },
+      "devDependencies": {
+        "@faker-js/faker": "^6.3.1",
+        "@types/cors": "^2.8.12",
+        "@types/express": "^4.17.13",
+        "@types/jest": "^27.4.1",
+        "@types/jsonwebtoken": "^8.5.8",
+        "@types/node": "^17.0.22",
+        "jest": "^27.5.1",
+        "ts-jest": "^27.1.4"
+      }
+    },
     "node_modules/@babel/preset-modules": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
@@ -8381,10 +8367,6 @@
         "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/common": {
-      "resolved": "../common",
-      "link": true
-    },
     "node_modules/robots-parser": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/robots-parser/-/robots-parser-3.0.0.tgz",
@@ -9692,24 +9674,11 @@
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
-    "node_modules/is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-    },
     "node_modules/@typescript-eslint/parser/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "node_modules/amplitude-js/node_modules/strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/json5": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
@@ -9777,6 +9746,25 @@
         "node": ">= 8"
       }
     },
+    "../CommonUI": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@fortawesome/fontawesome-svg-core": "^6.1.0",
+        "@fortawesome/free-regular-svg-icons": "^6.1.0",
+        "@fortawesome/free-solid-svg-icons": "^6.1.0",
+        "@fortawesome/react-fontawesome": "^0.1.18",
+        "@types/react": "^17.0.43",
+        "Common": "file:../Common",
+        "prop-types": "^15.8.1",
+        "react": "^18.1.0",
+        "react-router": "^6.2.2",
+        "universal-cookie": "^4.0.4"
+      },
+      "devDependencies": {
+        "@types/node": "^17.0.23"
+      }
+    },
     "node_modules/scss-parser": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/scss-parser/-/scss-parser-1.0.5.tgz",
@@ -10220,14 +10208,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/redux-thunk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
-      "peerDependencies": {
-        "redux": "^4"
-      }
-    },
     "node_modules/jest-cli/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -11741,14 +11721,6 @@
         "node": "*"
       }
     },
-    "node_modules/redux-logger": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/redux-logger/-/redux-logger-3.0.6.tgz",
-      "integrity": "sha1-91VZZvMJjzyIYExEnPC69XeCdL8=",
-      "dependencies": {
-        "deep-diff": "^0.3.5"
-      }
-    },
     "node_modules/@babel/helper-module-imports": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
@@ -13071,14 +13043,6 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
-    "node_modules/@amplitude/types": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.9.2.tgz",
-      "integrity": "sha512-s+Q/O8kNfocZiyGvVdtM5T4JGPwLRZ4Q26wtEF5xJhyCtJglGMe0ixe6u/6iW9s4JHIq+LlPlUu5095pVsdtNA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/postcss-place": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.4.tgz",
@@ -14139,35 +14103,6 @@
         "node": ">=6.9.0"
       }
     },
-    "../CommonServer": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "@types/json2csv": "^5.0.3",
-        "jsonwebtoken": "^8.5.1",
-        "gridfs-stream": "^1.1.1",
-        "dotenv": "^16.0.0",
-        "nodemailer": "^6.7.3",
-        "mongodb": "^4.4.1",
-        "nodemailer-express-handlebars": "^5.0.0",
-        "handlebars": "^4.7.7",
-        "mongoose": "^6.2.8",
-        "@types/gridfs-stream": "^0.5.35",
-        "airtable": "^0.11.3",
-        "socket.io": "^4.4.1",
-        "express": "^4.17.3",
-        "cors": "^2.8.5",
-        "@elastic/elasticsearch": "^8.1.0",
-        "Common": "file:../Common",
-        "winston": "^3.6.0"
-      },
-      "devDependencies": {
-        "@types/cors": "^2.8.12",
-        "@types/express": "^4.17.13",
-        "@types/jsonwebtoken": "^8.5.8",
-        "@types/node": "^17.0.22"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -14262,11 +14197,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/deep-diff": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz",
-      "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ="
-    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -14618,14 +14548,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@amplitude/analytics-connector": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.0.0.tgz",
-      "integrity": "sha512-6RZwSMjhO9VD5rw5FV5U7pU00drDQAQqA+ZTv4mSop8XEws9TimzynGYzLYLijV0vnK7h6j7D3+VJtM4f4MlNA==",
-      "dependencies": {
-        "@amplitude/ua-parser-js": "0.7.26"
-      }
-    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -15601,6 +15523,7 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
       "dependencies": {
         "loose-envify": "^1.0.0"
       }
@@ -15688,10 +15611,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/CommonServer": {
-      "resolved": "../CommonServer",
-      "link": true
-    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -16395,25 +16314,6 @@
         "node": ">= 0.10"
       }
     },
-    "../CommonUI": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "@fortawesome/fontawesome-svg-core": "^6.1.0",
-        "@fortawesome/free-regular-svg-icons": "^6.1.0",
-        "@fortawesome/free-solid-svg-icons": "^6.1.0",
-        "@fortawesome/react-fontawesome": "^0.1.18",
-        "@types/react": "^17.0.43",
-        "Common": "file:../Common",
-        "prop-types": "^15.8.1",
-        "react": "^17.0.2",
-        "react-router": "^6.2.2",
-        "universal-cookie": "^4.0.4"
-      },
-      "devDependencies": {
-        "@types/node": "^17.0.23"
-      }
-    },
     "node_modules/jest-resolve/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -17010,23 +16910,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "node_modules/@amplitude/utils": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.9.2.tgz",
-      "integrity": "sha512-hGOIoIjmZ0pq/3b2gBrr17TaEarlR+qzFGu5npm76+scd/51F0eNvjd0vgV6WbJT1cxhyH/5Z8kihGWOU3vS3Q==",
-      "dependencies": {
-        "@amplitude/types": "^1.9.2",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/blueimp-md5": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
-      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w=="
-    },
     "node_modules/jest": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
@@ -17786,33 +17669,6 @@
     }
   },
   "dependencies": {
-    "@amplitude/analytics-connector": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.0.0.tgz",
-      "integrity": "sha512-6RZwSMjhO9VD5rw5FV5U7pU00drDQAQqA+ZTv4mSop8XEws9TimzynGYzLYLijV0vnK7h6j7D3+VJtM4f4MlNA==",
-      "requires": {
-        "@amplitude/ua-parser-js": "0.7.26"
-      }
-    },
-    "@amplitude/types": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.9.2.tgz",
-      "integrity": "sha512-s+Q/O8kNfocZiyGvVdtM5T4JGPwLRZ4Q26wtEF5xJhyCtJglGMe0ixe6u/6iW9s4JHIq+LlPlUu5095pVsdtNA=="
-    },
-    "@amplitude/ua-parser-js": {
-      "version": "0.7.26",
-      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.26.tgz",
-      "integrity": "sha512-62/Rid6YQ7F2KT/5vTre41Y26ivrEoFC8lbrsJZqBKaiXMJWG0YpNv9RgxNSaZS2jPLVQgoB/FFeWxihOLfIcg=="
-    },
-    "@amplitude/utils": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.9.2.tgz",
-      "integrity": "sha512-hGOIoIjmZ0pq/3b2gBrr17TaEarlR+qzFGu5npm76+scd/51F0eNvjd0vgV6WbJT1cxhyH/5Z8kihGWOU3vS3Q==",
-      "requires": {
-        "@amplitude/types": "^1.9.2",
-        "tslib": "^1.9.3"
-      }
-    },
     "@ampproject/remapping": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
@@ -20858,6 +20714,73 @@
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
+    "Common": {
+      "version": "file:../Common",
+      "requires": {
+        "@faker-js/faker": "^6.3.1",
+        "@types/jest": "^27.4.1",
+        "@types/nanoid-dictionary": "^4.2.0",
+        "@types/node": "^17.0.22",
+        "@types/uuid": "^8.3.4",
+        "axios": "^0.26.1",
+        "jest": "^27.5.1",
+        "moment": "^2.29.2",
+        "nanoid": "^3.3.2",
+        "nanoid-dictionary": "^4.3.0",
+        "slugify": "^1.6.5",
+        "ts-jest": "^27.1.4",
+        "typeorm": "^0.3.6",
+        "uuid": "^8.3.2"
+      }
+    },
+    "CommonServer": {
+      "version": "file:../CommonServer",
+      "requires": {
+        "@elastic/elasticsearch": "^8.1.0",
+        "@faker-js/faker": "^6.3.1",
+        "@types/cors": "^2.8.12",
+        "@types/express": "^4.17.13",
+        "@types/gridfs-stream": "^0.5.35",
+        "@types/jest": "^27.4.1",
+        "@types/json2csv": "^5.0.3",
+        "@types/jsonwebtoken": "^8.5.8",
+        "@types/node": "^17.0.22",
+        "Common": "file:../Common",
+        "airtable": "^0.11.3",
+        "cors": "^2.8.5",
+        "dotenv": "^16.0.0",
+        "express": "^4.17.3",
+        "gridfs-stream": "^1.1.1",
+        "handlebars": "^4.7.7",
+        "jest": "^27.5.1",
+        "jsonwebtoken": "^8.5.1",
+        "node-device-detector": "^2.0.0",
+        "nodemailer": "^6.7.3",
+        "nodemailer-express-handlebars": "^5.0.0",
+        "pg": "^8.7.3",
+        "socket.io": "^4.4.1",
+        "ts-jest": "^27.1.4",
+        "typeorm": "^0.3.6",
+        "typeorm-extension": "^2.1.0",
+        "winston": "^3.6.0"
+      }
+    },
+    "CommonUI": {
+      "version": "file:../CommonUI",
+      "requires": {
+        "@fortawesome/fontawesome-svg-core": "^6.1.0",
+        "@fortawesome/free-regular-svg-icons": "^6.1.0",
+        "@fortawesome/free-solid-svg-icons": "^6.1.0",
+        "@fortawesome/react-fontawesome": "^0.1.18",
+        "@types/node": "^17.0.23",
+        "@types/react": "^17.0.43",
+        "Common": "file:../Common",
+        "prop-types": "^15.8.1",
+        "react": "^18.1.0",
+        "react-router": "^6.2.2",
+        "universal-cookie": "^4.0.4"
+      }
+    },
     "abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -21008,36 +20931,6 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
-    "amplitude-js": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.17.0.tgz",
-      "integrity": "sha512-9Ovx/15Wt4byNSKpesaTaNnHmwgkV9pn0BfI70qHr0iaPgEAtMV0HdA+Zs6555ODp3pvrmj5JTXDl3/DPLmNRQ==",
-      "requires": {
-        "@amplitude/analytics-connector": "1.0.0",
-        "@amplitude/ua-parser-js": "0.7.26",
-        "@amplitude/utils": "^1.0.5",
-        "@babel/runtime": "^7.3.4",
-        "blueimp-md5": "^2.10.0",
-        "query-string": "5"
-      },
-      "dependencies": {
-        "query-string": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-          "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-          "requires": {
-            "decode-uri-component": "^0.2.0",
-            "object-assign": "^4.1.0",
-            "strict-uri-encode": "^1.0.0"
-          }
-        },
-        "strict-uri-encode": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-          "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
-        }
-      }
-    },
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -21529,11 +21422,6 @@
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
-    "blueimp-md5": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
-      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w=="
-    },
     "body-parser": {
       "version": "1.19.2",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
@@ -21938,70 +21826,16 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-9.1.0.tgz",
       "integrity": "sha512-i0/MaqBtdbnJ4XQs4Pmyb+oFQl+q0lsAmokVUH92SlSw4fkeAcG3bVon+Qt7hmtF+u3Het6o4VgrcY3qAoEB6w=="
     },
-    "common": {
-      "version": "file:../common",
-      "requires": {
-        "@types/nanoid-dictionary": "^4.2.0",
-        "@types/node": "^17.0.22",
-        "axios": "^0.26.1",
-        "moment": "^2.29.2",
-        "nanoid": "^3.3.2",
-        "nanoid-dictionary": "^4.3.0",
-        "slugify": "^1.6.5"
-      }
-    },
     "common-path-prefix": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
       "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
     },
-    "CommonServer": {
-      "version": "file:../CommonServer",
-      "requires": {
-        "@elastic/elasticsearch": "^8.1.0",
-        "@types/cors": "^2.8.12",
-        "@types/express": "^4.17.13",
-        "@types/gridfs-stream": "^0.5.35",
-        "@types/json2csv": "^5.0.3",
-        "@types/jsonwebtoken": "^8.5.8",
-        "@types/node": "^17.0.22",
-        "airtable": "^0.11.3",
-        "Common": "file:../Common",
-        "cors": "^2.8.5",
-        "dotenv": "^16.0.0",
-        "express": "^4.17.3",
-        "gridfs-stream": "^1.1.1",
-        "handlebars": "^4.7.7",
-        "jsonwebtoken": "^8.5.1",
-        "mongodb": "^4.4.1",
-        "mongoose": "^6.2.8",
-        "nodemailer": "^6.7.3",
-        "nodemailer-express-handlebars": "^5.0.0",
-        "socket.io": "^4.4.1",
-        "winston": "^3.6.0"
-      }
-    },
     "common-tags": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
       "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="
     },
-    "CommonUI": {
-      "version": "file:../CommonUI",
-      "requires": {
-        "@fortawesome/fontawesome-svg-core": "^6.1.0",
-        "@fortawesome/free-regular-svg-icons": "^6.1.0",
-        "@fortawesome/free-solid-svg-icons": "^6.1.0",
-        "@fortawesome/react-fontawesome": "^0.1.18",
-        "@types/node": "^17.0.23",
-        "@types/react": "^17.0.43",
-        "Common": "file:../Common",
-        "prop-types": "^15.8.1",
-        "react": "^17.0.2",
-        "react-router": "^6.2.2",
-        "universal-cookie": "^4.0.4"
-      }
-    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -22458,11 +22292,6 @@
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
       "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
     },
-    "deep-diff": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz",
-      "integrity": "sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ="
-    },
     "deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -22915,11 +22744,6 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
-    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -24434,6 +24258,7 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
       "requires": {
         "loose-envify": "^1.0.0"
       }
@@ -24591,11 +24416,6 @@
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
     },
-    "is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-    },
     "is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
@@ -27944,12 +27764,11 @@
       }
     },
     "react": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
-      "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.1.0.tgz",
+      "integrity": "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==",
       "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
+        "loose-envify": "^1.1.0"
       }
     },
     "react-app-polyfill": {
@@ -28240,34 +28059,6 @@
         "@babel/runtime": "^7.9.2"
       }
     },
-    "redux-form": {
-      "version": "8.3.8",
-      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-8.3.8.tgz",
-      "integrity": "sha512-PzXhA0d+awIc4PkuhbDa6dCEiraMrGMyyDlYEVNX6qEyW/G2SqZXrjav5zrpXb0CCeqQSc9iqwbMtYQXbJbOAQ==",
-      "requires": {
-        "@babel/runtime": "^7.9.2",
-        "es6-error": "^4.1.1",
-        "hoist-non-react-statics": "^3.3.2",
-        "invariant": "^2.2.4",
-        "is-promise": "^2.1.0",
-        "lodash": "^4.17.15",
-        "prop-types": "^15.6.1",
-        "react-is": "^16.4.2"
-      }
-    },
-    "redux-logger": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/redux-logger/-/redux-logger-3.0.6.tgz",
-      "integrity": "sha1-91VZZvMJjzyIYExEnPC69XeCdL8=",
-      "requires": {
-        "deep-diff": "^0.3.5"
-      }
-    },
-    "redux-thunk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q=="
-    },
     "regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
diff --git a/Accounts/package.json b/Accounts/package.json
index 329649034f..18d91c7661 100755
--- a/Accounts/package.json
+++ b/Accounts/package.json
@@ -1,57 +1,52 @@
 {
     "name": "oneuptime-accounts",
     "version": "3.0.0",
-    "private": true,
+    "private": false,
     "homepage": "/",
     "type": "module",
     "dependencies": {
         "@loadable/component": "^5.15.2",
-        "@stripe/react-stripe-js": "^1.7.0",
-        "@stripe/stripe-js": "^1.25.0",
+        "@stripe/react-stripe-js": "^1.7.2",
+        "@stripe/stripe-js": "^1.29.0",
         "@types/compression": "^1.7.2",
-        "@types/react-dom": "^17.0.14",
-        "@types/react-redux": "^7.1.23",
+        "@types/react-dom": "^18.0.3",
+        "@types/react-redux": "^7.1.24",
         "@types/react-router-redux": "^5.0.21",
-        "@types/redux-form": "^8.3.3",
+        "@types/redux-form": "^8.3.5",
         "@types/redux-logger": "^3.0.9",
-        "amplitude-js": "^8.17.0",
-        "axios": "^0.26.1",
+        "axios": "^0.27.2",
         "card-validator": "^8.1.1",
         "cli-table": "^0.3.11",
         "Common": "file:../Common",
         "CommonServer": "file:../CommonServer",
         "CommonUI": "file:../CommonUI",
         "compression": "^1.7.4",
-        "express": "^4.17.3",
+        "express": "^4.18.1",
         "faker": "^6.6.6",
         "file-saver": "^2.0.5",
         "history": "^5.3.0",
-        "jest": "^27.5.1",
+        "jest": "^28.1.0",
         "prop-types": "^15.8.1",
-        "puppeteer": "^13.5.1",
+        "puppeteer": "^13.7.0",
         "query-string": "^7.1.1",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "react-awesome-reveal": "^3.8.1",
-        "react-dom": "^17.0.2",
+        "react-dom": "^18.1.0",
         "react-frontload": "^2.0.0",
         "react-ga": "^3.3.0",
-        "react-redux": "^7.2.6",
-        "react-router-dom": "^6.2.2",
+        "react-redux": "^8.0.1",
+        "react-router-dom": "^6.3.0",
         "react-router-redux": "^4.0.8",
-        "react-scripts": "^5.0.0",
-        "redux": "^4.1.2",
-        "redux-form": "^8.3.8",
-        "redux-logger": "^3.0.6",
-        "redux-thunk": "^2.4.1",
+        "react-scripts": "^5.0.1",
         "sane-email-validation": "^3.0.1",
         "universal-cookie": "^4.0.4",
         "uuid": "^8.3.2",
         "valid-url": "^1.0.9",
-        "workbox-build": "^6.5.1"
+        "workbox-build": "^6.5.3"
     },
     "scripts": {
-        "dev": "PORT=3003 react-scripts --openssl-legacy-provider start",
-        "build": "react-scripts --openssl-legacy-provider build && npm run build-sw",
+        "dev": "PORT=3003 react-scripts  start",
+        "build": "react-scripts  build && npm run build-sw",
         "build-sw": "node ./src/sw-build.js",
         "compile": "tsc",
         "test": "jest --forceExit --runInBand ./src/test/*.test.js",
@@ -65,7 +60,7 @@
     },
     "devDependencies": {
         "chrome-launcher": "^0.15.0",
-        "commander": "^9.1.0",
+        "commander": "^9.2.0",
         "depcheck": "^1.4.3",
         "lighthouse": "^9.5.0",
         "npm-force-resolutions": "0.0.10",
diff --git a/Accounts/src/Components/Auth/CardForm.tsx b/Accounts/src/Components/Auth/CardForm.tsx
index 853b5d9164..1b92453dcb 100755
--- a/Accounts/src/Components/Auth/CardForm.tsx
+++ b/Accounts/src/Components/Auth/CardForm.tsx
@@ -21,7 +21,6 @@ import {
     injectStripe,
     StripeProvider,
     Elements,
-
 } from '@stripe/react-stripe-js';
 import {
     addCard,
diff --git a/AdminDashboard/package-lock.json b/AdminDashboard/package-lock.json
index 16eb93cba4..8d3b3cac79 100644
--- a/AdminDashboard/package-lock.json
+++ b/AdminDashboard/package-lock.json
@@ -37,7 +37,7 @@
         "react-router-redux": "^4.0.8",
         "card-validator": "^8.1.1",
         "express": "^4.17.3",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "redux-form": "^8.3.8",
         "Common": "file:../Common",
         "prop-types": "^15.8.1"
@@ -15368,7 +15368,7 @@
         "@fortawesome/free-regular-svg-icons": "^6.1.0",
         "@fortawesome/free-solid-svg-icons": "^6.1.0",
         "@fortawesome/react-fontawesome": "^0.1.18",
-        "react": "^17.0.2"
+        "react": "^18.1.0"
       }
     },
     "node_modules/jest-resolve/node_modules/has-flag": {
@@ -20417,7 +20417,7 @@
         "@fortawesome/free-regular-svg-icons": "^6.1.0",
         "@fortawesome/free-solid-svg-icons": "^6.1.0",
         "@fortawesome/react-fontawesome": "^0.1.18",
-        "react": "^17.0.2"
+        "react": "^18.1.0"
       }
     },
     "commondir": {
diff --git a/AdminDashboard/package.json b/AdminDashboard/package.json
index 43ee8d4d83..41b9279d43 100644
--- a/AdminDashboard/package.json
+++ b/AdminDashboard/package.json
@@ -1,7 +1,7 @@
 {
     "name": "oneuptime-AdminDashboard",
     "version": "3.0.0",
-    "private": true,
+    "private": false,
     "type": "module",
     "dependencies": {
         "CommonServer": "file:../CommonServer",
@@ -18,7 +18,7 @@
         "jest": "^27.5.1",
         "moment": "^2.29.1",
         "prop-types": "^15.8.1",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "react-click-outside": "github:tj/react-click-outside",
         "react-dom": "^17.0.2",
         "react-json-view": "^1.21.3",
diff --git a/CommonUI/package-lock.json b/CommonUI/package-lock.json
index 34d72ef565..07802e7185 100644
--- a/CommonUI/package-lock.json
+++ b/CommonUI/package-lock.json
@@ -16,7 +16,7 @@
                 "@types/react": "^17.0.43",
                 "Common": "file:../Common",
                 "prop-types": "^15.8.1",
-                "react": "^17.0.2",
+                "react": "^18.1.0",
                 "react-router": "^6.2.2",
                 "universal-cookie": "^4.0.4"
             },
diff --git a/CommonUI/package.json b/CommonUI/package.json
index 3df2349c26..6cd9c40383 100644
--- a/CommonUI/package.json
+++ b/CommonUI/package.json
@@ -18,7 +18,7 @@
         "@types/react": "^17.0.43",
         "Common": "file:../Common",
         "prop-types": "^15.8.1",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "react-router": "^6.2.2",
         "universal-cookie": "^4.0.4"
     },
diff --git a/CommonUI/src/utils/config.ts b/CommonUI/src/utils/config.ts
deleted file mode 100644
index 98ee791f7f..0000000000
--- a/CommonUI/src/utils/config.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import Hostname from 'Common/Types/api/hostname';
-import Protocol from 'Common/Types/api/protocol';
-
-export const env: Function = (key: string): string => {
-    return process.env[`REACT_APP_${key}`] || '';
-};
-
-export const IS_SAAS_SERVICE: $TSFixMe = env('IS_SAAS_SERVICE') === 'true';
-export const DISABLE_SIGNUP: $TSFixMe = env('DISABLE_SIGNUP') === 'true';
-export const VERSION: $TSFixMe = env('VERSION');
-
-export const BACKEND_HOSTNAME: $TSFixMe = new Hostname(
-    `${window.location.hostname}/api`
-);
-
-export const DASHBOARD_HOSTNAME: $TSFixMe = new Hostname(
-    `${window.location.hostname}/dashboard`
-);
-
-export const HELM_HOSTNAME: $TSFixMe = new Hostname(
-    `${window.location.hostname}/charts`
-);
-
-export const API_DOCS_HOSTANME: $TSFixMe = new Hostname(
-    `${window.location.hostname}/docs`
-);
-
-export const ADMIN_DASHBOARD_HOSTNAME: $TSFixMe = new Hostname(
-    `${window.location.hostname}/admin`
-);
-export const ACCOUNTS_HOSTNAME: $TSFixMe = new Hostname(
-    `${window.location.hostname}/accounts`
-);
-export const HOME_HOSTNAME: $TSFixMe = new Hostname(
-    `${window.location.hostname}`
-);
-
-export const API_PROTOCOL: Protocol = window.location.protocol.includes('https')
-    ? Protocol.HTTPS
-    : Protocol.HTTP;
diff --git a/Dashboard/package-lock.json b/Dashboard/package-lock.json
index fe42e071ef..92e423bc42 100644
--- a/Dashboard/package-lock.json
+++ b/Dashboard/package-lock.json
@@ -82,7 +82,7 @@
         "express": "^4.17.3",
         "react-frontload": "^2.0.0",
         "cors": "^2.8.5",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "@date-io/date-fns": "^2.13.1",
         "redux-form": "^8.3.8",
         "react-ga": "^3.3.0",
@@ -869,7 +869,7 @@
         "lodash-es": "^4.17.21",
         "memoize-one": "^6.0.0",
         "prop-types": "^15.8.1",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "react-dom": "^17.0.2",
         "react-overlays": "^4.1.1",
         "uncontrollable": "^7.2.1"
@@ -17723,7 +17723,7 @@
         "@fortawesome/free-regular-svg-icons": "^6.1.0",
         "@fortawesome/free-solid-svg-icons": "^6.1.0",
         "@fortawesome/react-fontawesome": "^0.1.18",
-        "react": "^17.0.2"
+        "react": "^18.1.0"
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
@@ -23539,7 +23539,7 @@
         "@fortawesome/free-regular-svg-icons": "^6.1.0",
         "@fortawesome/free-solid-svg-icons": "^6.1.0",
         "@fortawesome/react-fontawesome": "^0.1.18",
-        "react": "^17.0.2"
+        "react": "^18.1.0"
       }
     },
     "commondir": {
@@ -29829,7 +29829,7 @@
         "lodash-es": "^4.17.21",
         "memoize-one": "^6.0.0",
         "prop-types": "^15.8.1",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "react-dom": "^17.0.2",
         "react-overlays": "^4.1.1",
         "uncontrollable": "^7.2.1"
diff --git a/Dashboard/package.json b/Dashboard/package.json
index 5bebc14000..0f8c62e314 100755
--- a/Dashboard/package.json
+++ b/Dashboard/package.json
@@ -1,7 +1,7 @@
 {
     "name": "oneuptime-dashboard",
     "version": "3.0.0",
-    "private": true,
+    "private": false,
     "type": "module",
     "dependencies": {
         "CommonServer": "file:../CommonServer",
@@ -44,7 +44,7 @@
         "prismjs": "^1.27.0",
         "prop-types": "^15.8.1",
         "qrcode.react": "^2.0.0",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "react-ace": "^9.5.0",
         "react-beautiful-dnd": "^13.1.0",
         "react-big-calendar": "^0.39.5",
diff --git a/DashboardAPI/package.json b/DashboardAPI/package.json
index ad5a99588c..c5066789d1 100644
--- a/DashboardAPI/package.json
+++ b/DashboardAPI/package.json
@@ -1,7 +1,7 @@
 {
         "name": "oneuptime-backend",
         "version": "3.0.0",
-        "private": true,
+        "private": false,
         "type": "module",
         "dependencies": {
                 "airtable": "^0.11.2",
diff --git a/HttpTestServer/package.json b/HttpTestServer/package.json
index 615f6f005c..acab56a501 100644
--- a/HttpTestServer/package.json
+++ b/HttpTestServer/package.json
@@ -1,7 +1,7 @@
 {
     "name": "HttpTestServer",
     "version": "1.0.0",
-    "private": true,
+    "private": false,
     "main": "server.js",
     "scripts": {
         "preinstall": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
diff --git a/Licensing/package.json b/Licensing/package.json
index d6281356a8..f93b0eb1b4 100644
--- a/Licensing/package.json
+++ b/Licensing/package.json
@@ -1,7 +1,7 @@
 {
     "name": "oneuptime-licensing",
     "version": "3.0.0",
-    "private": true,
+    "private": false,
     "type": "module",
     "dependencies": {
         "airtable": "^0.11.2",
diff --git a/StatusPage/package-lock.json b/StatusPage/package-lock.json
index ea6591d49f..72873ffead 100644
--- a/StatusPage/package-lock.json
+++ b/StatusPage/package-lock.json
@@ -42,7 +42,7 @@
         "react-router-redux": "^4.0.8",
         "express": "^4.17.3",
         "cors": "^2.8.5",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "redux-form": "^8.3.8",
         "markdown-to-jsx": "^7.1.7",
         "Common": "file:../Common",
@@ -17093,7 +17093,7 @@
         "@types/react": "^17.0.43",
         "Common": "file:../Common",
         "prop-types": "^15.8.1",
-        "react": "^17.0.2"
+        "react": "^18.1.0"
       },
       "devDependencies": {
         "@types/node": "^17.0.23"
@@ -22552,7 +22552,7 @@
         "@types/react": "^17.0.43",
         "Common": "file:../Common",
         "prop-types": "^15.8.1",
-        "react": "^17.0.2"
+        "react": "^18.1.0"
       }
     },
     "commondir": {
diff --git a/StatusPage/package.json b/StatusPage/package.json
index 6c5e6cc6fe..2b0263efc5 100755
--- a/StatusPage/package.json
+++ b/StatusPage/package.json
@@ -1,7 +1,7 @@
 {
     "name": "StatusPage",
     "version": "3.0.0",
-    "private": true,
+    "private": false,
     "type": "module",
     "dependencies": {
         "CommonServer": "file:../CommonServer",
@@ -23,7 +23,7 @@
         "prop-types": "^15.8.1",
         "puppeteer": "^13.5.1",
         "query-string": "^7.1.1",
-        "react": "^17.0.2",
+        "react": "^18.1.0",
         "react-auto-translate": "^0.0.6",
         "react-dom": "^17.0.2",
         "react-helmet": "^6.1.0",