diff --git a/src/components/Contribute/Knowledge/index.tsx b/src/components/Contribute/Knowledge/index.tsx
index 3dce32b8..a06f1d31 100644
--- a/src/components/Contribute/Knowledge/index.tsx
+++ b/src/components/Contribute/Knowledge/index.tsx
@@ -33,8 +33,6 @@ import { Button } from '@patternfly/react-core/dist/esm/components/Button/Button
 import { useRouter } from 'next/navigation';
 import { autoFillKnowledgeFields } from './AutoFill';
 import { Spinner } from '@patternfly/react-core/dist/esm/components/Spinner';
-
-import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
 import YamlFileUpload from '../YamlFileUpload';
 
 export interface QuestionAndAnswerPair {
@@ -508,8 +506,9 @@ export const KnowledgeForm: React.FunctionComponent<KnowledgeFormProps> = ({ kno
             Auto-Fill
           </Button>
         )}
-        <YamlFileUpload isKnowledgeForm={true} onYamlUploadKnowledgeFillForm={onYamlUploadKnowledgeFillForm} />
         <Form className="form-k">
+          <YamlFileUpload isKnowledgeForm={true} onYamlUploadKnowledgeFillForm={onYamlUploadKnowledgeFillForm} />
+
           <AuthorInformation
             formType={FormType.Knowledge}
             reset={reset}
diff --git a/src/components/Contribute/Skill/index.tsx b/src/components/Contribute/Skill/index.tsx
index d4a6af07..740410f2 100644
--- a/src/components/Contribute/Skill/index.tsx
+++ b/src/components/Contribute/Skill/index.tsx
@@ -388,9 +388,9 @@ export const SkillForm: React.FunctionComponent<SkillFormProps> = ({ skillEditFo
             Auto-Fill
           </Button>
         )}
-        <YamlFileUpload isKnowledgeForm={false} onYamlUploadSkillsFillForm={onYamlUploadSkillsFillForm} />
 
         <Form className="form-s">
+          <YamlFileUpload isKnowledgeForm={false} onYamlUploadSkillsFillForm={onYamlUploadSkillsFillForm} />
           <AuthorInformation
             formType={FormType.Knowledge}
             reset={reset}
diff --git a/src/components/Contribute/YamlFileUpload.tsx b/src/components/Contribute/YamlFileUpload.tsx
index 9a85a1df..9704a82d 100644
--- a/src/components/Contribute/YamlFileUpload.tsx
+++ b/src/components/Contribute/YamlFileUpload.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { FileUpload } from '@patternfly/react-core/dist/dynamic/components/FileUpload';
-import { Form, FormFieldGroupExpandable, FormFieldGroupHeader } from '@patternfly/react-core/dist/dynamic/components/Form';
+import { FormFieldGroupExpandable, FormFieldGroupHeader } from '@patternfly/react-core/dist/dynamic/components/Form';
 import { FormGroup } from '@patternfly/react-core/dist/dynamic/components/Form';
 import { FormHelperText } from '@patternfly/react-core/dist/dynamic/components/Form';
 import { HelperText } from '@patternfly/react-core/dist/dynamic/components/HelperText';