diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx b/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx
index be295f519..d4183e21b 100644
--- a/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx
+++ b/app/docker/containers/components/ContainersDatatable/ContainersDatatable.tsx
@@ -62,10 +62,6 @@ export function ContainersDatatable({
   isHostColumnVisible,
   autoFocusSearch,
 }: ContainerTableProps) {
-
-  console.log("ContainersDatatable:");
-  console.log(dataset);
-
   const { settings, setTableSettings } =
     useTableSettings<ContainersTableSettings>();
   const [searchBarValue, setSearchBarValue] = useSearchBarContext();
diff --git a/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx b/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
index 509f94e28..3f036856e 100644
--- a/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
+++ b/app/docker/containers/components/ContainersDatatable/ContainersDatatableContainer.tsx
@@ -24,7 +24,7 @@ export function ContainersDatatableContainer({ endpoint, ...props }: Props) {
   };
 
   console.log("ContainersDatatableContainer");
-  console.log(props);
+  console.log(endpoint);
 
   return (
     <EnvironmentProvider environment={endpoint}>
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
index 6981201b3..a0b905b19 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatable.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react';
 import {
   useTable,
+    useExpanded,
   useSortBy,
   useFilters,
   useGlobalFilter,
@@ -33,6 +34,7 @@ import { useRowSelect } from 'Portainer/components/datatables/components/useRowS
 import { Checkbox } from 'Portainer/components/form-components/Checkbox';
 import { TableFooter } from 'Portainer/components/datatables/components/TableFooter';
 import { SelectedRowsCount } from 'Portainer/components/datatables/components/SelectedRowsCount';
+import {ContainersDatatableContainer} from "Docker/containers/components/ContainersDatatable/ContainersDatatableContainer";
 
 import {EdgeDeviceTableSettings} from "@/edge/devices/types";
 import {EdgeDevicesDatatableSettings} from "@/edge/devices/components/EdgeDevicesDatatable/EdgeDevicesDatatableSettings";
@@ -101,9 +103,10 @@ export function EdgeDevicesDatatable({
       useFilters,
       useGlobalFilter,
       useSortBy,
+      useExpanded,
       usePagination,
       useRowSelect,
-      useRowSelectColumn
+      useRowSelectColumn,
   );
 
   const debouncedSearchValue = useDebounce(searchBarValue);
@@ -182,13 +185,26 @@ export function EdgeDevicesDatatable({
             prepareRow(row);
             const { key, className, role, style } = row.getRowProps();
             return (
-                <TableRow<Environment>
-                    cells={row.cells}
-                    key={key}
-                    className={className}
-                    role={role}
-                    style={style}
-                />
+                <>
+                    <TableRow<Environment>
+                        cells={row.cells}
+                        key={key}
+                        className={className}
+                        role={role}
+                        style={style}
+                    />
+                    {row.isExpanded && ('This is expanded!!!!')}
+                    {row.isExpanded && (
+                        <ContainersDatatableContainer
+                            endpoint={row.original}
+                            isAddActionVisible={false}
+                            dataset={[]}
+                            onRefresh={async () => {}}
+                            isHostColumnVisible={false}
+                            autoFocusSearch={false}
+                        />
+                    )}
+                </>
             );
           })}
           </tbody>
diff --git a/app/edge/devices/components/EdgeDevicesDatatable/columns/name.tsx b/app/edge/devices/components/EdgeDevicesDatatable/columns/name.tsx
index d803fa0d5..0b4a365c3 100644
--- a/app/edge/devices/components/EdgeDevicesDatatable/columns/name.tsx
+++ b/app/edge/devices/components/EdgeDevicesDatatable/columns/name.tsx
@@ -1,6 +1,6 @@
 import { CellProps, Column, TableInstance } from 'react-table';
-
 import { Environment } from "Portainer/environments/types";
+import {Link} from "Portainer/components/Link";
 
 export const name: Column<Environment> = {
   Header: 'Name',
@@ -15,7 +15,24 @@ export const name: Column<Environment> = {
 
 export function NameCell({
   value: name,
+  row,
 }: CellProps<TableInstance>) {
 
-  return <span>{name}</span>;
+  return (
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      <a {...row.getToggleRowExpandedProps({})} >
+        <i className={`fas ${arrowHelper(row.isExpanded)} space-right`} aria-hidden="true" />
+        <Link to="portainer.endpoints.endpoint" params={{ id: row.original.Id }} title={name}>
+          {name}
+        </Link>
+      </a>
+  );
+
+  function arrowHelper(isExpanded: boolean) {
+    if (isExpanded) {
+      return 'fa-angle-down';
+    }
+    return 'fa-angle-right'
+  }
+
 }