diff --git a/src/commands/install/config/apps-groups/cli-apps.ts b/src/commands/install/config/apps-groups/cli-apps.ts
index 083398d..4943536 100755
--- a/src/commands/install/config/apps-groups/cli-apps.ts
+++ b/src/commands/install/config/apps-groups/cli-apps.ts
@@ -17,7 +17,7 @@ export const CLI_APPS: Readonly<IAppSetup[]> = [
         name: 'NVM',
         description: 'Node Version Manager',
         group: 'cli-apps',
-        tags: ['node-engineering', 'devops'],
+        tags: ['node-engineering', 'web-engineering', 'devops'],
         commands: () => [
             BREW_INSTALL('nvm'),
             '\\. "$(brew --prefix)/opt/nvm/nvm.sh"',
@@ -37,7 +37,7 @@ export const CLI_APPS: Readonly<IAppSetup[]> = [
         name: 'GitHub CLI',
         group: 'cli-apps',
         description: 'GitHub in your terminal',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_INSTALL('gh')],
         fallbackCommands: () => [BROW_INSTALL('gh')],
     },
@@ -45,7 +45,7 @@ export const CLI_APPS: Readonly<IAppSetup[]> = [
         name: 'google-cloud-sdk',
         group: 'cli-apps',
         description: 'Integrate with Google Cloud Platform services, Python is required',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_CASK('google-cloud-sdk')],
         fallbackCommands: () => [BROW_CASK('google-cloud-sdk')],
         deps: ['Python'],
@@ -69,7 +69,7 @@ export const CLI_APPS: Readonly<IAppSetup[]> = [
         name: 'Mongodb',
         group: 'cli-apps',
         description: 'MongoDB Community Edition server',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_TAP('mongodb/brew'), BREW_INSTALL('mongodb-community@6.0'), 'mkdir -p "$HOME/mongodb"'],
         fallbackCommands: () => [
             BROW_TAP('mongodb/brew'),
@@ -81,7 +81,7 @@ export const CLI_APPS: Readonly<IAppSetup[]> = [
         name: 'Redis',
         description: 'Redis server',
         group: 'cli-apps',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_INSTALL('redis')],
         fallbackCommands: () => [BROW_INSTALL('redis')],
     },
@@ -89,7 +89,7 @@ export const CLI_APPS: Readonly<IAppSetup[]> = [
         name: 'Docker',
         description: 'Docker CLI',
         group: 'cli-apps',
-        tags: ['devops'],
+        tags: ['node-engineering', 'devops'],
         commands: () => [BREW_INSTALL('docker')],
     },
     {
diff --git a/src/commands/install/config/apps-groups/engineering-apps.ts b/src/commands/install/config/apps-groups/engineering-apps.ts
index 38b61e1..1eada96 100755
--- a/src/commands/install/config/apps-groups/engineering-apps.ts
+++ b/src/commands/install/config/apps-groups/engineering-apps.ts
@@ -5,14 +5,14 @@ export const ENGINEERING_APPS: Readonly<IAppSetup[]> = [
     {
         name: 'Mongodb Compass',
         group: 'engineering-apps',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_CASK('mongodb-compass')],
         description: 'MongoDB GUI, MongoDB is required',
     },
     {
         name: 'Another Redis Desktop Manager',
         group: 'engineering-apps',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [
             BREW_CASK('another-redis-desktop-manager'),
             `sudo xattr -rd com.apple.quarantine "/Applications/Another Redis Desktop Manager.app"`,
@@ -23,14 +23,13 @@ export const ENGINEERING_APPS: Readonly<IAppSetup[]> = [
         name: 'Rancher',
         description: 'Kubernetes and Docker UI tool',
         group: 'engineering-apps',
-        tags: ['engineering', 'devops'],
         commands: () => [BREW_CASK('rancher')],
     },
     {
         name: 'Postman',
         description: 'API client',
         group: 'engineering-apps',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_CASK('postman')],
     },
 ]
diff --git a/src/commands/install/config/apps-groups/git.ts b/src/commands/install/config/apps-groups/git.ts
index 223385b..ffc0e1f 100755
--- a/src/commands/install/config/apps-groups/git.ts
+++ b/src/commands/install/config/apps-groups/git.ts
@@ -6,7 +6,7 @@ export const GIT_APPS: Readonly<IAppSetup[]> = [
         name: 'Git',
         description: 'Common Code Version Manager',
         group: 'git',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_INSTALL('git')],
     },
     {
diff --git a/src/commands/install/config/apps-groups/ides.ts b/src/commands/install/config/apps-groups/ides.ts
index ca28be6..d19271b 100755
--- a/src/commands/install/config/apps-groups/ides.ts
+++ b/src/commands/install/config/apps-groups/ides.ts
@@ -5,13 +5,13 @@ export const IDES: Readonly<IAppSetup[]> = [
     {
         name: 'Visual Studio Code',
         group: 'IDEs',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_CASK('visual-studio-code')],
     },
     {
         name: 'Webstorm',
         group: 'IDEs',
-        tags: ['web-engineering'],
+        tags: ['web-engineering', 'node-engineering'],
         paid: true,
         commands: () => [BREW_CASK('webstorm')],
     },
diff --git a/src/commands/install/config/apps-groups/node.ts b/src/commands/install/config/apps-groups/node.ts
index e5b2476..21aaa01 100755
--- a/src/commands/install/config/apps-groups/node.ts
+++ b/src/commands/install/config/apps-groups/node.ts
@@ -11,56 +11,55 @@ export const NODE_APPS: Readonly<IAppSetup[]> = [
     {
         name: '@nestjs/cli',
         group: 'node',
-        tags: ['web-engineering'],
+        tags: ['node-engineering'],
         commands: () => [NODE_GLOBAL('@nestjs/cli')],
     },
     {
         name: 'nx',
         group: 'node',
-        tags: ['web-engineering'],
+        tags: ['web-engineering', 'node-engineering'],
         commands: () => [NODE_GLOBAL('nx')],
     },
+    {
+        name: 'jest',
+        group: 'node',
+        tags: ['web-engineering', 'node-engineering'],
+        commands: () => [NODE_GLOBAL('jest')],
+    },
     {
         name: 'ts-jest',
         group: 'node',
-        tags: ['web-engineering'],
         commands: () => [NODE_GLOBAL('ts-jest')],
     },
     {
         name: 'ts-node-dev',
         group: 'node',
-        tags: ['web-engineering'],
+        tags: ['node-engineering'],
         commands: () => [NODE_GLOBAL('ts-node-dev')],
     },
     {
         name: 'ts-node',
         group: 'node',
-        tags: ['web-engineering'],
+        tags: ['node-engineering'],
         commands: () => [NODE_GLOBAL('ts-node')],
     },
     {
         name: 'typescript',
         group: 'node',
-        tags: ['web-engineering'],
+        tags: ['web-engineering', 'node-engineering'],
         commands: () => [NODE_GLOBAL('typescript')],
     },
-    {
-        name: '@githubnext/github-copilot-cli',
-        group: 'node',
-        tags: ['web-engineering', 'devops'],
-        commands: () => [NODE_GLOBAL('@githubnext/github-copilot-cli')],
-    },
     {
         name: 'nodemon',
         group: 'node',
-        tags: ['web-engineering'],
+        tags: ['node-engineering'],
         commands: () => [NODE_GLOBAL('nodemon')],
     },
     {
         name: 'npmrc',
         description: 'manage multiple .npmrc files effortlessly',
         group: 'node',
-        tags: ['web-engineering', 'devops'],
+        tags: ['web-engineering', 'node-engineering', 'devops'],
         commands: () => [NODE_GLOBAL('npmrc')],
     },
     {
@@ -120,6 +119,11 @@ export const NODE_APPS: Readonly<IAppSetup[]> = [
         group: 'node',
         commands: () => [NODE_GLOBAL('prettier')],
     },
+    {
+        name: '@githubnext/github-copilot-cli',
+        group: 'node',
+        commands: () => [NODE_GLOBAL('@githubnext/github-copilot-cli')],
+    },
     {
         name: 'vercel',
         group: 'node',
diff --git a/src/commands/install/config/apps-groups/terminal.ts b/src/commands/install/config/apps-groups/terminal.ts
index 01bfe2b..48d384f 100755
--- a/src/commands/install/config/apps-groups/terminal.ts
+++ b/src/commands/install/config/apps-groups/terminal.ts
@@ -32,14 +32,14 @@ export const TERMINAL_APPS: Readonly<IAppSetup[]> = [
     {
         name: 'ZSH Terminal Syntax Highlighting',
         group: 'terminal',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_INSTALL('zsh-syntax-highlighting')],
         fallbackCommands: () => [BROW_INSTALL('zsh-syntax-highlighting')],
     },
     {
         name: 'ZSH Terminal Syntax Autosuggestions',
         group: 'terminal',
-        tags: ['engineering', 'devops'],
+        tags: ['engineering'],
         commands: () => [BREW_INSTALL('zsh-autosuggestions')],
         fallbackCommands: () => [BROW_INSTALL('zsh-autosuggestions')],
     },
diff --git a/src/models/tag.model.ts b/src/models/tag.model.ts
index 55b7878..a821fe8 100755
--- a/src/models/tag.model.ts
+++ b/src/models/tag.model.ts
@@ -23,5 +23,6 @@ export const TAGS_DEPS: Partial<Record<ITag, ITag[]>> = {
     'python-engineering': ['engineering'],
     'node-engineering': ['engineering'],
     'web-engineering': ['engineering'],
+    devops: ['engineering'],
     'super-user': ['productivity'],
 }