diff --git a/.env.compose b/.env.compose
index cee27bd1e5e..d5eb2594c4a 100644
--- a/.env.compose
+++ b/.env.compose
@@ -442,6 +442,7 @@ EXTENSION_DOWNLOAD_LINK='https://gauzy.co/downloads#extensions'
 
 # Desktop Timer Application Configuration
 PROJECT_REPO='https://github.com/ever-co/ever-gauzy.git'
+
 DESKTOP_TIMER_APP_NAME='gauzy-desktop-timer'
 DESKTOP_TIMER_APP_DESCRIPTION='Gauzy Desktop Timer'
 DESKTOP_TIMER_APP_ID='com.ever.gauzydesktoptimer'
@@ -468,5 +469,14 @@ DESKTOP_SERVER_APP_REPO_OWNER='ever-co'
 DESKTOP_SERVER_APP_WELCOME_TITLE=
 DESKTOP_SERVER_APP_WELCOME_CONTENT=
 
+# Desktop API Server Application Configuration
+DESKTOP_API_SERVER_APP_NAME='gauzy-api-server'
+DESKTOP_API_SERVER_APP_DESCRIPTION='Gauzy API Server'
+DESKTOP_API_SERVER_APP_ID='com.ever.gauzyapiserver'
+DESKTOP_API_SERVER_APP_REPO_NAME='ever-gauzy-api-server'
+DESKTOP_API_SERVER_APP_REPO_OWNER='ever-co'
+DESKTOP_API_SERVER_APP_WELCOME_TITLE=
+DESKTOP_API_SERVER_APP_WELCOME_CONTENT=
+
 # I18N Translation Files URL
 I18N_FILES_URL=
diff --git a/.env.demo.compose b/.env.demo.compose
index 0a0e71f02b0..eeee169f35b 100644
--- a/.env.demo.compose
+++ b/.env.demo.compose
@@ -444,6 +444,7 @@ EXTENSION_DOWNLOAD_LINK='https://gauzy.co/downloads#extensions'
 
 # Desktop Timer Application Configuration
 PROJECT_REPO='https://github.com/ever-co/ever-gauzy.git'
+
 DESKTOP_TIMER_APP_NAME='gauzy-desktop-timer'
 DESKTOP_TIMER_APP_DESCRIPTION='Gauzy Desktop Timer'
 DESKTOP_TIMER_APP_ID='com.ever.gauzydesktoptimer'
@@ -470,5 +471,14 @@ DESKTOP_SERVER_APP_REPO_OWNER='ever-co'
 DESKTOP_SERVER_APP_WELCOME_TITLE=
 DESKTOP_SERVER_APP_WELCOME_CONTENT=
 
+# Desktop API Server Application Configuration
+DESKTOP_API_SERVER_APP_NAME='gauzy-api-server'
+DESKTOP_API_SERVER_APP_DESCRIPTION='Gauzy API Server'
+DESKTOP_API_SERVER_APP_ID='com.ever.gauzyapiserver'
+DESKTOP_API_SERVER_APP_REPO_NAME='ever-gauzy-api-server'
+DESKTOP_API_SERVER_APP_REPO_OWNER='ever-co'
+DESKTOP_API_SERVER_APP_WELCOME_TITLE=
+DESKTOP_API_SERVER_APP_WELCOME_CONTENT=
+
 # I18N Translation Files URL
 I18N_FILES_URL=
diff --git a/.env.docker b/.env.docker
index 2b71475b4aa..17a5f30de26 100644
--- a/.env.docker
+++ b/.env.docker
@@ -450,5 +450,14 @@ DESKTOP_SERVER_APP_REPO_OWNER='ever-co'
 DESKTOP_SERVER_APP_WELCOME_TITLE=
 DESKTOP_SERVER_APP_WELCOME_CONTENT=
 
+# Desktop API Server Application Configuration
+DESKTOP_API_SERVER_APP_NAME='gauzy-api-server'
+DESKTOP_API_SERVER_APP_DESCRIPTION='Gauzy API Server'
+DESKTOP_API_SERVER_APP_ID='com.ever.gauzyapiserver'
+DESKTOP_API_SERVER_APP_REPO_NAME='ever-gauzy-api-server'
+DESKTOP_API_SERVER_APP_REPO_OWNER='ever-co'
+DESKTOP_API_SERVER_APP_WELCOME_TITLE=
+DESKTOP_API_SERVER_APP_WELCOME_CONTENT=
+
 # I18N Translation Files URL
 I18N_FILES_URL=
diff --git a/.env.local b/.env.local
index c9a70171361..e0248e88c60 100644
--- a/.env.local
+++ b/.env.local
@@ -414,6 +414,7 @@ EXTENSION_DOWNLOAD_LINK='https://gauzy.co/downloads#extensions'
 
 # Desktop Timer Application Configuration
 PROJECT_REPO='https://github.com/ever-co/ever-gauzy.git'
+
 DESKTOP_TIMER_APP_NAME='gauzy-desktop-timer'
 DESKTOP_TIMER_APP_DESCRIPTION='Gauzy Desktop Timer'
 DESKTOP_TIMER_APP_ID='com.ever.gauzydesktoptimer'
@@ -440,5 +441,14 @@ DESKTOP_SERVER_APP_REPO_OWNER='ever-co'
 DESKTOP_SERVER_APP_WELCOME_TITLE=
 DESKTOP_SERVER_APP_WELCOME_CONTENT=
 
+# Desktop API Server Application Configuration
+DESKTOP_API_SERVER_APP_NAME='gauzy-api-server'
+DESKTOP_API_SERVER_APP_DESCRIPTION='Gauzy API Server'
+DESKTOP_API_SERVER_APP_ID='com.ever.gauzyapiserver'
+DESKTOP_API_SERVER_APP_REPO_NAME='ever-gauzy-api-server'
+DESKTOP_API_SERVER_APP_REPO_OWNER='ever-co'
+DESKTOP_API_SERVER_APP_WELCOME_TITLE=
+DESKTOP_API_SERVER_APP_WELCOME_CONTENT=
+
 # I18N Translation Files URL
 I18N_FILES_URL=
diff --git a/.env.sample b/.env.sample
index c55b9abe770..b3bfa9fece6 100644
--- a/.env.sample
+++ b/.env.sample
@@ -434,6 +434,7 @@ EXTENSION_DOWNLOAD_LINK='https://gauzy.co/downloads#extensions'
 
 # Desktop Timer Application Configuration
 PROJECT_REPO='https://github.com/ever-co/ever-gauzy.git'
+
 DESKTOP_TIMER_APP_NAME='gauzy-desktop-timer'
 DESKTOP_TIMER_APP_DESCRIPTION='Gauzy Desktop Timer'
 DESKTOP_TIMER_APP_ID='com.ever.gauzydesktoptimer'
@@ -460,5 +461,14 @@ DESKTOP_SERVER_APP_REPO_OWNER='ever-co'
 DESKTOP_SERVER_APP_WELCOME_TITLE=
 DESKTOP_SERVER_APP_WELCOME_CONTENT=
 
+# Desktop API Server Application Configuration
+DESKTOP_API_SERVER_APP_NAME='gauzy-api-server'
+DESKTOP_API_SERVER_APP_DESCRIPTION='Gauzy API Server'
+DESKTOP_API_SERVER_APP_ID='com.ever.gauzyapiserver'
+DESKTOP_API_SERVER_APP_REPO_NAME='ever-gauzy-api-server'
+DESKTOP_API_SERVER_APP_REPO_OWNER='ever-co'
+DESKTOP_API_SERVER_APP_WELCOME_TITLE=
+DESKTOP_API_SERVER_APP_WELCOME_CONTENT=
+
 # I18N Translation Files URL
 I18N_FILES_URL=
diff --git a/.github/workflows/desktop-app-prod.yml b/.github/workflows/desktop-app-prod.yml
index afebf1aebd3..5d159ae0f23 100644
--- a/.github/workflows/desktop-app-prod.yml
+++ b/.github/workflows/desktop-app-prod.yml
@@ -56,6 +56,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.desktop(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_APP_NAME: 'ever-gauzy-desktop'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_APP_DESCRIPTION: 'Ever Gauzy Desktop'
+          DESKTOP_APP_ID: 'com.ever.gauzydesktop'
 
       - name: Build Desktop App
         run: 'yarn build:desktop:linux:release:gh'
@@ -111,6 +117,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.desktop(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_APP_NAME: 'ever-gauzy-desktop'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_APP_DESCRIPTION: 'Ever Gauzy Desktop'
+          DESKTOP_APP_ID: 'com.ever.gauzydesktop'
 
       - name: Build Desktop App
         run: 'yarn build:desktop:mac:release'
@@ -166,6 +178,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.desktop(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_APP_NAME: 'ever-gauzy-desktop'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_APP_DESCRIPTION: 'Ever Gauzy Desktop'
+          DESKTOP_APP_ID: 'com.ever.gauzydesktop'
 
       - name: Build Desktop App
         run: 'yarn build:desktop:windows:release:gh'
diff --git a/.github/workflows/desktop-app-stage.yml b/.github/workflows/desktop-app-stage.yml
index 0c5e400e1c5..b8f2b6ba7f3 100644
--- a/.github/workflows/desktop-app-stage.yml
+++ b/.github/workflows/desktop-app-stage.yml
@@ -56,6 +56,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.desktop(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_APP_NAME: 'ever-gauzy-desktop'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_APP_DESCRIPTION: 'Ever Gauzy Desktop'
+          DESKTOP_APP_ID: 'com.ever.gauzydesktop'
 
       - name: Build Desktop App
         run: 'yarn build:desktop:linux:release:gh'
@@ -111,6 +117,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.desktop(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_APP_NAME: 'ever-gauzy-desktop'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_APP_DESCRIPTION: 'Ever Gauzy Desktop'
+          DESKTOP_APP_ID: 'com.ever.gauzydesktop'
 
       - name: Build Desktop App
         run: 'yarn build:desktop:mac:release'
@@ -166,6 +178,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.desktop(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_APP_NAME: 'ever-gauzy-desktop'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_APP_DESCRIPTION: 'Ever Gauzy Desktop'
+          DESKTOP_APP_ID: 'com.ever.gauzydesktop'
 
       - name: Build Desktop App
         run: 'yarn build:desktop:windows:release:gh'
diff --git a/.github/workflows/desktop-timer-app-prod.yml b/.github/workflows/desktop-timer-app-prod.yml
index 27d56ab793f..7a5cefa048d 100644
--- a/.github/workflows/desktop-timer-app-prod.yml
+++ b/.github/workflows/desktop-timer-app-prod.yml
@@ -55,12 +55,12 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(true).then(console.log)
+            console.log(script.desktopTimer(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
           DESKTOP_TIMER_APP_NAME: 'ever-gauzy-desktop-timer'
           COMPANY_SITE_LINK: 'https://gauzy.co'
-          DESKTOP_TIMER_APP_DESCRIPTION: 'Gauzy Desktop Timer'
+          DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Gauzy Desktop Timer'
           DESKTOP_TIMER_APP_ID: 'com.ever.gauzydesktoptimer'
 
       - name: Build Desktop Timer App
@@ -116,12 +116,12 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(true).then(console.log)
+            console.log(script.desktopTimer(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
           DESKTOP_TIMER_APP_NAME: 'ever-gauzy-desktop-timer'
           COMPANY_SITE_LINK: 'https://gauzy.co'
-          DESKTOP_TIMER_APP_DESCRIPTION: 'Gauzy Desktop Timer'
+          DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Gauzy Desktop Timer'
           DESKTOP_TIMER_APP_ID: 'com.ever.gauzydesktoptimer'
 
       - name: Build Desktop Timer App
@@ -177,12 +177,12 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(true).then(console.log)
+            console.log(script.desktopTimer(true))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
           DESKTOP_TIMER_APP_NAME: 'ever-gauzy-desktop-timer'
           COMPANY_SITE_LINK: 'https://gauzy.co'
-          DESKTOP_TIMER_APP_DESCRIPTION: 'Gauzy Desktop Timer'
+          DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Gauzy Desktop Timer'
           DESKTOP_TIMER_APP_ID: 'com.ever.gauzydesktoptimer'
 
       - name: Build Desktop Timer App
diff --git a/.github/workflows/desktop-timer-app-stage.yml b/.github/workflows/desktop-timer-app-stage.yml
index f0d240f7ffa..a5de120452b 100644
--- a/.github/workflows/desktop-timer-app-stage.yml
+++ b/.github/workflows/desktop-timer-app-stage.yml
@@ -55,12 +55,12 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(false).then(console.log)
+            console.log(script.desktopTimer(false))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
           DESKTOP_TIMER_APP_NAME: 'ever-gauzy-desktop-timer'
           COMPANY_SITE_LINK: 'https://gauzy.co'
-          DESKTOP_TIMER_APP_DESCRIPTION: 'Gauzy Desktop Timer'
+          DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Gauzy Desktop Timer'
           DESKTOP_TIMER_APP_ID: 'com.ever.gauzydesktoptimer'
 
       - name: Build Desktop Timer App
@@ -116,12 +116,12 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(false).then(console.log)
+            console.log(script.desktopTimer(false))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
           DESKTOP_TIMER_APP_NAME: 'ever-gauzy-desktop-timer'
           COMPANY_SITE_LINK: 'https://gauzy.co'
-          DESKTOP_TIMER_APP_DESCRIPTION: 'Gauzy Desktop Timer'
+          DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Gauzy Desktop Timer'
           DESKTOP_TIMER_APP_ID: 'com.ever.gauzydesktoptimer'
 
       - name: Build Desktop Timer App
@@ -177,12 +177,12 @@ jobs:
         with:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
-            script.desktopTimer(false).then(console.log)
+            console.log(script.desktopTimer(false))
         env:
           PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
           DESKTOP_TIMER_APP_NAME: 'ever-gauzy-desktop-timer'
           COMPANY_SITE_LINK: 'https://gauzy.co'
-          DESKTOP_TIMER_APP_DESCRIPTION: 'Gauzy Desktop Timer'
+          DESKTOP_TIMER_APP_DESCRIPTION: 'Ever Gauzy Desktop Timer'
           DESKTOP_TIMER_APP_ID: 'com.ever.gauzydesktoptimer'
 
       - name: Build Desktop Timer App
diff --git a/.github/workflows/server-api-prod.yml b/.github/workflows/server-api-prod.yml
index d0eb155ce91..588ab69b6d0 100644
--- a/.github/workflows/server-api-prod.yml
+++ b/.github/workflows/server-api-prod.yml
@@ -56,6 +56,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.serverapi(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_API_SERVER_APP_NAME: 'ever-gauzy-api-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Gauzy API Server'
+          DESKTOP_API_SERVER_APP_ID: 'com.ever.gauzyapiserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-api-server:linux:release:gh'
@@ -111,6 +117,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.serverapi(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_API_SERVER_APP_NAME: 'ever-gauzy-api-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Gauzy API Server'
+          DESKTOP_API_SERVER_APP_ID: 'com.ever.gauzyapiserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-api-server:mac:release'
@@ -166,6 +178,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.serverapi(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_API_SERVER_APP_NAME: 'ever-gauzy-api-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Gauzy API Server'
+          DESKTOP_API_SERVER_APP_ID: 'com.ever.gauzyapiserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-api-server:windows:release:gh'
diff --git a/.github/workflows/server-api-stage.yml b/.github/workflows/server-api-stage.yml
index 9227efb204f..0033ab1fa7f 100644
--- a/.github/workflows/server-api-stage.yml
+++ b/.github/workflows/server-api-stage.yml
@@ -56,6 +56,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.serverapi(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_API_SERVER_APP_NAME: 'ever-gauzy-api-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Gauzy API Server'
+          DESKTOP_API_SERVER_APP_ID: 'com.ever.gauzyapiserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-api-server:linux:release:gh'
@@ -111,6 +117,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.serverapi(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_API_SERVER_APP_NAME: 'ever-gauzy-api-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Gauzy API Server'
+          DESKTOP_API_SERVER_APP_ID: 'com.ever.gauzyapiserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-api-server:mac:release'
@@ -166,6 +178,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.serverapi(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_API_SERVER_APP_NAME: 'ever-gauzy-api-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_API_SERVER_APP_DESCRIPTION: 'Ever Gauzy API Server'
+          DESKTOP_API_SERVER_APP_ID: 'com.ever.gauzyapiserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-api-server:windows:release:gh'
diff --git a/.github/workflows/server-prod.yml b/.github/workflows/server-prod.yml
index 0e49e1f1edf..833ba9241a7 100644
--- a/.github/workflows/server-prod.yml
+++ b/.github/workflows/server-prod.yml
@@ -56,6 +56,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.server(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_SERVER_APP_NAME: 'ever-gauzy-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_SERVER_APP_DESCRIPTION: 'Ever Gauzy Server'
+          DESKTOP_SERVER_APP_ID: 'com.ever.gauzyserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-server:linux:release:gh'
@@ -111,6 +117,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.server(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_SERVER_APP_NAME: 'ever-gauzy-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_SERVER_APP_DESCRIPTION: 'Ever Gauzy Server'
+          DESKTOP_SERVER_APP_ID: 'com.ever.gauzyserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-server:mac:release'
@@ -166,6 +178,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.server(true))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_SERVER_APP_NAME: 'ever-gauzy-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_SERVER_APP_DESCRIPTION: 'Ever Gauzy Server'
+          DESKTOP_SERVER_APP_ID: 'com.ever.gauzyserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-server:windows:release:gh'
diff --git a/.github/workflows/server-stage.yml b/.github/workflows/server-stage.yml
index 2c46a0d80b1..1b9ee626a8e 100644
--- a/.github/workflows/server-stage.yml
+++ b/.github/workflows/server-stage.yml
@@ -56,6 +56,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.server(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_SERVER_APP_NAME: 'ever-gauzy-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_SERVER_APP_DESCRIPTION: 'Ever Gauzy Server'
+          DESKTOP_SERVER_APP_ID: 'com.ever.gauzyserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-server:linux:release:gh'
@@ -111,6 +117,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.server(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_SERVER_APP_NAME: 'ever-gauzy-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_SERVER_APP_DESCRIPTION: 'Ever Gauzy Server'
+          DESKTOP_SERVER_APP_ID: 'com.ever.gauzyserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-server:mac:release'
@@ -166,6 +178,12 @@ jobs:
           script: |
             const script = require('./.scripts/bump-version-electron.js')
             console.log(script.server(false))
+        env:
+          PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git'
+          DESKTOP_SERVER_APP_NAME: 'ever-gauzy-server'
+          COMPANY_SITE_LINK: 'https://gauzy.co'
+          DESKTOP_SERVER_APP_DESCRIPTION: 'Ever Gauzy Server'
+          DESKTOP_SERVER_APP_ID: 'com.ever.gauzyserver'
 
       - name: Build Server
         run: 'yarn build:gauzy-server:windows:release:gh'
diff --git a/.scripts/bump-version-electron.js b/.scripts/bump-version-electron.js
index 38565a1fbca..3804b7ec12d 100644
--- a/.scripts/bump-version-electron.js
+++ b/.scripts/bump-version-electron.js
@@ -1,173 +1,280 @@
 const fs = require('fs');
 const simpleGit = require('simple-git');
-const { exec } = require('child_process');
 const git = simpleGit();
 
-module.exports.serverapi = (isProd) => {
+async function getLatestTag(repoURL) {
+	try {
+		// Fetch remote tags
+		const tags = await git.listRemote(['--tags', repoURL]);
+
+		// Parse and filter tags
+		const tagPattern = /^v?[0-9]+\.[0-9]+\.[0-9]+$/;
+		const tagList = tags
+			.split('\n')
+			.map((tagLine) => tagLine.split(/\s+/)[1]) // Extract the tag reference
+			.filter((ref) => ref && ref.includes('refs/tags/')) // Filter out non-tags
+			.map((ref) => ref.replace('refs/tags/', '')) // Extract the tag name
+			.filter((tag) => tagPattern.test(tag)); // Filter valid version tags
+
+		// Sort and get the latest tag
+		const latestTag = tagList
+			.sort((a, b) => {
+				// Using localeCompare with 'numeric' option for version comparison
+				return a.localeCompare(b, undefined, { numeric: true });
+			})
+			.pop();
+
+		return latestTag;
+	} catch (error) {
+		console.error(`Error fetching tags: ${error.message}`);
+	}
+}
+
+module.exports.serverapi = async (isProd) => {
 	if (fs.existsSync('./apps/server-api/src/package.json')) {
 		let package = require('../apps/server-api/src/package.json');
 		let currentVersion = package.version;
 
-		exec('git fetch --tags && git tag --sort version:refname | tail -1', (error, stdout) => {
-			if (error) {
-				console.error(`exec error: ${error}`);
-				return;
-			}
-
-			let newVersion = stdout.trim();
-			console.log('latest tag', newVersion);
-			if (newVersion) {
-				// let's remove "v" from version, i.e. first character
-				newVersion = newVersion.substring(1);
-				package.version = newVersion;
-
-				if (!isProd) {
-					package.build.publish = [
-						{
-							provider: 'github',
-							repo: 'ever-gauzy-api-server',
-							releaseType: 'prerelease'
-						},
-						{
-							provider: 'spaces',
-							name: 'ever',
-							region: 'sfo3',
-							path: '/ever-gauzy-api-server-pre',
-							acl: 'public-read'
-						}
-					];
+		const repoURL = process.env.PROJECT_REPO;
+		console.log('repoURL', repoURL);
+
+		const appName = process.env.DESKTOP_API_SERVER_APP_NAME;
+		console.log('appName', appName);
+
+		const stdout = await getLatestTag(repoURL);
+
+		let newVersion = stdout.trim();
+		console.log('latest tag', newVersion);
+
+		if (newVersion) {
+			// let's remove "v" from version, i.e. first character
+			newVersion = newVersion.substring(1);
+			package.version = newVersion;
+
+			console.log('Version updated to version', newVersion);
+		} else {
+			console.log('Latest tag is not found. Build Desktop API Server App with default version', currentVersion);
+		}
+
+		package.name = appName;
+		package.productName = process.env.DESKTOP_API_SERVER_APP_DESCRIPTION;
+		package.description = process.env.DESKTOP_API_SERVER_APP_DESCRIPTION;
+		package.homepage = process.env.COMPANY_SITE_LINK;
+
+		package.build.appId = process.env.DESKTOP_API_SERVER_APP_ID;
+		package.build.productName = process.env.DESKTOP_API_SERVER_APP_DESCRIPTION;
+		package.build.linux.executableName = appName;
+
+		const appRepoName = process.env.DESKTOP_API_SERVER_REPO_NAME || appName;
+		const appRepoOwner = process.env.DESKTOP_API_SERVER_REPO_OWNER || 'ever-co';
+
+		// For GitHub options see https://www.electron.build/configuration/publish.html
+
+		if (!isProd) {
+			package.build.publish = [
+				{
+					provider: 'github',
+					repo: appRepoName,
+					owner: appRepoOwner,
+					releaseType: 'prerelease'
+				},
+				{
+					provider: 'spaces',
+					name: 'ever',
+					region: 'sfo3',
+					path: `/${appName}-pre`,
+					acl: 'public-read'
 				}
+			];
+		} else {
+			package.build.publish = [
+				{
+					provider: 'github',
+					repo: appRepoName,
+					owner: appRepoOwner,
+					releaseType: 'release'
+				},
+				{
+					provider: 'spaces',
+					name: 'ever',
+					region: 'sfo3',
+					path: `/${appName}`,
+					acl: 'public-read'
+				}
+			];
+		}
+
+		fs.writeFileSync('./apps/server-api/src/package.json', JSON.stringify(package, null, 2));
 
-				fs.writeFileSync('./apps/server-api/src/package.json', JSON.stringify(package, null, 2));
+		let updated = require('../apps/server-api/src/package.json');
 
-				let updated = require('../apps/server-api/src/package.json');
-				console.log('Version updated to version => ', updated.version);
-			} else {
-				console.log('Latest tag is not found. Build Api Server with default version', currentVersion);
-			}
-		});
+		console.log('Version releasing', updated.version);
 	}
 };
 
-module.exports.server = (isProd) => {
+module.exports.server = async (isProd) => {
 	if (fs.existsSync('./apps/server/src/package.json')) {
 		let package = require('../apps/server/src/package.json');
 		let currentVersion = package.version;
 
-		exec('git fetch --tags && git tag --sort version:refname | tail -1', (error, stdout) => {
-			if (error) {
-				console.error(`exec error: ${error}`);
-				return;
-			}
-
-			let newVersion = stdout.trim();
-			console.log('latest tag', newVersion);
-			if (newVersion) {
-				// let's remove "v" from version, i.e. first character
-				newVersion = newVersion.substring(1);
-				package.version = newVersion;
-
-				if (!isProd) {
-					package.build.publish = [
-						{
-							provider: 'github',
-							repo: 'ever-gauzy-server',
-							releaseType: 'prerelease'
-						},
-						{
-							provider: 'spaces',
-							name: 'ever',
-							region: 'sfo3',
-							path: '/ever-gauzy-server-pre',
-							acl: 'public-read'
-						}
-					];
+		const repoURL = process.env.PROJECT_REPO;
+		console.log('repoURL', repoURL);
+
+		const appName = process.env.DESKTOP_SERVER_APP_NAME;
+		console.log('appName', appName);
+
+		const stdout = await getLatestTag(repoURL);
+
+		let newVersion = stdout.trim();
+		console.log('latest tag', newVersion);
+
+		if (newVersion) {
+			// let's remove "v" from version, i.e. first character
+			newVersion = newVersion.substring(1);
+			package.version = newVersion;
+
+			console.log('Version updated to version', newVersion);
+		} else {
+			console.log('Latest tag is not found. Build Desktop Server App with default version', currentVersion);
+		}
+
+		package.name = appName;
+		package.productName = process.env.DESKTOP_SERVER_APP_DESCRIPTION;
+		package.description = process.env.DESKTOP_SERVER_APP_DESCRIPTION;
+		package.homepage = process.env.COMPANY_SITE_LINK;
+
+		package.build.appId = process.env.DESKTOP_SERVER_APP_ID;
+		package.build.productName = process.env.DESKTOP_SERVER_APP_DESCRIPTION;
+		package.build.linux.executableName = appName;
+
+		const appRepoName = process.env.DESKTOP_SERVER_REPO_NAME || appName;
+		const appRepoOwner = process.env.DESKTOP_SERVER_REPO_OWNER || 'ever-co';
+
+		// For GitHub options see https://www.electron.build/configuration/publish.html
+
+		if (!isProd) {
+			package.build.publish = [
+				{
+					provider: 'github',
+					repo: appRepoName,
+					owner: appRepoOwner,
+					releaseType: 'prerelease'
+				},
+				{
+					provider: 'spaces',
+					name: 'ever',
+					region: 'sfo3',
+					path: `/${appName}-pre`,
+					acl: 'public-read'
 				}
+			];
+		} else {
+			package.build.publish = [
+				{
+					provider: 'github',
+					repo: appRepoName,
+					owner: appRepoOwner,
+					releaseType: 'release'
+				},
+				{
+					provider: 'spaces',
+					name: 'ever',
+					region: 'sfo3',
+					path: `/${appName}`,
+					acl: 'public-read'
+				}
+			];
+		}
+
+		fs.writeFileSync('./apps/server/src/package.json', JSON.stringify(package, null, 2));
 
-				fs.writeFileSync('./apps/server/src/package.json', JSON.stringify(package, null, 2));
+		let updated = require('../apps/server/src/package.json');
 
-				let updated = require('../apps/server/src/package.json');
-				console.log('Version updated to version => ', updated.version);
-			} else {
-				console.log('Latest tag is not found. Build Server with default version', currentVersion);
-			}
-		});
+		console.log('Version releasing', updated.version);
 	}
 };
 
-module.exports.desktop = (isProd) => {
+module.exports.desktop = async (isProd) => {
 	if (fs.existsSync('./apps/desktop/src/package.json')) {
 		let package = require('../apps/desktop/src/package.json');
 		let currentVersion = package.version;
 
-		exec('git fetch --tags && git tag --sort version:refname | tail -1', (error, stdout) => {
-			if (error) {
-				console.error(`exec error: ${error}`);
-				return;
-			}
-
-			let newVersion = stdout.trim();
-			console.log('latest tag', newVersion);
-			if (newVersion) {
-				// let's remove "v" from version, i.e. first character
-				newVersion = newVersion.substring(1);
-				package.version = newVersion;
-
-				if (!isProd) {
-					package.build.publish = [
-						{
-							provider: 'github',
-							repo: 'ever-gauzy-desktop',
-							releaseType: 'prerelease'
-						},
-						{
-							provider: 'spaces',
-							name: 'ever',
-							region: 'sfo3',
-							path: '/ever-gauzy-desktop-pre',
-							acl: 'public-read'
-						}
-					];
-				}
+		const repoURL = process.env.PROJECT_REPO;
+		console.log('repoURL', repoURL);
 
-				fs.writeFileSync('./apps/desktop/src/package.json', JSON.stringify(package, null, 2));
+		const appName = process.env.DESKTOP_APP_NAME;
+		console.log('appName', appName);
 
-				let updated = require('../apps/desktop/src/package.json');
-				console.log('Version updated to version => ', updated.version);
-			} else {
-				console.log('Latest tag is not found. build desktop app with default version', currentVersion);
-			}
-		});
-	}
-};
+		const stdout = await getLatestTag(repoURL);
 
-async function getLatestTag(repoURL) {
-	try {
-		// Fetch remote tags
-		const tags = await git.listRemote(['--tags', repoURL]);
+		let newVersion = stdout.trim();
+		console.log('latest tag', newVersion);
 
-		// Parse and filter tags
-		const tagPattern = /^v?[0-9]+\.[0-9]+\.[0-9]+$/;
-		const tagList = tags
-			.split('\n')
-			.map((tagLine) => tagLine.split(/\s+/)[1]) // Extract the tag reference
-			.filter((ref) => ref && ref.includes('refs/tags/')) // Filter out non-tags
-			.map((ref) => ref.replace('refs/tags/', '')) // Extract the tag name
-			.filter((tag) => tagPattern.test(tag)); // Filter valid version tags
+		if (newVersion) {
+			// let's remove "v" from version, i.e. first character
+			newVersion = newVersion.substring(1);
+			package.version = newVersion;
 
-		// Sort and get the latest tag
-		const latestTag = tagList
-			.sort((a, b) => {
-				// Using localeCompare with 'numeric' option for version comparison
-				return a.localeCompare(b, undefined, { numeric: true });
-			})
-			.pop();
+			console.log('Version updated to version', newVersion);
+		} else {
+			console.log('Latest tag is not found. Build Desktop App with default version', currentVersion);
+		}
 
-		return latestTag;
-	} catch (error) {
-		console.error(`Error fetching tags: ${error.message}`);
+		package.name = appName;
+		package.productName = process.env.DESKTOP_APP_DESCRIPTION;
+		package.description = process.env.DESKTOP_APP_DESCRIPTION;
+		package.homepage = process.env.COMPANY_SITE_LINK;
+
+		package.build.appId = process.env.DESKTOP_APP_ID;
+		package.build.productName = process.env.DESKTOP_APP_DESCRIPTION;
+		package.build.linux.executableName = appName;
+
+		const appRepoName = process.env.DESKTOP_APP_REPO_NAME || appName;
+		const appRepoOwner = process.env.DESKTOP_APP_REPO_OWNER || 'ever-co';
+
+		// For GitHub options see https://www.electron.build/configuration/publish.html
+
+		if (!isProd) {
+			package.build.publish = [
+				{
+					provider: 'github',
+					repo: appRepoName,
+					owner: appRepoOwner,
+					releaseType: 'prerelease'
+				},
+				{
+					provider: 'spaces',
+					name: 'ever',
+					region: 'sfo3',
+					path: `/${appName}-pre`,
+					acl: 'public-read'
+				}
+			];
+		} else {
+			package.build.publish = [
+				{
+					provider: 'github',
+					repo: appRepoName,
+					owner: appRepoOwner,
+					releaseType: 'release'
+				},
+				{
+					provider: 'spaces',
+					name: 'ever',
+					region: 'sfo3',
+					path: `/${appName}`,
+					acl: 'public-read'
+				}
+			];
+		}
+
+		fs.writeFileSync('./apps/desktop/src/package.json', JSON.stringify(package, null, 2));
+
+		let updated = require('../apps/desktop/src/package.json');
+
+		console.log('Version releasing', updated.version);
 	}
-}
+};
 
 module.exports.desktopTimer = async (isProd) => {
 	if (fs.existsSync('./apps/desktop-timer/src/package.json')) {
@@ -192,7 +299,7 @@ module.exports.desktopTimer = async (isProd) => {
 
 			console.log('Version updated to version', newVersion);
 		} else {
-			console.log('Latest tag is not found. build desktop-timer app with default version', currentVersion);
+			console.log('Latest tag is not found. Build Desktop Timer App with default version', currentVersion);
 		}
 
 		package.name = timerAppName;
@@ -250,95 +357,3 @@ module.exports.desktopTimer = async (isProd) => {
 		console.log('Version releasing', updated.version);
 	}
 };
-
-module.exports.desktopTimer2 = (isProd) => {
-	if (fs.existsSync('./apps/desktop-timer/src/package.json')) {
-		let package = require('../apps/desktop-timer/src/package.json');
-		let currentVersion = package.version;
-
-		const repoURL = process.env.PROJECT_REPO;
-		console.log('repoURL', repoURL);
-
-		const timerAppName = process.env.DESKTOP_TIMER_APP_NAME;
-		console.log('timerAppName', timerAppName);
-
-		const command =
-			'git ls-remote --tags ' +
-			repoURL +
-			" | grep -v '\\^{}' | awk -F'/' '/refs/tags\\// {print $3}' | grep -E '^v?[0-9]+\\.[0-9]+\\.[0-9]+' | sort -V | tail -n1";
-
-		console.log('command', command);
-
-		exec(command, (error, stdout) => {
-			if (error) {
-				console.error(`exec error: ${error}`);
-				return;
-			}
-
-			let newVersion = stdout.trim();
-			console.log('latest tag', newVersion);
-
-			if (newVersion) {
-				// let's remove "v" from version, i.e. first character
-				newVersion = newVersion.substring(1);
-				package.version = newVersion;
-
-				console.log('Version updated to version', newVersion);
-			} else {
-				console.log('Latest tag is not found. build desktop-timer app with default version', currentVersion);
-			}
-
-			package.name = timerAppName;
-			package.productName = process.env.DESKTOP_TIMER_APP_DESCRIPTION;
-			package.description = process.env.DESKTOP_TIMER_APP_DESCRIPTION;
-			package.homepage = process.env.COMPANY_SITE_LINK;
-
-			package.build.appId = process.env.DESKTOP_TIMER_APP_ID;
-			package.build.productName = process.env.DESKTOP_TIMER_APP_DESCRIPTION;
-			package.build.linux.executableName = timerAppName;
-
-			const appRepoName = process.env.DESKTOP_TIMER_APP_REPO_NAME || timerAppName;
-			const appRepoOwner = process.env.DESKTOP_TIMER_APP_REPO_OWNER || 'ever-co';
-
-			if (!isProd) {
-				package.build.publish = [
-					{
-						provider: 'github',
-						repo: appRepoName,
-						owner: appRepoOwner,
-						releaseType: 'prerelease'
-					},
-					{
-						provider: 'spaces',
-						name: 'ever',
-						region: 'sfo3',
-						path: `/${timerAppName}-pre`,
-						acl: 'public-read'
-					}
-				];
-			} else {
-				package.build.publish = [
-					{
-						provider: 'github',
-						repo: appRepoName,
-						owner: appRepoOwner,
-						releaseType: 'release'
-					},
-					{
-						provider: 'spaces',
-						name: 'ever',
-						region: 'sfo3',
-						path: `/${timerAppName}`,
-						acl: 'public-read'
-					}
-				];
-			}
-
-			fs.writeFileSync('./apps/desktop-timer/src/package.json', JSON.stringify(package, null, 2));
-
-			let updated = require('../apps/desktop-timer/src/package.json');
-
-			console.log('Version releasing', updated.version);
-		});
-	}
-};
diff --git a/.scripts/configure.ts b/.scripts/configure.ts
index 06bf7ecd679..8a202a08605 100644
--- a/.scripts/configure.ts
+++ b/.scripts/configure.ts
@@ -149,6 +149,7 @@ if (!env.IS_DOCKER) {
 		PLATFORM_PRIVACY_URL: '${env.PLATFORM_PRIVACY_URL}',
 		PLATFORM_TOS_URL: '${env.PLATFORM_TOS_URL}',
 		PROJECT_REPO: '${env.PROJECT_REPO}',
+
 		DESKTOP_TIMER_APP_NAME: '${env.DESKTOP_TIMER_APP_NAME}',
 		DESKTOP_TIMER_APP_DESCRIPTION: '${env.DESKTOP_TIMER_APP_DESCRIPTION}',
 		DESKTOP_TIMER_APP_ID: '${env.DESKTOP_TIMER_APP_ID}',
@@ -172,6 +173,15 @@ if (!env.IS_DOCKER) {
 		DESKTOP_SERVER_APP_REPO_OWNER: '${env.DESKTOP_SERVER_APP_REPO_OWNER}',
 		DESKTOP_SERVER_APP_WELCOME_TITLE: '${env.DESKTOP_SERVER_APP_WELCOME_TITLE}',
 		DESKTOP_SERVER_APP_WELCOME_CONTENT: '${env.DESKTOP_SERVER_APP_WELCOME_CONTENT}',
+
+		DESKTOP_API_SERVER_APP_NAME: '${env.DESKTOP_API_SERVER_APP_NAME}',
+		DESKTOP_API_SERVER_APP_DESCRIPTION: '${env.DESKTOP_API_SERVER_APP_DESCRIPTION}',
+		DESKTOP_API_SERVER_APP_ID: '${env.DESKTOP_API_SERVER_APP_ID}',
+		DESKTOP_API_SERVER_APP_REPO_NAME: '${env.DESKTOP_API_SERVER_APP_REPO_NAME}',
+		DESKTOP_API_SERVER_APP_REPO_OWNER: '${env.DESKTOP_API_SERVER_APP_REPO_OWNER}',
+		DESKTOP_API_SERVER_APP_WELCOME_TITLE: '${env.DESKTOP_API_SERVER_APP_WELCOME_TITLE}',
+		DESKTOP_API_SERVER_APP_WELCOME_CONTENT: '${env.DESKTOP_API_SERVER_APP_WELCOME_CONTENT}',
+
 		I18N_FILES_URL: '${env.I18N_FILES_URL}'
 	};
 	`;
@@ -283,6 +293,7 @@ if (!env.IS_DOCKER) {
 		PLATFORM_TOS_URL: '${env.PLATFORM_TOS_URL}',
 
 		PROJECT_REPO: '${env.PROJECT_REPO}',
+
 		DESKTOP_TIMER_APP_NAME: '${env.DESKTOP_TIMER_APP_NAME}',
 		DESKTOP_TIMER_APP_DESCRIPTION: '${env.DESKTOP_TIMER_APP_DESCRIPTION}',
 		DESKTOP_TIMER_APP_ID: '${env.DESKTOP_TIMER_APP_ID}',
@@ -306,6 +317,15 @@ if (!env.IS_DOCKER) {
 		DESKTOP_SERVER_APP_REPO_OWNER: '${env.DESKTOP_SERVER_APP_REPO_OWNER}',
 		DESKTOP_SERVER_APP_WELCOME_TITLE: '${env.DESKTOP_SERVER_APP_WELCOME_TITLE}',
 		DESKTOP_SERVER_APP_WELCOME_CONTENT: '${env.DESKTOP_SERVER_APP_WELCOME_CONTENT}',
+
+		DESKTOP_API_SERVER_APP_NAME: '${env.DESKTOP_API_SERVER_APP_NAME}',
+		DESKTOP_API_SERVER_APP_DESCRIPTION: '${env.DESKTOP_API_SERVER_APP_DESCRIPTION}',
+		DESKTOP_API_SERVER_APP_ID: '${env.DESKTOP_API_SERVER_APP_ID}',
+		DESKTOP_API_SERVER_APP_REPO_NAME: '${env.DESKTOP_API_SERVER_APP_REPO_NAME}',
+		DESKTOP_API_SERVER_APP_REPO_OWNER: '${env.DESKTOP_API_SERVER_APP_REPO_OWNER}',
+		DESKTOP_API_SERVER_APP_WELCOME_TITLE: '${env.DESKTOP_API_SERVER_APP_WELCOME_TITLE}',
+		DESKTOP_API_SERVER_APP_WELCOME_CONTENT: '${env.DESKTOP_API_SERVER_APP_WELCOME_CONTENT}',
+
 		I18N_FILES_URL: '${env.I18N_FILES_URL}'
 	};
 `;
diff --git a/.scripts/electron-desktop-environment/concrete-environment-content/desktop-environment-content.ts b/.scripts/electron-desktop-environment/concrete-environment-content/desktop-environment-content.ts
index 472cbd7b707..267315b1ebe 100644
--- a/.scripts/electron-desktop-environment/concrete-environment-content/desktop-environment-content.ts
+++ b/.scripts/electron-desktop-environment/concrete-environment-content/desktop-environment-content.ts
@@ -14,6 +14,7 @@ export class DesktopEnvironmentContent implements IContentGenerator {
 			IS_DESKTOP_TIMER: ${false},
 			IS_DESKTOP: ${true},
 			IS_SERVER: ${false},
+			IS_SERVER_API: ${false}
 		`;
 	}
 }
diff --git a/.scripts/electron-desktop-environment/concrete-environment-content/desktop-server-environment-content.ts b/.scripts/electron-desktop-environment/concrete-environment-content/desktop-server-environment-content.ts
index b94b8b3572a..c325cbf93c2 100644
--- a/.scripts/electron-desktop-environment/concrete-environment-content/desktop-server-environment-content.ts
+++ b/.scripts/electron-desktop-environment/concrete-environment-content/desktop-server-environment-content.ts
@@ -14,6 +14,7 @@ export class DesktopServerEnvironmentContent implements IContentGenerator {
 			IS_DESKTOP_TIMER: ${false},
 			IS_DESKTOP: ${false},
 			IS_SERVER: ${true},
+			IS_SERVER_API: ${false}
 		`;
 	}
 }
diff --git a/.scripts/electron-desktop-environment/concrete-environment-content/desktop-timer-environment-content.ts b/.scripts/electron-desktop-environment/concrete-environment-content/desktop-timer-environment-content.ts
index 3a5ae23c6f3..0db3a2acde8 100644
--- a/.scripts/electron-desktop-environment/concrete-environment-content/desktop-timer-environment-content.ts
+++ b/.scripts/electron-desktop-environment/concrete-environment-content/desktop-timer-environment-content.ts
@@ -14,6 +14,7 @@ export class DesktopTimerEnvironmentContent implements IContentGenerator {
 			IS_DESKTOP_TIMER: ${true},
 			IS_DESKTOP: ${false},
 			IS_SERVER: ${false},
+			IS_SERVER_API: ${false}
 		`;
 	}
 }
diff --git a/.scripts/env.ts b/.scripts/env.ts
index 9a3e351cbfe..29e30c88133 100644
--- a/.scripts/env.ts
+++ b/.scripts/env.ts
@@ -28,7 +28,7 @@ export type Env = Readonly<{
 	EXTENSION_DOWNLOAD_LINK: string;
 
 	// Platform logo url
-	PLATFORM_LOGO: string
+	PLATFORM_LOGO: string;
 
 	SENTRY_DSN: string;
 	SENTRY_TRACES_SAMPLE_RATE: string;
@@ -90,6 +90,7 @@ export type Env = Readonly<{
 	COMPANY_TWITTER_LINK: string;
 	COMPANY_LINKEDIN_LINK: string;
 	PROJECT_REPO: string;
+
 	DESKTOP_TIMER_APP_NAME: string;
 	DESKTOP_TIMER_APP_DESCRIPTION: string;
 	DESKTOP_TIMER_APP_ID: string;
@@ -97,6 +98,7 @@ export type Env = Readonly<{
 	DESKTOP_TIMER_APP_REPO_OWNER: string;
 	DESKTOP_TIMER_APP_WELCOME_TITLE: string;
 	DESKTOP_TIMER_APP_WELCOME_CONTENT: string;
+
 	DESKTOP_APP_NAME: string;
 	DESKTOP_APP_DESCRIPTION: string;
 	DESKTOP_APP_ID: string;
@@ -104,6 +106,7 @@ export type Env = Readonly<{
 	DESKTOP_APP_REPO_OWNER: string;
 	DESKTOP_APP_WELCOME_TITLE: string;
 	DESKTOP_APP_WELCOME_CONTENT: string;
+
 	DESKTOP_SERVER_APP_NAME: string;
 	DESKTOP_SERVER_APP_DESCRIPTION: string;
 	DESKTOP_SERVER_APP_ID: string;
@@ -111,6 +114,7 @@ export type Env = Readonly<{
 	DESKTOP_SERVER_APP_REPO_OWNER: string;
 	DESKTOP_SERVER_APP_WELCOME_TITLE: string;
 	DESKTOP_SERVER_APP_WELCOME_CONTENT: string;
+
 	DESKTOP_API_SERVER_APP_NAME: string;
 	DESKTOP_API_SERVER_APP_DESCRIPTION: string;
 	DESKTOP_API_SERVER_APP_ID: string;
@@ -118,6 +122,7 @@ export type Env = Readonly<{
 	DESKTOP_API_SERVER_APP_REPO_OWNER: string;
 	DESKTOP_API_SERVER_APP_WELCOME_TITLE: string;
 	DESKTOP_API_SERVER_APP_WELCOME_CONTENT: string;
+
 	AWHost: string;
 	API_DEFAULT_PORT: number;
 	GAUZY_UI_DEFAULT_PORT: number;
@@ -138,22 +143,22 @@ export const env: Env = cleanEnv(
 
 		PLATFORM_WEBSITE_URL: str({ default: 'https://gauzy.co' }),
 		PLATFORM_WEBSITE_DOWNLOAD_URL: str({
-			default: 'https://gauzy.co/downloads',
+			default: 'https://gauzy.co/downloads'
 		}),
 		DESKTOP_APP_DOWNLOAD_LINK_APPLE: str({
-			default: 'https://gauzy.co/downloads#desktop/apple',
+			default: 'https://gauzy.co/downloads#desktop/apple'
 		}),
 		DESKTOP_APP_DOWNLOAD_LINK_WINDOWS: str({
-			default: 'https://gauzy.co/downloads#desktop/windows',
+			default: 'https://gauzy.co/downloads#desktop/windows'
 		}),
 		DESKTOP_APP_DOWNLOAD_LINK_LINUX: str({
-			default: 'https://gauzy.co/downloads#desktop/linux',
+			default: 'https://gauzy.co/downloads#desktop/linux'
 		}),
 		MOBILE_APP_DOWNLOAD_LINK: str({
-			default: 'https://gauzy.co/downloads#mobile',
+			default: 'https://gauzy.co/downloads#mobile'
 		}),
 		EXTENSION_DOWNLOAD_LINK: str({
-			default: 'https://gauzy.co/downloads#extensions',
+			default: 'https://gauzy.co/downloads#extensions'
 		}),
 
 		SENTRY_DSN: str({ default: '' }),
@@ -196,122 +201,127 @@ export const env: Env = cleanEnv(
 
 		// Set default platform logo
 		PLATFORM_LOGO: str({
-			default: 'assets/images/logos/logo_Gauzy.svg',
+			default: 'assets/images/logos/logo_Gauzy.svg'
 		}),
 
 		//Set default gauzy desktop logo 512x512 pixels
 		GAUZY_DESKTOP_LOGO_512X512: str({
-			default: 'assets/icons/icon_512x512.png',
+			default: 'assets/icons/icon_512x512.png'
 		}),
 
 		// Set default platform privacy link
 		PLATFORM_PRIVACY_URL: str({
-			default: 'https://gauzy.co/privacy',
+			default: 'https://gauzy.co/privacy'
 		}),
 
 		// Set default platform terms of services link
 		PLATFORM_TOS_URL: str({
-			default: 'https://gauzy.co/tos',
+			default: 'https://gauzy.co/tos'
 		}),
 
 		COMPANY_NAME: str({
-			default: 'Ever Co. LTD',
+			default: 'Ever Co. LTD'
 		}),
 		COMPANY_SITE: str({
-			default: 'Gauzy',
+			default: 'Gauzy'
 		}),
 		COMPANY_LINK: str({
-			default: 'https://ever.co',
+			default: 'https://ever.co'
 		}),
 		COMPANY_SITE_LINK: str({
-			default: 'https://gauzy.co',
+			default: 'https://gauzy.co'
 		}),
 		COMPANY_GITHUB_LINK: str({
-			default: 'https://github.com/ever-co',
+			default: 'https://github.com/ever-co'
 		}),
 		COMPANY_GITLAB_LINK: str({
-			default: 'https://gitlab.com/ever-co',
+			default: 'https://gitlab.com/ever-co'
 		}),
 		COMPANY_FACEBOOK_LINK: str({
-			default: 'https://www.facebook.com/gauzyplatform',
+			default: 'https://www.facebook.com/gauzyplatform'
 		}),
 		COMPANY_TWITTER_LINK: str({
-			default: 'https://twitter.com/gauzyplatform',
+			default: 'https://twitter.com/gauzyplatform'
 		}),
 		COMPANY_LINKEDIN_LINK: str({
-			default: 'https://www.linkedin.com/company/ever-co',
+			default: 'https://www.linkedin.com/company/ever-co'
 		}),
 		NO_INTERNET_LOGO: str({
-			default: 'assets/images/logos/logo_Gauzy.svg',
+			default: 'assets/images/logos/logo_Gauzy.svg'
 		}),
 		PROJECT_REPO: str({
-			default: 'https://github.com/ever-co/ever-gauzy.git',
+			default: 'https://github.com/ever-co/ever-gauzy.git'
 		}),
+
 		DESKTOP_TIMER_APP_NAME: str({
-			default: 'gauzy-desktop-timer',
+			default: 'gauzy-desktop-timer'
 		}),
 		DESKTOP_TIMER_APP_DESCRIPTION: str({
-			default: 'Gauzy Desktop Timer',
+			default: 'Gauzy Desktop Timer'
 		}),
 		DESKTOP_TIMER_APP_ID: str({
-			default: 'com.ever.gauzydesktoptimer',
+			default: 'com.ever.gauzydesktoptimer'
 		}),
 		DESKTOP_TIMER_APP_REPO_NAME: str({
-			default: 'ever-gauzy-desktop-timer',
+			default: 'ever-gauzy-desktop-timer'
 		}),
 		DESKTOP_TIMER_APP_REPO_OWNER: str({ default: 'ever-co' }),
 		DESKTOP_TIMER_APP_WELCOME_TITLE: str({ default: '' }),
 		DESKTOP_TIMER_APP_WELCOME_CONTENT: str({ default: '' }),
+
 		DESKTOP_APP_NAME: str({
-			default: 'gauzy-desktop',
+			default: 'gauzy-desktop'
 		}),
 		DESKTOP_APP_DESCRIPTION: str({
-			default: 'Gauzy Desktop',
+			default: 'Ever Gauzy Desktop'
 		}),
 		DESKTOP_APP_ID: str({
-			default: 'com.ever.gauzydesktop',
+			default: 'com.ever.gauzydesktop'
 		}),
 		DESKTOP_APP_REPO_NAME: str({
-			default: 'ever-gauzy-desktop',
+			default: 'ever-gauzy-desktop'
 		}),
 		DESKTOP_APP_REPO_OWNER: str({ default: 'ever-co' }),
 		DESKTOP_APP_WELCOME_TITLE: str({ default: '' }),
 		DESKTOP_APP_WELCOME_CONTENT: str({ default: '' }),
+
 		DESKTOP_SERVER_APP_NAME: str({
-			default: 'gauzy-server',
+			default: 'gauzy-server'
 		}),
 		DESKTOP_SERVER_APP_DESCRIPTION: str({
-			default: 'Gauzy Server',
+			default: 'Ever Gauzy Server'
 		}),
 		DESKTOP_SERVER_APP_ID: str({
-			default: 'com.ever.gauzyserver',
+			default: 'com.ever.gauzyserver'
 		}),
 		DESKTOP_SERVER_APP_REPO_NAME: str({
-			default: 'ever-gauzy-server',
+			default: 'ever-gauzy-server'
 		}),
 		DESKTOP_SERVER_APP_REPO_OWNER: str({ default: 'ever-co' }),
 		DESKTOP_SERVER_APP_WELCOME_TITLE: str({ default: '' }),
 		DESKTOP_SERVER_APP_WELCOME_CONTENT: str({ default: '' }),
+
 		I18N_FILES_URL: str({ default: '' }),
 		AWHost: str({ default: 'http://localhost:5600' }),
 		API_DEFAULT_PORT: num({ default: 3000 }),
 		GAUZY_UI_DEFAULT_PORT: num({ default: 5621 }),
 		SCREENSHOTS_ENGINE_METHOD: str({ default: 'ScreenshotDesktopLib' }),
+
 		DESKTOP_API_SERVER_APP_NAME: str({
-			default: 'gauzy-api-server',
+			default: 'gauzy-api-server'
 		}),
 		DESKTOP_API_SERVER_APP_DESCRIPTION: str({
-			default: 'Gauzy Api Server',
+			default: 'Ever Gauzy API Server'
 		}),
 		DESKTOP_API_SERVER_APP_ID: str({
-			default: 'com.ever.gauzyapiserver',
+			default: 'com.ever.gauzyapiserver'
 		}),
 		DESKTOP_API_SERVER_APP_REPO_NAME: str({
-			default: 'ever-gauzy-api-server',
+			default: 'ever-gauzy-api-server'
 		}),
 		DESKTOP_API_SERVER_APP_REPO_OWNER: str({ default: 'ever-co' }),
 		DESKTOP_API_SERVER_APP_WELCOME_TITLE: str({ default: '' }),
-		DESKTOP_API_SERVER_APP_WELCOME_CONTENT: str({ default: '' }),
+		DESKTOP_API_SERVER_APP_WELCOME_CONTENT: str({ default: '' })
 	},
 	{ strict: true, dotEnvPath: __dirname + '/../.env' }
 );
diff --git a/apps/server-api/src/environments/environment.prod.ts b/apps/server-api/src/environments/environment.prod.ts
index b50d00518fa..62c90159638 100644
--- a/apps/server-api/src/environments/environment.prod.ts
+++ b/apps/server-api/src/environments/environment.prod.ts
@@ -1,29 +1,28 @@
 export const environment = {
-			production: true,
-			
-			AWHost: 'http://localhost:5600',
-			API_DEFAULT_PORT:  3000,
-			GAUZY_UI_DEFAULT_PORT: 5621,
-			SCREENSHOTS_ENGINE_METHOD: 'ScreenshotDesktopLib', // ElectronDesktopCapturer || ScreenshotDesktopLib
-			SENTRY_DSN: '',
-			SENTRY_TRACES_SAMPLE_RATE: '',
-			PLATFORM_LOGO: './assets/images/logos/platform_logo.svg',
-			PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git',
-			COMPANY_SITE_LINK: 'https://gauzy.co',
-			GAUZY_DESKTOP_LOGO_512X512: './assets/icons/desktop_logo_512x512.png',
-			NO_INTERNET_LOGO: './assets/images/logos/no_internet_logo.svg',
-			I18N_FILES_URL: '',
-		
-			NAME: 'gauzy-server',
-			DESCRIPTION: 'Gauzy Server',
-			APP_ID: 'com.ever.gauzyserver',
-			REPO_NAME: 'ever-gauzy-server',
-			REPO_OWNER: 'ever-co',
-			WELCOME_TITLE: '',
-			WELCOME_CONTENT: '',
-			IS_DESKTOP_TIMER: false,
-			IS_DESKTOP: false,
-			IS_SERVER: true,
-			IS_SERVER_API: true
-		
-		}
\ No newline at end of file
+	production: true,
+
+	AWHost: 'http://localhost:5600',
+	API_DEFAULT_PORT: 3000,
+	GAUZY_UI_DEFAULT_PORT: 5621,
+	SCREENSHOTS_ENGINE_METHOD: 'ScreenshotDesktopLib', // ElectronDesktopCapturer || ScreenshotDesktopLib
+	SENTRY_DSN: '',
+	SENTRY_TRACES_SAMPLE_RATE: '',
+	PLATFORM_LOGO: './assets/images/logos/platform_logo.svg',
+	PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git',
+	COMPANY_SITE_LINK: 'https://gauzy.co',
+	GAUZY_DESKTOP_LOGO_512X512: './assets/icons/desktop_logo_512x512.png',
+	NO_INTERNET_LOGO: './assets/images/logos/no_internet_logo.svg',
+	I18N_FILES_URL: '',
+
+	NAME: 'gauzy-api-server',
+	DESCRIPTION: 'Gauzy API Server',
+	APP_ID: 'com.ever.gauzyapiserver',
+	REPO_NAME: 'ever-gauzy-api-server',
+	REPO_OWNER: 'ever-co',
+	WELCOME_TITLE: '',
+	WELCOME_CONTENT: '',
+	IS_DESKTOP_TIMER: false,
+	IS_DESKTOP: false,
+	IS_SERVER: false,
+	IS_SERVER_API: true
+};
diff --git a/apps/server-api/src/environments/environment.ts b/apps/server-api/src/environments/environment.ts
index a54a962843a..b7f63d31184 100644
--- a/apps/server-api/src/environments/environment.ts
+++ b/apps/server-api/src/environments/environment.ts
@@ -1,29 +1,28 @@
 export const environment = {
-			production: false,
-			
-			AWHost: 'http://localhost:5600',
-			API_DEFAULT_PORT:  3000,
-			GAUZY_UI_DEFAULT_PORT: 5621,
-			SCREENSHOTS_ENGINE_METHOD: 'ScreenshotDesktopLib', // ElectronDesktopCapturer || ScreenshotDesktopLib
-			SENTRY_DSN: '',
-			SENTRY_TRACES_SAMPLE_RATE: '',
-			PLATFORM_LOGO: 'assets/images/logos/logo_Gauzy.svg',
-			PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git',
-			COMPANY_SITE_LINK: 'https://gauzy.co',
-			GAUZY_DESKTOP_LOGO_512X512: 'assets/icons/icon_512x512.png',
-			NO_INTERNET_LOGO: 'assets/images/logos/logo_Gauzy.svg',
-			I18N_FILES_URL: '',
-		
-			NAME: 'gauzy-server',
-			DESCRIPTION: 'Gauzy Server',
-			APP_ID: 'com.ever.gauzyserver',
-			REPO_NAME: 'ever-gauzy-server',
-			REPO_OWNER: 'ever-co',
-			WELCOME_TITLE: '',
-			WELCOME_CONTENT: '',
-			IS_DESKTOP_TIMER: false,
-			IS_DESKTOP: false,
-			IS_SERVER: true,
-			IS_SERVER_API: true
-		
-		}
\ No newline at end of file
+	production: false,
+
+	AWHost: 'http://localhost:5600',
+	API_DEFAULT_PORT: 3000,
+	GAUZY_UI_DEFAULT_PORT: 5621,
+	SCREENSHOTS_ENGINE_METHOD: 'ScreenshotDesktopLib', // ElectronDesktopCapturer || ScreenshotDesktopLib
+	SENTRY_DSN: '',
+	SENTRY_TRACES_SAMPLE_RATE: '',
+	PLATFORM_LOGO: 'assets/images/logos/logo_Gauzy.svg',
+	PROJECT_REPO: 'https://github.com/ever-co/ever-gauzy.git',
+	COMPANY_SITE_LINK: 'https://gauzy.co',
+	GAUZY_DESKTOP_LOGO_512X512: 'assets/icons/icon_512x512.png',
+	NO_INTERNET_LOGO: 'assets/images/logos/logo_Gauzy.svg',
+	I18N_FILES_URL: '',
+
+	NAME: 'gauzy-api-server',
+	DESCRIPTION: 'Gauzy API Server',
+	APP_ID: 'com.ever.gauzyapiserver',
+	REPO_NAME: 'ever-gauzy-api-server',
+	REPO_OWNER: 'ever-co',
+	WELCOME_TITLE: '',
+	WELCOME_CONTENT: '',
+	IS_DESKTOP_TIMER: false,
+	IS_DESKTOP: false,
+	IS_SERVER: false,
+	IS_SERVER_API: true
+};
diff --git a/apps/server-api/version.ts b/apps/server-api/version.ts
index 4edecb54639..3a41e76bccd 100644
--- a/apps/server-api/version.ts
+++ b/apps/server-api/version.ts
@@ -1,12 +1,12 @@
 /**
  * @description
- * Current version of the Gauzy Server.
+ * Current version of the Ever Gauzy Server.
  *
  * @example
  * ```
  * import { version } from './version';
  *
- * console.log('Gauzy Server Version:', version);
+ * console.log('Ever Gauzy Server Version:', version);
  * ```
  *
  * @since 0.1.0
diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts
index 59f1e0b8063..fa93a0323b5 100644
--- a/apps/server/src/index.ts
+++ b/apps/server/src/index.ts
@@ -416,7 +416,7 @@ ipcMain.on('start_server', async (event, arg) => {
 });
 
 ipcMain.on('run_gauzy_server', async (event, arg) => {
-	console.log('Run Gauzy Server Event Handler');
+	console.log('Run Ever Gauzy Server Event Handler');
 	await runServer();
 });
 
@@ -425,7 +425,7 @@ const stopServer = () => {
 };
 
 ipcMain.on('stop_gauzy_server', (event, arg) => {
-	console.log('Stop Gauzy Server Event Handler');
+	console.log('Stop Ever Gauzy Server Event Handler');
 	stopServer();
 });
 
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9624e58c331..ca12f0f3ccb 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -1,8 +1,8 @@
 {
 	"name": "gauzy-server",
-	"productName": "Gauzy Server",
+	"productName": "Ever Gauzy Server",
 	"version": "0.1.0",
-	"description": "Gauzy Server",
+	"description": "Ever Gauzy Server",
 	"license": "AGPL-3.0",
 	"homepage": "https://gauzy.co",
 	"repository": {
@@ -47,7 +47,7 @@
 	"build": {
 		"appId": "com.ever.gauzyserver",
 		"artifactName": "${name}-${version}.${ext}",
-		"productName": "Gauzy Server",
+		"productName": "Ever Gauzy Server",
 		"copyright": "Copyright © 2019-Present. Ever Co. LTD",
 		"dmg": {
 			"sign": false
diff --git a/apps/server/version.ts b/apps/server/version.ts
index 4edecb54639..3a41e76bccd 100644
--- a/apps/server/version.ts
+++ b/apps/server/version.ts
@@ -1,12 +1,12 @@
 /**
  * @description
- * Current version of the Gauzy Server.
+ * Current version of the Ever Gauzy Server.
  *
  * @example
  * ```
  * import { version } from './version';
  *
- * console.log('Gauzy Server Version:', version);
+ * console.log('Ever Gauzy Server Version:', version);
  * ```
  *
  * @since 0.1.0
diff --git a/packages/desktop-ui-lib/src/lib/server-dashboard/server-dashboard.component.html b/packages/desktop-ui-lib/src/lib/server-dashboard/server-dashboard.component.html
index 4e95768af9a..06c65624016 100644
--- a/packages/desktop-ui-lib/src/lib/server-dashboard/server-dashboard.component.html
+++ b/packages/desktop-ui-lib/src/lib/server-dashboard/server-dashboard.component.html
@@ -6,17 +6,24 @@
                     <div class="col-12 text-center margin-content">
                         <img [src]="gauzyIcon" [class]="styles.icon" />
                     </div>
-                    <div class="col-12 text-center margin-content">
+                    <div class="col-12 text-center margin-content" *ngIf="!isServerApi">
                         <h4 *ngIf="isExpandWindow">{{'SERVER' | translate| uppercase}}</h4>
                         <h5 *ngIf="!isExpandWindow">{{'SERVER' | translate| uppercase}}</h5>
                     </div>
+                    <div class="col-12 text-center margin-content" *ngIf="isServerApi">
+                        <h4 *ngIf="isExpandWindow">{{'SERVER_API' | translate| uppercase}}</h4>
+                        <h5 *ngIf="!isExpandWindow">{{'SERVER_API' | translate| uppercase}}</h5>
+                    </div>
                     <div class="col-12 text-center accordion margin-content" *ngIf="isExpandWindow">
                         <nb-accordion multi>
                             <nb-accordion-item #logServer [expanded]="logIsOpen"
                                 (collapsedChange)="logBoxChange($event)">
-                                <nb-accordion-item-header>
+                                <nb-accordion-item-header *ngIf="!isServerApi">
                                     {{'SERVER_LOG' | translate}}
                                 </nb-accordion-item-header>
+                                <nb-accordion-item-header *ngIf="isServerApi">
+                                    {{'SERVER_API_LOG' | translate}}
+                                </nb-accordion-item-header>
                                 <nb-accordion-item-body class="log-box">
                                     <div class="log-content" #logBox>
                                         <p class="content-text" *ngFor="let content of logContents">
diff --git a/packages/desktop-ui-lib/src/lib/server-dashboard/server-dashboard.component.ts b/packages/desktop-ui-lib/src/lib/server-dashboard/server-dashboard.component.ts
index 90bd9c794e7..7d18b37e0dc 100644
--- a/packages/desktop-ui-lib/src/lib/server-dashboard/server-dashboard.component.ts
+++ b/packages/desktop-ui-lib/src/lib/server-dashboard/server-dashboard.component.ts
@@ -187,4 +187,8 @@ export class ServerDashboardComponent implements OnInit, AfterViewInit {
 			this.logIsOpen = true;
 		}
 	}
+
+	public get isServerApi(): boolean {
+		return this._environment.IS_SERVER_API;
+	}
 }
diff --git a/packages/ui-config/src/lib/environments/model.ts b/packages/ui-config/src/lib/environments/model.ts
index 2eb8ef8ea08..1944e13bea2 100644
--- a/packages/ui-config/src/lib/environments/model.ts
+++ b/packages/ui-config/src/lib/environments/model.ts
@@ -82,6 +82,7 @@ export interface Environment {
 	PLATFORM_TOS_URL: string;
 
 	PROJECT_REPO: string;
+
 	DESKTOP_TIMER_APP_NAME: string;
 	DESKTOP_TIMER_APP_DESCRIPTION: string;
 	DESKTOP_TIMER_APP_ID: string;
@@ -89,6 +90,7 @@ export interface Environment {
 	DESKTOP_TIMER_APP_REPO_OWNER: string;
 	DESKTOP_TIMER_APP_WELCOME_TITLE: string;
 	DESKTOP_TIMER_APP_WELCOME_CONTENT: string;
+
 	DESKTOP_APP_NAME: string;
 	DESKTOP_APP_DESCRIPTION: string;
 	DESKTOP_APP_ID: string;
@@ -96,6 +98,7 @@ export interface Environment {
 	DESKTOP_APP_REPO_OWNER: string;
 	DESKTOP_APP_WELCOME_TITLE: string;
 	DESKTOP_APP_WELCOME_CONTENT: string;
+
 	DESKTOP_SERVER_APP_NAME: string;
 	DESKTOP_SERVER_APP_DESCRIPTION: string;
 	DESKTOP_SERVER_APP_ID: string;
@@ -103,5 +106,14 @@ export interface Environment {
 	DESKTOP_SERVER_APP_REPO_OWNER: string;
 	DESKTOP_SERVER_APP_WELCOME_TITLE: string;
 	DESKTOP_SERVER_APP_WELCOME_CONTENT: string;
+
+	DESKTOP_API_SERVER_APP_NAME: string;
+	DESKTOP_API_SERVER_APP_DESCRIPTION: string;
+	DESKTOP_API_SERVER_APP_ID: string;
+	DESKTOP_API_SERVER_APP_REPO_NAME: string;
+	DESKTOP_API_SERVER_APP_REPO_OWNER: string;
+	DESKTOP_API_SERVER_APP_WELCOME_TITLE: string;
+	DESKTOP_API_SERVER_APP_WELCOME_CONTENT: string;
+
 	I18N_FILES_URL: string;
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/ach.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/ach.json
index f9c6742e307..3b3a010789e 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/ach.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/ach.json
@@ -3999,5 +3999,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "crwdns11241:0crwdne11241:0",
 		"AVAILABLE": "crwdns11243:0crwdne11243:0"
-	}
+	},
+	"SERVER_API": "API Server",
+	"SERVER_API_LOG": "API Server Log"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/ar.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/ar.json
index 992e123e984..9c02879f791 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/ar.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/ar.json
@@ -4587,5 +4587,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "أضف أو أزل الصورة",
 		"AVAILABLE": "الصورة غير متاحة"
-	}
+	},
+	"SERVER_API": "خادم واجهة برمجة التطبيقات",
+	"SERVER_API_LOG": "سجل خادم API"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/bg.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/bg.json
index b6c2cce3093..77fcf043e4b 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/bg.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/bg.json
@@ -4579,5 +4579,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
 		"AVAILABLE": "Image not available"
-	}
+	},
+	"SERVER_API": "API сървър",
+	"SERVER_API_LOG": "Дневник на API сървъра"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/de.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/de.json
index dfd2567ea64..d883104a53b 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/de.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/de.json
@@ -4584,5 +4584,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Bild hinzufügen oder entfernen",
 		"AVAILABLE": "Bild nicht verfügbar"
-	}
+	},
+	"SERVER_API": "API Server",
+	"SERVER_API_LOG": "API Server Log"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/en.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/en.json
index 7b1c8e18f45..2130da8ab9a 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/en.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/en.json
@@ -3888,9 +3888,9 @@
 		"SETUP": {
 			"WELCOME": "Welcome",
 			"TITLE": "Welcome to Ever® Gauzy™ - Open-Source Business Management Platform (ERP/CRM/HRM)",
-			"LABEL": "Gauzy Desktop App provides the full functionality of the Gauzy Platform available directly on your desktop computer or a laptop. In addition, it allows tracking work time, activity recording, and the ability to receive tracking reminders/notifications.",
-			"TITLE_SERVER": "Gauzy Server Installation Wizard",
-			"LABEL_SERVER": "Gauzy Desktop App provides the full functionality of the Gauzy Platform available directly on your desktop computer or a laptop. In addition, it allows tracking work time, activity recording, and the ability to receive tracking reminders/notifications.",
+			"LABEL": "Ever Gauzy Desktop App provides the full functionality of the Gauzy Platform available directly on your desktop computer or a laptop. In addition, it allows tracking work time, activity recording, and the ability to receive tracking reminders/notifications.",
+			"TITLE_SERVER": "Ever Gauzy Server Installation Wizard",
+			"LABEL_SERVER": "Ever Gauzy Desktop App provides the full functionality of the Gauzy Platform available directly on your desktop computer or a laptop. In addition, it allows tracking work time, activity recording, and the ability to receive tracking reminders/notifications.",
 			"FUNCTIONALITIES": "Functionalities",
 			"WHAT_WOULD_LIKE_USE": "What would you like to use?",
 			"SELECT_MULTIPLE_OPTIONS": "You can select only one option or both options.",
@@ -4723,5 +4723,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
 		"AVAILABLE": "Image not available"
-	}
+	},
+	"SERVER_API": "API Server",
+	"SERVER_API_LOG": "API Server Log"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/es.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/es.json
index bb6b3a0c57f..a7c60076cf0 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/es.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/es.json
@@ -4590,5 +4590,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Agregar o Eliminar Imagen",
 		"AVAILABLE": "Imagen no disponible"
-	}
+	},
+	"SERVER_API": "Servidor API",
+	"SERVER_API_LOG": "Registro del servidor API"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/fr.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/fr.json
index 6539a5fb1b3..e37ccf11590 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/fr.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/fr.json
@@ -4589,5 +4589,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Ajouter ou supprimer une image",
 		"AVAILABLE": "Image non disponible"
-	}
+	},
+	"SERVER_API": "Serveur API",
+	"SERVER_API_LOG": "Journal du serveur API"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/he.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/he.json
index 98d51b7c139..1f4d0da8d52 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/he.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/he.json
@@ -4569,5 +4569,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Add or Drop Image",
 		"AVAILABLE": "Image not available"
-	}
+	},
+	"SERVER_API": "API Server",
+	"SERVER_API_LOG": "API Server Log"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/it.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/it.json
index c075c015329..61768f819b8 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/it.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/it.json
@@ -4588,5 +4588,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Aggiungi o Rimuovi Immagine",
 		"AVAILABLE": "Immagine non disponibile"
-	}
+	},
+	"SERVER_API": "API Server",
+	"SERVER_API_LOG": "Registro del server API"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/nl.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/nl.json
index d782fe18e16..6bedd8f0996 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/nl.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/nl.json
@@ -3776,14 +3776,14 @@
 		"SETUP": {
 			"WELCOME": "Welkom",
 			"TITLE": "Welkom bij Ever® Gauzy™ - Open-Source Business Management Platform (ERP/CRM/HRM)",
-			"LABEL": "De Gauzy Desktop App biedt de volledige functionaliteit van het Gauzy Platform rechtstreeks op uw desktopcomputer of laptop. Daarnaast stelt het u in staat om werktijd bij te houden, activiteiten op te nemen en tracking herinneringen/meldingen te ontvangen.",
-			"TITLE_SERVER": "Gauzy Server Installatie-assistent",
-			"LABEL_SERVER": "De Gauzy Desktop-app biedt de volledige functionaliteit van het Gauzy-platform direct beschikbaar op uw desktopcomputer of laptop. Daarnaast maakt het het mogelijk om werktijden bij te houden, activiteiten op te nemen en meldingen/herinneringen voor tracking te ontvangen.",
+			"LABEL": "De Ever Gauzy Desktop App biedt de volledige functionaliteit van het Gauzy Platform rechtstreeks op uw desktopcomputer of laptop. Daarnaast stelt het u in staat om werktijd bij te houden, activiteiten op te nemen en tracking herinneringen/meldingen te ontvangen.",
+			"TITLE_SERVER": "Ever Gauzy Server Installatie-assistent",
+			"LABEL_SERVER": "De Ever Gauzy Desktop-app biedt de volledige functionaliteit van het Gauzy-platform direct beschikbaar op uw desktopcomputer of laptop. Daarnaast maakt het het mogelijk om werktijden bij te houden, activiteiten op te nemen en meldingen/herinneringen voor tracking te ontvangen.",
 			"FUNCTIONALITIES": "Functionaliteiten",
 			"WHAT_WOULD_LIKE_USE": "Waarmee zou je graag willen werken?",
 			"SELECT_MULTIPLE_OPTIONS": "Je kunt slechts één optie selecteren of beide opties.",
 			"TIME_ACTIVITY_FEATURES": "Tijd- en activiteitstraceringfuncties",
-			"GP_FEATURES": "Gauzy Platformfuncties",
+			"GP_FEATURES": "Ever Gauzy Platformfuncties",
 			"HOW_GONNA_USE_GP": "Hoe ga je het Gauzy platform gebruiken?",
 			"SELECT_ONE_OPTION": "Je moet slechts één van de onderstaande opties selecteren.",
 			"INTEGRATED": "Geïntegreerd",
@@ -4588,5 +4588,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Afbeelding toevoegen of verwijderen",
 		"AVAILABLE": "Afbeelding niet beschikbaar"
-	}
+	},
+	"SERVER_API": "API Server",
+	"SERVER_API_LOG": "API Server Log"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/pl.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/pl.json
index 8f364d15ee1..2bf9dcb446d 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/pl.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/pl.json
@@ -4588,5 +4588,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Dodaj lub usuń obraz",
 		"AVAILABLE": "Zdjęcie niedostępne"
-	}
+	},
+	"SERVER_API": "Serwer API",
+	"SERVER_API_LOG": "Dziennik serwera API"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/pt.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/pt.json
index 74b5f727fe1..c2c3225a285 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/pt.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/pt.json
@@ -4588,5 +4588,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Adicionar ou Remover Imagem",
 		"AVAILABLE": "Imagem não disponível."
-	}
+	},
+	"SERVER_API": "Servidor API",
+	"SERVER_API_LOG": "Log do servidor API"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/ru.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/ru.json
index e8a6eb1a669..6d32f35c302 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/ru.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/ru.json
@@ -3786,14 +3786,14 @@
 		"SETUP": {
 			"WELCOME": "Добро пожаловать",
 			"TITLE": "Добро пожаловать в Ever® Gauzy™ - Open-Source платформа управления бизнесом (ERP/CRM/HRM)",
-			"LABEL": "Приложение Gauzy Desktop предоставляет полную функциональность платформы Gauzy, доступную непосредственно на вашем настольном компьютере или ноутбуке. Кроме того, оно позволяет отслеживать рабочее время, записывать активность и получать напоминания/уведомления об отслеживании.",
-			"TITLE_SERVER": "Мастер установки Gauzy Server",
-			"LABEL_SERVER": "Приложение Gauzy Desktop предоставляет полную функциональность платформы Gauzy, доступную непосредственно на вашем настольном компьютере или ноутбуке. Кроме того, оно позволяет отслеживать рабочее время, записывать активность и получать напоминания/уведомления об отслеживании.",
+			"LABEL": "Приложение Ever Gauzy Desktop предоставляет полную функциональность платформы Gauzy, доступную непосредственно на вашем настольном компьютере или ноутбуке. Кроме того, оно позволяет отслеживать рабочее время, записывать активность и получать напоминания/уведомления об отслеживании.",
+			"TITLE_SERVER": "Мастер установки Ever Gauzy Server",
+			"LABEL_SERVER": "Приложение Ever Gauzy Desktop предоставляет полную функциональность платформы Gauzy, доступную непосредственно на вашем настольном компьютере или ноутбуке. Кроме того, оно позволяет отслеживать рабочее время, записывать активность и получать напоминания/уведомления об отслеживании.",
 			"FUNCTIONALITIES": "Функциональности",
 			"WHAT_WOULD_LIKE_USE": "Что вы хотели бы использовать?",
 			"SELECT_MULTIPLE_OPTIONS": "Вы можете выбрать только одну опцию или обе опции.",
 			"TIME_ACTIVITY_FEATURES": "Функции отслеживания времени и активности",
-			"GP_FEATURES": "Функции платформы Gauzy",
+			"GP_FEATURES": "Функции платформы Ever Gauzy",
 			"HOW_GONNA_USE_GP": "Как вы собираетесь использовать платформу Gauzy?",
 			"SELECT_ONE_OPTION": "Вы должны выбрать только одну из предложенных опций.",
 			"INTEGRATED": "Интегрированный",
@@ -4577,5 +4577,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "Добавить или выложить изображение",
 		"AVAILABLE": "Изображение недоступно"
-	}
+	},
+	"SERVER_API": "API-сервер",
+	"SERVER_API_LOG": "Журнал API-сервера"
 }
diff --git a/packages/ui-sdk/src/lib/i18n/assets/i18n/zh.json b/packages/ui-sdk/src/lib/i18n/assets/i18n/zh.json
index bef8a8de561..eda9c64dc6d 100644
--- a/packages/ui-sdk/src/lib/i18n/assets/i18n/zh.json
+++ b/packages/ui-sdk/src/lib/i18n/assets/i18n/zh.json
@@ -4588,5 +4588,7 @@
 	"NO_IMAGE": {
 		"ADD_DROP": "添加或删除图像",
 		"AVAILABLE": "图像不可用"
-	}
+	},
+	"SERVER_API": "API服务器",
+	"SERVER_API_LOG": "API服务器日志"
 }