diff --git a/web/src/assets/styles/index.scss b/web/src/assets/styles/index.scss
index 176648a1a8..c271ff2fb2 100644
--- a/web/src/assets/styles/index.scss
+++ b/web/src/assets/styles/index.scss
@@ -356,6 +356,11 @@ label.pf-m-disabled + .pf-v6-c-check__description {
   --pf-v6-c-form__group--m-action--MarginBlockStart: var(--pf-t--global--spacer--md);
 }
 
+.pf-v6-c-list.pf-m-inline {
+  --pf-v6-c-list--m-inline--RowGap: var(--pf-t--global--spacer--sm);
+  --pf-v6-c-list--m-inline--ColumnGap: var(--pf-t--global--spacer--md);
+}
+
 // Some utilities not found at PF
 .w-14ch {
   inline-size: 14ch;
diff --git a/web/src/components/questions/UnsupportedAutoYaST.tsx b/web/src/components/questions/UnsupportedAutoYaST.tsx
index b162137f26..6136b27d64 100644
--- a/web/src/components/questions/UnsupportedAutoYaST.tsx
+++ b/web/src/components/questions/UnsupportedAutoYaST.tsx
@@ -21,12 +21,20 @@
  */
 
 import React from "react";
-import { Flex, Grid, GridItem, Content } from "@patternfly/react-core";
+import {
+  Content,
+  Grid,
+  GridItem,
+  List,
+  ListItem,
+  ListVariant,
+  Stack,
+} from "@patternfly/react-core";
 import { AnswerCallback, Question } from "~/types/questions";
 import { Page, Popup } from "~/components/core";
-import { _ } from "~/i18n";
 import QuestionActions from "~/components/questions/QuestionActions";
 import { sprintf } from "sprintf-js";
+import { _ } from "~/i18n";
 
 const UnsupportedElements = ({
   elements,
@@ -43,14 +51,12 @@ const UnsupportedElements = ({
 
   return (
     <GridItem sm={12} lg={6}>
-      <Page.Section title={title} description={description}>
-        <Flex gap={{ default: "gapSm" }} aria-role="list">
+      <Page.Section title={title} description={description} hasHeaderDivider>
+        <List variant={ListVariant.inline}>
           {elements.map((e: string, i: number) => (
-            <span key={i} aria-role="listitem">
-              {e}
-            </span>
+            <ListItem key={i}>{e}</ListItem>
           ))}
-        </Flex>
+        </List>
       </Page.Section>
     </GridItem>
   );
@@ -73,30 +79,32 @@ export default function UnsupportedAutoYaST({
 
   return (
     <Popup isOpen title={_("Unsupported AutoYaST elements")}>
-      <Content>{_("Some of the elements in your AutoYaST profile are not supported.")}</Content>
-      <Grid hasGutter>
-        <UnsupportedElements
-          elements={planned}
-          title={
-            /** TRANSLATORS: %s is replaced by the quantity of not implemented elements */
-            sprintf(_("Not implemented yet (%s)"), planned.length)
-          }
-          description={_("Will be supported in a future version.")}
-        />
-        <UnsupportedElements
-          elements={unsupported}
-          title={
-            /** TRANSLATORS: %s is replaced by the quantity of not supported elements */
-            sprintf(_("Not supported (%s)"), unsupported.length)
-          }
-          description={_("No support is planned.")}
-        />
-      </Grid>
-      <Content>
-        {_(
-          'If you want to disable this check, please specify "agama.ay_check=0" at kernel\'s command-line',
-        )}
-      </Content>
+      <Stack hasGutter>
+        <Content>{_("Some of the elements in your AutoYaST profile are not supported.")}</Content>
+        <Grid hasGutter>
+          <UnsupportedElements
+            elements={planned}
+            title={
+              /** TRANSLATORS: %s is replaced by the quantity of not implemented elements */
+              sprintf(_("Not implemented yet (%s)"), planned.length)
+            }
+            description={_("Will be supported in a future version.")}
+          />
+          <UnsupportedElements
+            elements={unsupported}
+            title={
+              /** TRANSLATORS: %s is replaced by the quantity of not supported elements */
+              sprintf(_("Not supported (%s)"), unsupported.length)
+            }
+            description={_("No support is planned.")}
+          />
+        </Grid>
+        <Content component="small">
+          {_(
+            'If you want to disable this check, please specify "agama.ay_check=0" at kernel\'s command-line',
+          )}
+        </Content>
+      </Stack>
       <Popup.Actions>
         <QuestionActions
           actions={question.options}