diff --git a/public/app/features/invites/SignupInvited.tsx b/public/app/features/invites/SignupInvited.tsx
index 53ffa453c72..bea01970007 100644
--- a/public/app/features/invites/SignupInvited.tsx
+++ b/public/app/features/invites/SignupInvited.tsx
@@ -2,7 +2,8 @@ import React, { useState } from 'react';
 import { useAsync } from 'react-use';
 
 import { getBackendSrv } from '@grafana/runtime';
-import { Button, Field, Form, Input } from '@grafana/ui';
+import { Button, Field, Input } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { Page } from 'app/core/components/Page/Page';
 import { getConfig } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
diff --git a/public/app/features/org/OrgProfile.tsx b/public/app/features/org/OrgProfile.tsx
index 8988d9cbd1c..cf65e9c3532 100644
--- a/public/app/features/org/OrgProfile.tsx
+++ b/public/app/features/org/OrgProfile.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
-import { Input, Field, FieldSet, Button, Form } from '@grafana/ui';
+import { Input, Field, FieldSet, Button } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction } from 'app/types';
 
diff --git a/public/app/features/profile/UserProfileEditForm.tsx b/public/app/features/profile/UserProfileEditForm.tsx
index 371a0a0f578..dcde61b1199 100644
--- a/public/app/features/profile/UserProfileEditForm.tsx
+++ b/public/app/features/profile/UserProfileEditForm.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
-import { Button, Field, FieldSet, Form, Icon, Input, Tooltip } from '@grafana/ui';
+import { Button, Field, FieldSet, Icon, Input, Tooltip } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import config from 'app/core/config';
 import { t, Trans } from 'app/core/internationalization';
 import { UserDTO } from 'app/types';
diff --git a/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx b/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
index 725969145f0..3d3f0ef3a74 100644
--- a/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
@@ -1,7 +1,8 @@
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { getBackendSrv, locationService } from '@grafana/runtime';
-import { Form, Button, Input, Field, FieldSet } from '@grafana/ui';
+import { Button, Input, Field, FieldSet } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { Page } from 'app/core/components/Page/Page';
 import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
 import { fetchRoleOptions, updateUserRoles } from 'app/core/components/RolePicker/api';
diff --git a/public/app/features/storage/CreateNewFolderModal.tsx b/public/app/features/storage/CreateNewFolderModal.tsx
index a4ee74c080a..2ff4a887823 100644
--- a/public/app/features/storage/CreateNewFolderModal.tsx
+++ b/public/app/features/storage/CreateNewFolderModal.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { SubmitHandler, Validate } from 'react-hook-form';
 
-import { Button, Field, Form, Input, Modal } from '@grafana/ui';
+import { Button, Field, Input, Modal } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 
 type FormModel = { folderName: string };
 
diff --git a/public/app/features/support-bundles/SupportBundlesCreate.tsx b/public/app/features/support-bundles/SupportBundlesCreate.tsx
index 74c87f68053..11746981714 100644
--- a/public/app/features/support-bundles/SupportBundlesCreate.tsx
+++ b/public/app/features/support-bundles/SupportBundlesCreate.tsx
@@ -1,7 +1,8 @@
 import React, { useEffect } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { Form, Button, Field, Checkbox, LinkButton, HorizontalGroup, Alert } from '@grafana/ui';
+import { Button, Field, Checkbox, LinkButton, Stack, Alert } from '@grafana/ui';
+import { Form } from 'app/core/components/Form/Form';
 import { Page } from 'app/core/components/Page/Page';
 import { StoreState } from 'app/types';
 
@@ -60,7 +61,7 @@ export const SupportBundlesCreateUnconnected = ({
         {createBundleError && <Alert title={createBundleError} severity="error" />}
         {!!collectors.length && (
           <Form defaultValues={values} onSubmit={onSubmit} validateOn="onSubmit">
-            {({ register, errors }) => {
+            {({ register }) => {
               return (
                 <>
                   {[...collectors]
@@ -79,12 +80,12 @@ export const SupportBundlesCreateUnconnected = ({
                         </Field>
                       );
                     })}
-                  <HorizontalGroup>
+                  <Stack>
                     <Button type="submit">Create</Button>
                     <LinkButton href="/support-bundles" variant="secondary">
                       Cancel
                     </LinkButton>
-                  </HorizontalGroup>
+                  </Stack>
                 </>
               );
             }}