diff --git a/src/components/Inputs/TextInput/TextInput.tsx b/src/components/Inputs/TextInput/TextInput.tsx
index 0beb0d530..43725d965 100644
--- a/src/components/Inputs/TextInput/TextInput.tsx
+++ b/src/components/Inputs/TextInput/TextInput.tsx
@@ -134,8 +134,8 @@ export const TextInput: FC<TextInputProps> = React.forwardRef(
     const ariaInvalid = ariaInvalidProp || mergedStatus === 'error';
     const ariaDescribedBy =
       mergedStatus === 'error'
-        ? ariaDescribedByProp || errorMessageId
-        : undefined;
+        ? [ariaDescribedByProp, errorMessageId].filter(Boolean).join(' ')
+        : ariaDescribedByProp;
 
     // Needed for form error scroll-into-view by id
     const mergedFormItemInput: boolean = isFormItemInput || formItemInput;
diff --git a/src/components/Upload/Upload.tsx b/src/components/Upload/Upload.tsx
index 6884d53c3..9b54e8a92 100644
--- a/src/components/Upload/Upload.tsx
+++ b/src/components/Upload/Upload.tsx
@@ -47,6 +47,8 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
     accept = '',
     acceptedFileTypesText: defaultAcceptedFileTypesText,
     action = '',
+    'aria-describedby': ariaDescribedBy,
+    'aria-labelledby': ariaLabelledBy,
     children,
     classNames,
     configContextProps = {
@@ -577,6 +579,8 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
     );
     const renderButton = (): JSX.Element => (
       <Button
+        aria-describedby={ariaDescribedBy}
+        aria-labelledby={ariaLabelledBy}
         classNames={styles.uploadDropButton}
         configContextProps={configContextProps}
         disabled={mergedDisabled}
@@ -699,7 +703,12 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (
   const renderUploadButton = (
     uploadButtonStyle?: React.CSSProperties
   ): JSX.Element => (
-    <div className={uploadButtonClassNames} style={uploadButtonStyle}>
+    <div
+      aria-describedby={ariaDescribedBy}
+      aria-labelledby={ariaLabelledBy}
+      className={uploadButtonClassNames}
+      style={uploadButtonStyle}
+    >
       <OcUpload {...ocUploadProps} ref={upload} />
     </div>
   );
diff --git a/src/components/Upload/Upload.types.tsx b/src/components/Upload/Upload.types.tsx
index 932a3b64d..c164c31c5 100755
--- a/src/components/Upload/Upload.types.tsx
+++ b/src/components/Upload/Upload.types.tsx
@@ -314,6 +314,10 @@ export interface UploadProps<T = any> extends Pick<OcUploadProps, 'capture'> {
    * Upload URL
    */
   action?: Action;
+
+  'aria-describedby'?: string;
+
+  'aria-labelledby'?: string;
   /**
    * Hook executed before uploading.
    * Uploading will be stopped with false or a rejected Promise returned.