diff --git a/src/ConfigEditor/Auth/auth-method/BasicAuth.tsx b/src/ConfigEditor/Auth/auth-method/BasicAuth.tsx
index f44c9e4..18eb578 100644
--- a/src/ConfigEditor/Auth/auth-method/BasicAuth.tsx
+++ b/src/ConfigEditor/Auth/auth-method/BasicAuth.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { cx, css } from '@emotion/css';
-import { InlineField, Input, PopoverContent } from '@grafana/ui';
-import { SecretInput } from '../common';
+import { InlineField, Input, PopoverContent, SecretInput } from '@grafana/ui';
 import { useCommonStyles } from '../styles';
 
 export type Props = {
diff --git a/src/ConfigEditor/Auth/common/SecretInput.tsx b/src/ConfigEditor/Auth/common/SecretInput.tsx
deleted file mode 100644
index 4005b89..0000000
--- a/src/ConfigEditor/Auth/common/SecretInput.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copy & paste from https://github.com/grafana/grafana/blob/main/packages/grafana-ui/src/components/SecretInput/SecretInput.tsx
- * Available starting from @grafana/ui 9.2
- * Needed, because Auth component is also used in Grafana 8, which doesn't have SecretInput
- */
-
-import * as React from 'react';
-import { HorizontalGroup, Input, Button } from '@grafana/ui';
-
-export type Props = React.ComponentProps<typeof Input> & {
-  /** TRUE if the secret was already configured. (It is needed as often the backend doesn't send back the actual secret, only the information that it was configured) */
-  isConfigured: boolean;
-  /** Called when the user clicks on the "Reset" button in order to clear the secret */
-  onReset: () => void;
-};
-
-export const CONFIGURED_TEXT = 'configured';
-export const RESET_BUTTON_TEXT = 'Reset';
-
-export const SecretInput = ({ isConfigured, onReset, ...props }: Props) => (
-  <HorizontalGroup>
-    {!isConfigured && <Input {...props} type="password" />}
-    {isConfigured && <Input {...props} type="text" disabled={true} value={CONFIGURED_TEXT} />}
-    {isConfigured && (
-      <Button onClick={onReset} variant="secondary">
-        {RESET_BUTTON_TEXT}
-      </Button>
-    )}
-  </HorizontalGroup>
-);
diff --git a/src/ConfigEditor/Auth/common/SecretTextarea.tsx b/src/ConfigEditor/Auth/common/SecretTextarea.tsx
deleted file mode 100644
index eb43201..0000000
--- a/src/ConfigEditor/Auth/common/SecretTextarea.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copy & paste from https://github.com/grafana/grafana/blob/main/packages/grafana-ui/src/components/SecretTextArea/SecretTextArea.tsx
- * Available starting from @grafana/ui 9.2
- * Needed, because Auth component is also used in Grafana 8, which doesn't have SecretTextarea
- */
-
-import { css, cx } from '@emotion/css';
-import * as React from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2, Button, TextArea, HorizontalGroup } from '@grafana/ui';
-
-export type Props = React.ComponentProps<typeof TextArea> & {
-  /** TRUE if the secret was already configured. (It is needed as often the backend doesn't send back the actual secret, only the information that it was configured) */
-  isConfigured: boolean;
-  /** Called when the user clicks on the "Reset" button in order to clear the secret */
-  onReset: () => void;
-};
-
-export const CONFIGURED_TEXT = 'configured';
-export const RESET_BUTTON_TEXT = 'Reset';
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    configuredStyle: css`
-      min-height: ${theme.spacing(theme.components.height.md)};
-      padding-top: ${theme.spacing(0.5) /** Needed to mimic vertically centered text in an input box */};
-      resize: none;
-    `,
-  };
-};
-
-/**
- * Text area that does not disclose an already configured value but lets the user reset the current value and enter a new one.
- * Typically useful for asymmetric cryptography keys.
- */
-export const SecretTextArea = ({ isConfigured, onReset, ...props }: Props) => {
-  const styles = useStyles2(getStyles);
-  return (
-    <HorizontalGroup>
-      {!isConfigured && <TextArea {...props} />}
-      {isConfigured && (
-        <TextArea {...props} rows={1} disabled={true} value={CONFIGURED_TEXT} className={cx(styles.configuredStyle)} />
-      )}
-      {isConfigured && (
-        <Button onClick={onReset} variant="secondary">
-          {RESET_BUTTON_TEXT}
-        </Button>
-      )}
-    </HorizontalGroup>
-  );
-};
diff --git a/src/ConfigEditor/Auth/common/index.ts b/src/ConfigEditor/Auth/common/index.ts
deleted file mode 100644
index ed4a431..0000000
--- a/src/ConfigEditor/Auth/common/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { SecretInput } from './SecretInput';
-export { SecretTextArea } from './SecretTextarea';
diff --git a/src/ConfigEditor/Auth/custom-headers/CustomHeader.tsx b/src/ConfigEditor/Auth/custom-headers/CustomHeader.tsx
index de72d8a..cde4193 100644
--- a/src/ConfigEditor/Auth/custom-headers/CustomHeader.tsx
+++ b/src/ConfigEditor/Auth/custom-headers/CustomHeader.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { css, cx } from '@emotion/css';
-import { InlineFieldRow, InlineField, Input, IconButton, useTheme2 } from '@grafana/ui';
-import { SecretInput } from '../common';
+import { InlineFieldRow, InlineField, Input, IconButton, useTheme2, SecretInput } from '@grafana/ui';
 import type { LocalHeader } from '../types';
 import { useCommonStyles } from '../styles';
 
diff --git a/src/ConfigEditor/Auth/tls/SelfSignedCertificate.tsx b/src/ConfigEditor/Auth/tls/SelfSignedCertificate.tsx
index f02f26a..f8ddd98 100644
--- a/src/ConfigEditor/Auth/tls/SelfSignedCertificate.tsx
+++ b/src/ConfigEditor/Auth/tls/SelfSignedCertificate.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { cx } from '@emotion/css';
-import { InlineField } from '@grafana/ui';
-import { SecretTextArea } from '../common';
+import { InlineField, SecretTextArea } from '@grafana/ui';
 import { TLSSettingsSection } from './TLSSettingsSection';
 import { useCommonStyles } from '../styles';
 
diff --git a/src/ConfigEditor/Auth/tls/TLSClientAuth.tsx b/src/ConfigEditor/Auth/tls/TLSClientAuth.tsx
index 467f550..1a1b6ce 100644
--- a/src/ConfigEditor/Auth/tls/TLSClientAuth.tsx
+++ b/src/ConfigEditor/Auth/tls/TLSClientAuth.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { cx } from '@emotion/css';
-import { InlineField, Input } from '@grafana/ui';
-import { SecretTextArea } from '../common';
+import { InlineField, Input, SecretTextArea } from '@grafana/ui';
 import { TLSSettingsSection } from './TLSSettingsSection';
 import { useCommonStyles } from '../styles';
 
diff --git a/src/QueryEditor/Space.tsx b/src/QueryEditor/Space.tsx
index 33cf9e4..298bb9f 100644
--- a/src/QueryEditor/Space.tsx
+++ b/src/QueryEditor/Space.tsx
@@ -10,6 +10,9 @@ export interface SpaceProps {
   layout?: 'block' | 'inline';
 }
 
+/**
+ * @deprecated use the Space component from @grafana/ui instead. Available starting from @grafana/ui@10.4.0
+ */
 export const Space = (props: SpaceProps) => {
   const styles = useStyles2(useCallback((theme) => getStyles(theme, props), [props]));
 
diff --git a/src/QueryEditor/Stack.tsx b/src/QueryEditor/Stack.tsx
index 834a777..ef12166 100644
--- a/src/QueryEditor/Stack.tsx
+++ b/src/QueryEditor/Stack.tsx
@@ -12,6 +12,9 @@ interface StackProps {
   flexGrow?: CSSProperties['flexGrow'];
 }
 
+/**
+ * @deprecated use the Stack component from @grafana/ui instead. Available starting from @grafana/ui@10.2.3
+ */
 export const Stack = ({ children, ...props }: React.PropsWithChildren<StackProps>) => {
   const styles = useStyles2(useCallback((theme) => getStyles(theme, props), [props]));