diff --git a/src/app/services/docker.service.ts b/src/app/services/docker.service.ts
index 3e6b06d8..eaf9b26d 100644
--- a/src/app/services/docker.service.ts
+++ b/src/app/services/docker.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { DockerImage } from '../models/docker/docker-image';
 import { Server } from '../models/server';
@@ -18,7 +19,7 @@ export class DockerService {
   }
 
   getImages(server: Server): Observable<DockerImage[]> {
-    return this.httpServer.get<DockerImage[]>(server, '/compute/docker/images') as Observable<DockerImage[]>;
+    return this.httpServer.get<DockerImage[]>(server, `/computes/${environment.compute_id}/docker/images`) as Observable<DockerImage[]>;
   }
 
   addTemplate(server: Server, dockerTemplate: any): Observable<any> {
diff --git a/src/app/services/virtual-box.service.ts b/src/app/services/virtual-box.service.ts
index 88981d20..878f4bbb 100644
--- a/src/app/services/virtual-box.service.ts
+++ b/src/app/services/virtual-box.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { Server } from '../models/server';
 import { VirtualBoxTemplate } from '../models/templates/virtualbox-template';
@@ -37,6 +38,6 @@ export class VirtualBoxService {
   }
 
   getVirtualMachines(server: Server): Observable<VirtualBoxVm[]> {
-    return this.httpServer.get<VirtualBoxVm[]>(server, '/compute/virtualbox/vms') as Observable<VirtualBoxVm[]>;
+    return this.httpServer.get<VirtualBoxVm[]>(server, `/computes/${environment.compute_id}/virtualbox/vms`) as Observable<VirtualBoxVm[]>;
   }
 }
diff --git a/src/app/services/vmware.service.ts b/src/app/services/vmware.service.ts
index 0816afba..b2fea1de 100644
--- a/src/app/services/vmware.service.ts
+++ b/src/app/services/vmware.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { Server } from '../models/server';
 import { VmwareTemplate } from '../models/templates/vmware-template';
@@ -30,6 +31,6 @@ export class VmwareService {
   }
 
   getVirtualMachines(server: Server): Observable<VmwareVm[]> {
-    return this.httpServer.get<VmwareVm[]>(server, '/compute/vmware/vms') as Observable<VmwareVm[]>;
+    return this.httpServer.get<VmwareVm[]>(server, `/computes/${environment.vm_compute_id}/vmware/vms`) as Observable<VmwareVm[]>;
   }
 }
diff --git a/src/environments/environment.electron.prod.ts b/src/environments/environment.electron.prod.ts
index 8ab128f7..e2db7605 100644
--- a/src/environments/environment.electron.prod.ts
+++ b/src/environments/environment.electron.prod.ts
@@ -2,5 +2,7 @@ export const environment = {
   solarputty_download_url: '',
   production: true,
   electron: true,
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
diff --git a/src/environments/environment.electron.ts b/src/environments/environment.electron.ts
index 49d53902..2fdc6d84 100644
--- a/src/environments/environment.electron.ts
+++ b/src/environments/environment.electron.ts
@@ -2,5 +2,7 @@ export const environment = {
   production: false,
   electron: true,
   solarputty_download_url: '',
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
diff --git a/src/environments/environment.github.prod.ts b/src/environments/environment.github.prod.ts
index 558a4e58..4cf191a7 100644
--- a/src/environments/environment.github.prod.ts
+++ b/src/environments/environment.github.prod.ts
@@ -3,5 +3,7 @@ export const environment = {
   electron: false,
   githubio: true,
   solarputty_download_url: '',
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 8e7d5498..25eca5d5 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,5 +3,7 @@ export const environment = {
   electron: false,
   githubio: false,
   solarputty_download_url: '',
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 69ce3604..1e335911 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,7 +7,9 @@ export const environment = {
   electron: false,
   githubio: false,
   solarputty_download_url: '',
-  current_version:'v3'
+  current_version:'v3',
+  compute_id:'local',
+  vm_compute_id:'vm'
 };
 
 /*