diff --git a/src/components/GeneralInfo/GeneralInformation/GeneralInformation.js b/src/components/GeneralInfo/GeneralInformation/GeneralInformation.js
index b64ca352e..f824cba8f 100644
--- a/src/components/GeneralInfo/GeneralInformation/GeneralInformation.js
+++ b/src/components/GeneralInfo/GeneralInformation/GeneralInformation.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Grid, GridItem, Modal } from '@patternfly/react-core';
 import { SortByDirection } from '@patternfly/react-table';
+import AsyncComponent from '@redhat-cloud-services/frontend-components/AsyncComponent';
 
 import { systemProfile } from '../../../store/actions';
 import InfoTable from '../InfoTable';
@@ -167,6 +168,18 @@ class GeneralInformation extends Component {
                     />
                   </GridItem>
                 )}
+
+                {this.props.showImageDetails && (
+                  <GridItem>
+                    <AsyncComponent
+                      appName="edge"
+                      module="./ImagesInformationCard"
+                      deviceIdProps={
+                        this.props.inventoryId || this.props.entity.id
+                      }
+                    />
+                  </GridItem>
+                )}
               </Grid>
             </GridItem>
             {children}
@@ -235,6 +248,7 @@ GeneralInformation.propTypes = {
   location: PropTypes.any,
   inventoryId: PropTypes.string.isRequired,
   systemProfilePrefetched: PropTypes.bool,
+  showImageDetails: PropTypes.bool,
 };
 GeneralInformation.defaultProps = {
   entity: {},
@@ -247,6 +261,7 @@ GeneralInformation.defaultProps = {
   DataCollectorsCardWrapper: DataCollectorsCard,
   CollectionCardWrapper: false,
   systemProfilePrefetched: false,
+  showImageDetails: false,
 };
 
 const mapStateToProps = ({ entityDetails: { entity } }) => ({
diff --git a/src/components/SystemDetails/GeneralInfo.js b/src/components/SystemDetails/GeneralInfo.js
index 8e345a54b..8b07ab817 100644
--- a/src/components/SystemDetails/GeneralInfo.js
+++ b/src/components/SystemDetails/GeneralInfo.js
@@ -1,10 +1,24 @@
 import React from 'react';
 
 import GeneralInformation from '../GeneralInfo/GeneralInformation';
+import useFeatureFlag from '../../Utilities/useFeatureFlag';
 export { default as TextInputModal } from '../GeneralInfo/TextInputModal';
 
 const GeneralInfoTab = (props) => {
-  return <GeneralInformation {...props} />;
+  const enableEdgeImageDetails = useFeatureFlag(
+    'edgeParity.inventory-system-detail'
+  );
+  const enableEdgeInventoryListDetails = useFeatureFlag(
+    'edgeParity.inventory-list'
+  );
+  return (
+    <GeneralInformation
+      {...props}
+      showImageDetails={
+        enableEdgeImageDetails && enableEdgeInventoryListDetails
+      }
+    />
+  );
 };
 
 export default GeneralInfoTab;