diff --git a/e2e/stacks/list-stacks/list-stack.mock.js b/e2e/stacks/list-stacks/list-stack.mock.js
index b9eca943ec9..bd2cdf7053a 100644
--- a/e2e/stacks/list-stacks/list-stack.mock.js
+++ b/e2e/stacks/list-stacks/list-stack.mock.js
@@ -26,7 +26,7 @@ exports.listStacksTheeEntries = function () {
                 'machines': {
                   'dev-machine': {
                     'servers': {},
-                    'agents': ['org.eclipse.che.terminal', 'org.eclipse.che.ws-agent', 'org.eclipse.che.ssh'],
+                    'agents': ['org.eclipse.che.exec', 'org.eclipse.che.terminal', 'org.eclipse.che.ws-agent', 'org.eclipse.che.ssh'],
                     'attributes': {'memoryLimitBytes': '2147483648'}
                   }
                 }, 'recipe': {'location': 'codenvy/node', 'type': 'dockerimage'}
diff --git a/e2e/stacks/stack-details/stack-details.mock.js b/e2e/stacks/stack-details/stack-details.mock.js
index e68b2eec3ad..42a6edfac7b 100644
--- a/e2e/stacks/stack-details/stack-details.mock.js
+++ b/e2e/stacks/stack-details/stack-details.mock.js
@@ -23,7 +23,7 @@ exports.dockerimageStack = function () {
                 'machines': {
                   'dev-machine': {
                     'servers': {},
-                    'agents': ['org.eclipse.che.terminal', 'org.eclipse.che.ws-agent', 'org.eclipse.che.ssh'],
+                    'agents': ['org.eclipse.che.exec', 'org.eclipse.che.terminal', 'org.eclipse.che.ws-agent', 'org.eclipse.che.ssh'],
                     'attributes': {'memoryLimitBytes': '2147483648'}
                   }
                 }, 'recipe': {'location': 'eclipse/node', 'type': 'dockerimage'}
@@ -60,7 +60,7 @@ exports.dockerfileStack = function () {
                 'machines': {
                   'dev-machine': {
                     'servers': {},
-                    'agents': ['org.eclipse.che.ws-agent', 'org.eclipse.che.ssh', 'org.eclipse.che.terminal'],
+                    'agents': ['org.eclipse.che.ws-agent', 'org.eclipse.che.ssh', 'org.eclipse.che.exec', 'org.eclipse.che.terminal'],
                     'attributes': {'memoryLimitBytes': '2147483648'}
                   }
                 }
@@ -98,6 +98,7 @@ exports.composefileStack = function () {
                   'db': {
                     'servers': {},
                     'agents': [
+                      'org.eclipse.che.exec',
                       'org.eclipse.che.terminal'
                     ],
                     'attributes': {
@@ -107,6 +108,7 @@ exports.composefileStack = function () {
                   'dev-machine': {
                     'servers': {},
                     'agents': [
+                      'org.eclipse.che.exec',
                       'org.eclipse.che.terminal',
                       'org.eclipse.che.ws-agent',
                       'org.eclipse.che.ssh'
diff --git a/src/app/workspaces/workspace-details/environments/add-machine-dialog/add-machine-dialog.controller.ts b/src/app/workspaces/workspace-details/environments/add-machine-dialog/add-machine-dialog.controller.ts
index d46558ed2ac..a40bc7a326d 100644
--- a/src/app/workspaces/workspace-details/environments/add-machine-dialog/add-machine-dialog.controller.ts
+++ b/src/app/workspaces/workspace-details/environments/add-machine-dialog/add-machine-dialog.controller.ts
@@ -74,7 +74,7 @@ export class AddMachineDialogController {
   setDefaultData(): void {
     this.machine = {
       'agents': [
-        'org.eclipse.che.terminal', 'org.eclipse.che.ssh'
+        'org.eclipse.che.exec', 'org.eclipse.che.terminal', 'org.eclipse.che.ssh'
       ],
       'servers': {},
       'attributes': {}
diff --git a/src/components/api/che-stack.factory.ts b/src/components/api/che-stack.factory.ts
index 076f1ea6a2b..9f7688c5178 100644
--- a/src/components/api/che-stack.factory.ts
+++ b/src/components/api/che-stack.factory.ts
@@ -78,7 +78,7 @@ export class CheStack {
             'machines': {
               'dev-machine': {
                 'agents': [
-                  'org.eclipse.che.terminal', 'org.eclipse.che.ws-agent', 'org.eclipse.che.ssh'
+                  'org.eclipse.che.exec', 'org.eclipse.che.terminal', 'org.eclipse.che.ws-agent', 'org.eclipse.che.ssh'
                 ],
                 'servers': {},
                 'attributes': {
diff --git a/src/components/api/che-workspace.factory.ts b/src/components/api/che-workspace.factory.ts
index f614a115a4a..c7fd0b025ca 100644
--- a/src/components/api/che-workspace.factory.ts
+++ b/src/components/api/che-workspace.factory.ts
@@ -322,7 +322,7 @@ export class CheWorkspace {
         'machines': {
           'dev-machine': {
             'attributes': {'memoryLimitBytes': ram},
-            'agents': ['org.eclipse.che.ws-agent', 'org.eclipse.che.terminal', 'org.eclipse.che.ssh']
+            'agents': ['org.eclipse.che.ws-agent', 'org.eclipse.che.exec', 'org.eclipse.che.terminal', 'org.eclipse.che.ssh']
           }
         }
       };
@@ -355,7 +355,7 @@ export class CheWorkspace {
         'name': 'ws-machine',
         'attributes': {'memoryLimitBytes': ram},
         'type': 'docker',
-        'agents': ['org.eclipse.che.ws-agent', 'org.eclipse.che.terminal', 'org.eclipse.che.ssh']
+        'agents': ['org.eclipse.che.ws-agent', 'org.eclipse.che.exec', 'org.eclipse.che.terminal', 'org.eclipse.che.ssh']
       };
       defaultEnvironment.machines[devMachine.name] = devMachine;
     } else {