diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/PublicationState/PublicationState.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/PublicationState.js
similarity index 74%
rename from packages/core/admin/admin/src/content-manager/components/DynamicTable/PublicationState/PublicationState.js
rename to packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/PublicationState.js
index 70a849ebff..596cf694d6 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/PublicationState/PublicationState.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/PublicationState.js
@@ -1,28 +1,23 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
-import styled from 'styled-components';
 import { Status, Typography } from '@strapi/design-system';
 
-import { getTrad } from '../../../utils';
-
-const StyledStatus = styled(Status)`
-  width: min-content;
-`;
+import { getTrad } from '../../../../utils';
 
 export function PublicationState({ isPublished }) {
   const { formatMessage } = useIntl();
   const variant = isPublished ? 'success' : 'secondary';
 
   return (
-    <StyledStatus showBullet={false} variant={variant} size="S">
+    <Status showBullet={false} variant={variant} size="S" width="min-content">
       <Typography fontWeight="bold" textColor={`${variant}700`}>
         {formatMessage({
           id: getTrad(`containers.List.${isPublished ? 'published' : 'draft'}`),
           defaultMessage: isPublished ? 'Published' : 'Draft',
         })}
       </Typography>
-    </StyledStatus>
+    </Status>
   );
 }
 
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/PublicationState/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/index.js
similarity index 100%
rename from packages/core/admin/admin/src/content-manager/components/DynamicTable/PublicationState/index.js
rename to packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/index.js
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/PublicationState/tests/PublicationState.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/tests/PublicationState.test.js
similarity index 100%
rename from packages/core/admin/admin/src/content-manager/components/DynamicTable/PublicationState/tests/PublicationState.test.js
rename to packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/PublicationState/tests/PublicationState.test.js
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ReviewWorkflowsStage/ReviewWorkflowsStage.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStage.js
similarity index 100%
rename from packages/core/admin/admin/src/content-manager/components/DynamicTable/ReviewWorkflowsStage/ReviewWorkflowsStage.js
rename to packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStage.js
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ReviewWorkflowsStage/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/index.js
similarity index 100%
rename from packages/core/admin/admin/src/content-manager/components/DynamicTable/ReviewWorkflowsStage/index.js
rename to packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/index.js
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js
similarity index 100%
rename from packages/core/admin/admin/src/content-manager/components/DynamicTable/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js
rename to packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js
index c1d994fda6..9cdbed71d8 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/index.js
@@ -10,8 +10,8 @@ import { getTrad } from '../../utils';
 import TableRows from './TableRows';
 import ConfirmDialogDeleteAll from './ConfirmDialogDeleteAll';
 import ConfirmDialogDelete from './ConfirmDialogDelete';
-import { PublicationState } from './PublicationState/PublicationState';
-import { ReviewWorkflowsStage } from './ReviewWorkflowsStage';
+import { PublicationState } from './CellContent/PublicationState/PublicationState';
+import { ReviewWorkflowsStage } from './CellContent/ReviewWorkflowsStage';
 
 const DynamicTable = ({
   canCreate,
@@ -90,7 +90,7 @@ const DynamicTable = ({
           sortable: false,
         },
         cellFormatter({ strapi_reviewWorkflows_stage }) {
-          return <ReviewWorkflowsStage {...strapi_reviewWorkflows_stage} />;
+          return <ReviewWorkflowsStage name={strapi_reviewWorkflows_stage.name} />;
         },
       });
     }