diff --git a/.env.example b/.env.example
index 2c0a1419..4176638a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,4 @@
+CUSTOMER_OS_API_PATH=
 CUSTOMER_OS_API_KEY=
 INTERNAL_API_PATH=
 INTERNAL_API_KEY=
diff --git a/middleware/index.js b/middleware/index.js
index b9025464..3460ea81 100644
--- a/middleware/index.js
+++ b/middleware/index.js
@@ -183,7 +183,7 @@ async function createServer() {
   const customerOsApiGqlProxy = createProxyMiddleware({
     pathFilter: '/customer-os-api',
     pathRewrite: { '^/customer-os-api': '' },
-    target: process.env.INTERNAL_API_PATH + '/query',
+    target: process.env.CUSTOMER_OS_API_PATH + '/query',
     changeOrigin: true,
     headers: {
       'X-Openline-API-KEY': process.env.CUSTOMER_OS_API_KEY,
@@ -196,7 +196,7 @@ async function createServer() {
   const customerOsApiRestProxy = createProxyMiddleware({
     pathFilter: '/cos',
     pathRewrite: { '^/cos': '' },
-    target: process.env.INTERNAL_API_PATH,
+    target: process.env.CUSTOMER_OS_API_PATH,
     changeOrigin: true,
     headers: {
       'X-Openline-API-KEY': process.env.CUSTOMER_OS_API_KEY,
@@ -209,7 +209,7 @@ async function createServer() {
   const customerOsApiRestProxyForTenant = createProxyMiddleware({
     pathFilter: '/tenant-cos-api',
     pathRewrite: { '^/tenant-cos-api': '' },
-    target: process.env.INTERNAL_API_PATH,
+    target: process.env.CUSTOMER_OS_API_PATH,
     changeOrigin: true,
     logger: console,
     preserveHeaderKeyCase: true,
@@ -219,7 +219,7 @@ async function createServer() {
   const internalApiProxy = createProxyMiddleware({
     pathFilter: '/internal',
     pathRewrite: { '^/internal': '' },
-    target: process.env.INTERNAL_API_PATH + '/internal',
+    target: process.env.INTERNAL_API_PATH,
     changeOrigin: true,
     headers: {
       'X-Openline-API-KEY': process.env.INTERNAL_API_KEY,
diff --git a/src/routes/organization/src/components/Tabs/panels/AccountPanel/Contract/ContractBillingDetailsModal/components/ContractDetails/ContractUploader.tsx b/src/routes/organization/src/components/Tabs/panels/AccountPanel/Contract/ContractBillingDetailsModal/components/ContractDetails/ContractUploader.tsx
index eb51a82e..42e331bd 100644
--- a/src/routes/organization/src/components/Tabs/panels/AccountPanel/Contract/ContractBillingDetailsModal/components/ContractDetails/ContractUploader.tsx
+++ b/src/routes/organization/src/components/Tabs/panels/AccountPanel/Contract/ContractBillingDetailsModal/components/ContractDetails/ContractUploader.tsx
@@ -105,10 +105,10 @@ export const ContractUploader = observer(
         </div>
 
         <FileDropUploader
-          apiBaseUrl='/fs'
           onError={handleError}
           onLoadStart={handelLoad}
           onLoadEnd={handleLoadEnd}
+          apiBaseUrl='/internal/files'
           onSuccess={handleAddAttachment}
           onDragOverChange={setIsDragging}
           onChange={(file, refId) => {
@@ -116,7 +116,7 @@ export const ContractUploader = observer(
           }}
           endpointOptions={{
             fileKeyName: 'file',
-            uploadUrl: '/internal/v1/files',
+            uploadUrl: '/internal/files',
           }}
         >
           <div className='min-h-5 gap-2'>
@@ -132,8 +132,8 @@ export const ContractUploader = observer(
                 id={id}
                 key={id}
                 fileName={fileName}
-                href={`/fs/files/${id}/download`}
                 onRemove={handleRemoveAttachment}
+                href={`/internal/files/${id}/download`}
               />
             ))}
 
diff --git a/src/routes/settings/src/components/Tabs/panels/Workspace/General/General.tsx b/src/routes/settings/src/components/Tabs/panels/Workspace/General/General.tsx
index ca910fad..98e93793 100644
--- a/src/routes/settings/src/components/Tabs/panels/Workspace/General/General.tsx
+++ b/src/routes/settings/src/components/Tabs/panels/Workspace/General/General.tsx
@@ -93,7 +93,7 @@ export const General = () => {
             onError={handleError}
             onLoadStart={handelLoad}
             onLoadEnd={handleLoadEnd}
-            apiBaseUrl='/internal/v1/files'
+            apiBaseUrl='/internal/files'
             onDragOverChange={setIsDragging}
             onSuccess={handleTenantLogoUpdate}
             endpointOptions={{
diff --git a/src/store/Settings/Integrations.store.ts b/src/store/Settings/Integrations.store.ts
index 36ea5744..c4cd735e 100644
--- a/src/store/Settings/Integrations.store.ts
+++ b/src/store/Settings/Integrations.store.ts
@@ -51,7 +51,7 @@ export class IntegrationsStore {
       });
 
       const { data } = await this.transport.http.get(
-        '/internal/v1/settings/integrations',
+        '/internal/settings/integrations',
       );
 
       runInAction(() => {
@@ -76,7 +76,7 @@ export class IntegrationsStore {
 
     try {
       this.isMutating = true;
-      this.transport.http.post('/internal/v1/settings/integrations', {
+      this.transport.http.post('/internal/settings/integrations', {
         [identifier]: payload,
       });
       this.root.ui.toastSuccess(
diff --git a/src/store/Settings/Settings.store.ts b/src/store/Settings/Settings.store.ts
index abcce782..7bcfb883 100644
--- a/src/store/Settings/Settings.store.ts
+++ b/src/store/Settings/Settings.store.ts
@@ -81,7 +81,7 @@ export class SettingsStore {
   async getTenantApiKey() {
     try {
       const tenantApiKeyResult = await this.transport.http.get(
-        '/internal/v1/settings/tenant/settings/apiKey',
+        '/internal/settings/tenant/settings/apiKey',
       );
 
       this.tenantApiKey = tenantApiKeyResult.data;
@@ -115,7 +115,7 @@ export class SettingsStore {
       this.isLoading = true;
 
       const res = await this.transport.http.post(
-        '/internal/v1/settings/slack/revoke',
+        '/internal/settings/slack/revoke',
         payload,
       );
 
diff --git a/src/store/Settings/Slack.store.ts b/src/store/Settings/Slack.store.ts
index 3e1d752c..c5e60aa9 100644
--- a/src/store/Settings/Slack.store.ts
+++ b/src/store/Settings/Slack.store.ts
@@ -29,7 +29,7 @@ export class Slack {
       this.isLoading = true;
 
       const { data } = await this.transportLayer.http.get(
-        '/internal/v1/settings/user/settings/slack',
+        '/internal/settings/user/settings/slack',
       );
       const { slack_Channels } = await this.service.getSlackChannels({
         pagination: { page: 0, limit: 1000 },