diff --git a/package-lock.json b/package-lock.json
index 422cda3b..86e3f174 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,6 +86,16 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular": {
       "version": "18.2.6",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.6.tgz",
@@ -243,6 +253,16 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/sass": {
       "version": "1.77.6",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
@@ -286,6 +306,16 @@
         "webpack-dev-server": "^5.0.2"
       }
     },
+    "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/core": {
       "version": "18.2.6",
       "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.6.tgz",
@@ -313,6 +343,16 @@
         }
       }
     },
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/schematics": {
       "version": "18.2.6",
       "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.6.tgz",
@@ -331,6 +371,16 @@
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular/animations": {
       "version": "18.2.6",
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.6.tgz",
@@ -11511,9 +11561,10 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
       }
diff --git a/src/app/containers/service/container-service.service.ts b/src/app/containers/service/container-service.service.ts
index ae02f2f9..9e8bc0e4 100644
--- a/src/app/containers/service/container-service.service.ts
+++ b/src/app/containers/service/container-service.service.ts
@@ -36,14 +36,14 @@ export class ContainerServiceService extends BaseService {
 
   getContainersByAccountId(accountId: number): Observable<any> {
     this.setLoading(true);
-    return this.http.get<any>(`${this.baseUrl}/container/by-account/${accountId}`).pipe(
+    return this.http.get<any>(`${this.baseUrl}/account/${accountId}/containers`).pipe(
       finalize(() => this.setLoading(false))
     );
   }
 
   getContainersByGroupId(groupId: number): Observable<any> {
     this.setLoading(true);
-    return this.http.get<any>(`${this.baseUrl}/container/${groupId}/containers`).pipe(
+    return this.http.get<any>(`${this.baseUrl}/group/${groupId}/containers`).pipe(
       finalize(() => this.setLoading(false))
     );
   }
diff --git a/src/app/dashboard/service/dashboard.service.ts b/src/app/dashboard/service/dashboard.service.ts
index 7938bc48..d884c735 100644
--- a/src/app/dashboard/service/dashboard.service.ts
+++ b/src/app/dashboard/service/dashboard.service.ts
@@ -16,24 +16,19 @@ export class DashboardService extends BaseService {
 
 
   getGroups(accountId: number): Observable<any> {
-    return this.http.get(`${this.baseUrl}/${accountId}/groups`);
+    return this.http.get(`${this.baseUrl}/account/${accountId}/groups`);
   }
 
 
   getContainers(accountId: number): Observable<any> {
-    return this.http.get(`${this.baseUrl}/container/by-account/${accountId}`);
+    return this.http.get(`${this.baseUrl}/account/${accountId}/containers`);
   }
   getUsers(accountId: number): Observable<any> {
-    return this.http.get(`${this.baseUrl}/user/workers/${accountId}`);
+    return this.http.get(`${this.baseUrl}/account/${accountId}/users`);
   }
 
   getGroupsByAccount(accountId: number): Observable<Facility[]> {
-    return this.http.post<Facility[]>(`${this.baseUrl}/group/by-account`,
-      { accountId: accountId },
-      {
-        headers: { 'Accept': 'application/json', 'Content-Type': 'application/json' }
-      }
-    );
+    return this.http.get<Facility[]>(`${this.baseUrl}/account/${accountId}/groups`);
   }
 
 }