diff --git a/pkg/client/public/locales/en/translation.json b/pkg/client/public/locales/en/translation.json
index fb39d5cd25..3b2fa1ebb7 100644
--- a/pkg/client/public/locales/en/translation.json
+++ b/pkg/client/public/locales/en/translation.json
@@ -110,6 +110,7 @@
         "appNotAssesedTitle": "Assessment has not been completed",
         "appNotAssessedBody": "In order to review an application it must be assessed first. Please assess the application",
         "assessmentStakeholderHeader": "Select the stakeholder(s) or stakeholder group(s) associated with this assessment.",
+        "binaryPackaging": "Packaging will default to JAR if left empty.",
         "continueConfirmation": "Yes, continue",
         "copyAssessmentAndReviewBody": "Some of the selected target applications have an in-progress or complete assessment/review. By continuing, the existing assessment(s)/review(s) will be replaced by the copied assessment/review. Do you wish to continue?",
         "copyAssessmentAndReviewQuestion": "Copy assessment and review?",
diff --git a/pkg/client/public/locales/es/translation.json b/pkg/client/public/locales/es/translation.json
index b671820456..a7f775d443 100644
--- a/pkg/client/public/locales/es/translation.json
+++ b/pkg/client/public/locales/es/translation.json
@@ -110,6 +110,7 @@
         "appNotAssesedTitle": "La evaluación no se ha completado",
         "appNotAssessedBody": "Para revisar una aplicación, esta debe de ser evaluada primero. Por favor evalúe la aplicación",
         "assessmentStakeholderHeader": "Seleccione a los interesados o grupo de interesados asociados a esta evaluación.",
+        "binaryPackaging": "El valor de packaging será JAR for defecto si se dejase vacío.",
         "continueConfirmation": "Si, continuar",
         "copyAssessmentAndReviewBody": "Algunas de las aplicaciones de destino seleccionadas tienen una evaluación/revisión en curso o completa. Al continuar, las evaluaciones/revisiones existentes serán reemplazadas por la evaluación/revisión copiada. ¿Desea continuar?",
         "copyAssessmentAndReviewQuestion": "¿Copiar evaluación y revisión?",
diff --git a/pkg/client/src/app/App.tsx b/pkg/client/src/app/App.tsx
index 4e72095561..a6ea821f3a 100644
--- a/pkg/client/src/app/App.tsx
+++ b/pkg/client/src/app/App.tsx
@@ -15,6 +15,7 @@ import { ConfirmDialogContainer } from "./shared/containers/confirm-dialog-conta
 import { BulkCopyNotificationsContainer } from "./shared/containers/bulk-copy-notifications-container";
 import { useFetchCookie } from "./queries/cookies";
 import keycloak from "./keycloak";
+import "./app.css";
 
 const App: React.FC = () => {
   // Automatically updates cookie
diff --git a/pkg/client/src/app/app.css b/pkg/client/src/app/app.css
new file mode 100644
index 0000000000..8a82ad2a39
--- /dev/null
+++ b/pkg/client/src/app/app.css
@@ -0,0 +1,49 @@
+.pf-c-icon {
+  --pf-c-icon--FontSize: var(--pf-global--FontSize--md);
+  --pf-c-icon--Color: #72767b;
+
+  --pf-c-icon--m-sm--FontSize: var(--pf-global--icon--FontSize--sm);
+  --pf-c-icon--m-md--FontSize: var(--pf-global--icon--FontSize--md);
+  --pf-c-icon--m-lg--FontSize: var(--pf-global--icon--FontSize--lg);
+  --pf-c-icon--m-xl--FontSize: var(--pf-global--icon--FontSize--xl);
+  --pf-c-icon--m-2xl--FontSize: var(--pf-global--icon--FontSize--2xl);
+
+  --pf-c-icon--m-info--Color: var(--pf-global--primary-color--100);
+  --pf-c-icon--m-success--Color: var(--pf-global--success-color--100);
+  --pf-c-icon--m-warning--Color: var(--pf-global--warning-color--100);
+  --pf-c-icon--m-danger--Color: var(--pf-global--danger-color--100);
+
+  font-size: var(--pf-c-icon--FontSize);
+  color: var(--pf-c-icon--Color);
+}
+.pf-c-icon .pf-m-sm {
+  font-size: var(--pf-c-icon--m-sm--FontSize);
+}
+
+.pf-c-icon .pf-m-lg {
+  font-size: var(--pf-c-icon--m-lg--FontSize);
+}
+
+.pf-c-icon .pf-m-xl {
+  font-size: var(--pf-c-icon--m-xl--FontSize);
+}
+
+.pf-c-icon .pf-m-default {
+  color: var(--pf-c-icon--Color);
+}
+
+.pf-c-icon.pf-m-info {
+  color: var(--pf-c-icon--m-info--Color);
+}
+
+.pf-c-icon .pf-m-success {
+  color: var(--pf-c-icon--m-success--Color);
+}
+
+.pf-c-icon .pf-m-warning {
+  color: var(--pf-c-icon--m-warning--Color);
+}
+
+.pf-c-icon .pf-m-danger {
+  color: var(--pf-c-icon--m-danger--Color);
+}
diff --git a/pkg/client/src/app/pages/applications/components/application-form/application-form.css b/pkg/client/src/app/pages/applications/components/application-form/application-form.css
index 77fdaa9705..a202d99427 100644
--- a/pkg/client/src/app/pages/applications/components/application-form/application-form.css
+++ b/pkg/client/src/app/pages/applications/components/application-form/application-form.css
@@ -2,3 +2,9 @@
   --pf-c-expandable-section__toggle--Color: #000;
   --pf-c-expandable-section__toggle--m-expanded--Color: #000;
 }
+
+.popover.pf-c-popover {
+  --pf-c-popover__content--BackgroundColor: #000;
+  --pf-c-popover__arrow--BackgroundColor: #000;
+  color: #fff;
+}
diff --git a/pkg/client/src/app/pages/applications/components/application-form/application-form.tsx b/pkg/client/src/app/pages/applications/components/application-form/application-form.tsx
index 4d2e24b89c..02321b0aaf 100644
--- a/pkg/client/src/app/pages/applications/components/application-form/application-form.tsx
+++ b/pkg/client/src/app/pages/applications/components/application-form/application-form.tsx
@@ -11,9 +11,14 @@ import {
   ExpandableSection,
   Form,
   FormGroup,
+  Popover,
+  PopoverPosition,
   TextArea,
   TextInput,
 } from "@patternfly/react-core";
+import QuestionCircleIcon from "@patternfly/react-icons/dist/js/icons/question-circle-icon";
+
+import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 
 import {
   SingleSelectFetchOptionValueFormikField,
@@ -40,13 +45,12 @@ import {
   toITagDropdownOptionWithValue,
   toOptionLike,
 } from "@app/utils/model-utils";
-
-import "./application-form.css";
 import {
   useCreateApplicationMutation,
   useFetchApplications,
   useUpdateApplicationMutation,
 } from "@app/queries/applications";
+import "./application-form.css";
 export interface FormValues {
   name: string;
   description: string;
@@ -156,16 +160,12 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
     switch (fieldName) {
       case "group":
         return fieldList[0] || "";
-        break;
       case "artifact":
         return fieldList[1] || "";
-        break;
       case "version":
         return fieldList[2] || "";
-        break;
       case "packaging":
         return fieldList[3] || "";
-        break;
       default:
         return "";
     }
@@ -425,138 +425,142 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
           onToggle={() => setBasicExpanded(!isBasicExpanded)}
           isExpanded={isBasicExpanded}
         >
-          <FormGroup
-            label={t("terms.name")}
-            fieldId="name"
-            isRequired={true}
-            validated={getValidatedFromError(formik.errors.name)}
-            helperTextInvalid={formik.errors.name}
-          >
-            <TextInput
-              type="text"
-              name="name"
-              aria-label="name"
-              aria-describedby="name"
+          <Form>
+            <FormGroup
+              label={t("terms.name")}
+              fieldId="name"
               isRequired={true}
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.name}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.name,
-                formik.touched.name
-              )}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.description")}
-            fieldId="description"
-            isRequired={false}
-            validated={getValidatedFromError(formik.errors.description)}
-            helperTextInvalid={formik.errors.description}
-          >
-            <TextInput
-              type="text"
-              name="description"
-              aria-label="description"
-              aria-describedby="description"
+              validated={getValidatedFromError(formik.errors.name)}
+              helperTextInvalid={formik.errors.name}
+            >
+              <TextInput
+                type="text"
+                name="name"
+                aria-label="name"
+                aria-describedby="name"
+                isRequired={true}
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.name}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.name,
+                  formik.touched.name
+                )}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.description")}
+              fieldId="description"
+              isRequired={false}
+              validated={getValidatedFromError(formik.errors.description)}
+              helperTextInvalid={formik.errors.description}
+            >
+              <TextInput
+                type="text"
+                name="description"
+                aria-label="description"
+                aria-describedby="description"
+                isRequired={true}
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.description}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.description,
+                  formik.touched.description
+                )}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.businessService")}
+              fieldId="businessService"
               isRequired={true}
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.description}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.description,
-                formik.touched.description
-              )}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.businessService")}
-            fieldId="businessService"
-            isRequired={true}
-            validated={getValidatedFromError(formik.errors.businessService)}
-            helperTextInvalid={
-              formik.errors.businessService && "This field is required"
-            }
-          >
-            <SingleSelectFetchOptionValueFormikField<IBusinessServiceDropdown>
-              fieldConfig={{
-                name: "businessService",
-              }}
-              selectConfig={{
-                variant: "typeahead",
-                "aria-label": "business-service",
-                "aria-describedby": "business-service",
-                typeAheadAriaLabel: "business-service",
-                toggleAriaLabel: "business-service",
-                clearSelectionsAriaLabel: "business-service",
-                removeSelectionAriaLabel: "business-service",
-                placeholderText: t("composed.selectOne", {
-                  what: t("terms.businessService").toLowerCase(),
-                }),
-                menuAppendTo: () => document.body,
-                maxHeight: DEFAULT_SELECT_MAX_HEIGHT,
-                isFetching: isFetchingBusinessServices,
-                fetchError: fetchErrorBusinessServices,
-              }}
-              options={(businessServices || []).map(toIBusinessServiceDropdown)}
-              toOptionWithValue={toIBusinessServiceDropdownOptionWithValue}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.tags")}
-            fieldId="tags"
-            isRequired={false}
-            validated={getValidatedFromError(formik.errors.tags)}
-            helperTextInvalid={formik.errors.tags}
-          >
-            <MultiSelectFetchOptionValueFormikField<ITagDropdown>
-              fieldConfig={{
-                name: "tags",
-              }}
-              selectConfig={{
-                variant: "typeaheadmulti",
-                "aria-label": "tags",
-                "aria-describedby": "tags",
-                typeAheadAriaLabel: "tags",
-                toggleAriaLabel: "tags",
-                clearSelectionsAriaLabel: "tags",
-                removeSelectionAriaLabel: "tags",
-                // t("terms.tag(s)")
-                placeholderText: t("composed.selectOne", {
-                  what: t("terms.tag(s)").toLowerCase(),
-                }),
-                menuAppendTo: () => document.body,
-                maxHeight: DEFAULT_SELECT_MAX_HEIGHT,
-                isFetching: isFetchingTagTypes,
-                fetchError: fetchErrorTagTypes,
-              }}
-              options={(tags || []).map(toITagDropdown)}
-              toOptionWithValue={toITagDropdownOptionWithValue}
-              isEqual={isIModelEqual}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.comments")}
-            fieldId="comments"
-            isRequired={false}
-            validated={getValidatedFromError(formik.errors.comments)}
-            helperTextInvalid={formik.errors.comments}
-          >
-            <TextArea
-              type="text"
-              name="comments"
-              aria-label="comments"
-              aria-describedby="comments"
+              validated={getValidatedFromError(formik.errors.businessService)}
+              helperTextInvalid={
+                formik.errors.businessService && "This field is required"
+              }
+            >
+              <SingleSelectFetchOptionValueFormikField<IBusinessServiceDropdown>
+                fieldConfig={{
+                  name: "businessService",
+                }}
+                selectConfig={{
+                  variant: "typeahead",
+                  "aria-label": "business-service",
+                  "aria-describedby": "business-service",
+                  typeAheadAriaLabel: "business-service",
+                  toggleAriaLabel: "business-service",
+                  clearSelectionsAriaLabel: "business-service",
+                  removeSelectionAriaLabel: "business-service",
+                  placeholderText: t("composed.selectOne", {
+                    what: t("terms.businessService").toLowerCase(),
+                  }),
+                  menuAppendTo: () => document.body,
+                  maxHeight: DEFAULT_SELECT_MAX_HEIGHT,
+                  isFetching: isFetchingBusinessServices,
+                  fetchError: fetchErrorBusinessServices,
+                }}
+                options={(businessServices || []).map(
+                  toIBusinessServiceDropdown
+                )}
+                toOptionWithValue={toIBusinessServiceDropdownOptionWithValue}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.tags")}
+              fieldId="tags"
               isRequired={false}
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.comments}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.comments,
-                formik.touched.comments
-              )}
-            />
-          </FormGroup>
+              validated={getValidatedFromError(formik.errors.tags)}
+              helperTextInvalid={formik.errors.tags}
+            >
+              <MultiSelectFetchOptionValueFormikField<ITagDropdown>
+                fieldConfig={{
+                  name: "tags",
+                }}
+                selectConfig={{
+                  variant: "typeaheadmulti",
+                  "aria-label": "tags",
+                  "aria-describedby": "tags",
+                  typeAheadAriaLabel: "tags",
+                  toggleAriaLabel: "tags",
+                  clearSelectionsAriaLabel: "tags",
+                  removeSelectionAriaLabel: "tags",
+                  // t("terms.tag(s)")
+                  placeholderText: t("composed.selectOne", {
+                    what: t("terms.tag(s)").toLowerCase(),
+                  }),
+                  menuAppendTo: () => document.body,
+                  maxHeight: DEFAULT_SELECT_MAX_HEIGHT,
+                  isFetching: isFetchingTagTypes,
+                  fetchError: fetchErrorTagTypes,
+                }}
+                options={(tags || []).map(toITagDropdown)}
+                toOptionWithValue={toITagDropdownOptionWithValue}
+                isEqual={isIModelEqual}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.comments")}
+              fieldId="comments"
+              isRequired={false}
+              validated={getValidatedFromError(formik.errors.comments)}
+              helperTextInvalid={formik.errors.comments}
+            >
+              <TextArea
+                type="text"
+                name="comments"
+                aria-label="comments"
+                aria-describedby="comments"
+                isRequired={false}
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.comments}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.comments,
+                  formik.touched.comments
+                )}
+              />
+            </FormGroup>
+          </Form>
         </ExpandableSection>
         <ExpandableSection
           toggleText={t("terms.sourceCode")}
@@ -564,85 +568,87 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
           onToggle={() => setSourceCodeExpanded(!isSourceCodeExpanded)}
           isExpanded={isSourceCodeExpanded}
         >
-          <FormGroup
-            label="Repository type"
-            fieldId="kind"
-            isRequired={true}
-            validated={getValidatedFromError(formik.errors.kind)}
-            helperTextInvalid={formik.errors.kind}
-          >
-            <SimpleSelect
-              aria-label={formik.values.kind}
-              value={
-                formik.values.kind
-                  ? toOptionLike(formik.values.kind, kindOptions)
-                  : undefined
-              }
-              options={kindOptions}
-              onChange={(selection) => {
-                const selectionValue = selection as OptionWithValue<any>;
-                formik.setFieldValue("kind", selectionValue.value);
-              }}
-            />
-          </FormGroup>
-
-          <FormGroup
-            label={t("terms.sourceRepo")}
-            fieldId="sourceRepository"
-            validated={getValidatedFromError(formik.errors.sourceRepository)}
-            helperTextInvalid={"Must be a valid URL."}
-          >
-            <TextInput
-              type="text"
-              name="sourceRepository"
-              aria-label="Source Repository"
-              aria-describedby="Source Repository URL"
+          <Form>
+            <FormGroup
+              label="Repository type"
+              fieldId="kind"
               isRequired={true}
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.sourceRepository}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.sourceBranch")}
-            fieldId="branch"
-            validated={getValidatedFromError(formik.errors.branch)}
-            helperTextInvalid={formik.errors.branch}
-          >
-            <TextInput
-              type="text"
-              name="branch"
-              aria-label="Source Repository Branch"
-              aria-describedby="Source Repository Branch"
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.branch}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.branch,
-                formik.touched.branch
-              )}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.sourceRootPath")}
-            fieldId="rootPath"
-            validated={getValidatedFromError(formik.errors.rootPath)}
-            helperTextInvalid={formik.errors.rootPath}
-          >
-            <TextInput
-              type="text"
-              name="rootPath"
-              aria-label="Source Repository Root Path"
-              aria-describedby="Source Repository Root Path"
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.rootPath}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.rootPath,
-                formik.touched.rootPath
-              )}
-            />
-          </FormGroup>
+              validated={getValidatedFromError(formik.errors.kind)}
+              helperTextInvalid={formik.errors.kind}
+            >
+              <SimpleSelect
+                aria-label={formik.values.kind}
+                value={
+                  formik.values.kind
+                    ? toOptionLike(formik.values.kind, kindOptions)
+                    : undefined
+                }
+                options={kindOptions}
+                onChange={(selection) => {
+                  const selectionValue = selection as OptionWithValue<any>;
+                  formik.setFieldValue("kind", selectionValue.value);
+                }}
+              />
+            </FormGroup>
+
+            <FormGroup
+              label={t("terms.sourceRepo")}
+              fieldId="sourceRepository"
+              validated={getValidatedFromError(formik.errors.sourceRepository)}
+              helperTextInvalid={"Must be a valid URL."}
+            >
+              <TextInput
+                type="text"
+                name="sourceRepository"
+                aria-label="Source Repository"
+                aria-describedby="Source Repository URL"
+                isRequired={true}
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.sourceRepository}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.sourceBranch")}
+              fieldId="branch"
+              validated={getValidatedFromError(formik.errors.branch)}
+              helperTextInvalid={formik.errors.branch}
+            >
+              <TextInput
+                type="text"
+                name="branch"
+                aria-label="Source Repository Branch"
+                aria-describedby="Source Repository Branch"
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.branch}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.branch,
+                  formik.touched.branch
+                )}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.sourceRootPath")}
+              fieldId="rootPath"
+              validated={getValidatedFromError(formik.errors.rootPath)}
+              helperTextInvalid={formik.errors.rootPath}
+            >
+              <TextInput
+                type="text"
+                name="rootPath"
+                aria-label="Source Repository Root Path"
+                aria-describedby="Source Repository Root Path"
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.rootPath}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.rootPath,
+                  formik.touched.rootPath
+                )}
+              />
+            </FormGroup>
+          </Form>
         </ExpandableSection>
         <ExpandableSection
           toggleText={t("terms.binary")}
@@ -650,86 +656,100 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
           onToggle={() => setBinaryExpanded(!isBinaryExpanded)}
           isExpanded={isBinaryExpanded}
         >
-          <FormGroup
-            label={t("terms.binaryGroup")}
-            fieldId="group"
-            validated={getValidatedFromError(formik.errors.group)}
-            helperTextInvalid={formik.errors.group}
-          >
-            <TextInput
-              type="text"
-              name="group"
-              aria-label="Binary Group"
-              aria-describedby="Binary Group"
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.group}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.group,
-                formik.touched.group
-              )}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.binaryArtifact")}
-            fieldId="artifact"
-            validated={getValidatedFromError(formik.errors.artifact)}
-            helperTextInvalid={formik.errors.artifact}
-          >
-            <TextInput
-              type="text"
-              name="artifact"
-              aria-label="Binary Artifact"
-              aria-describedby="Binary Artifact"
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.artifact}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.artifact,
-                formik.touched.artifact
-              )}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.binaryVersion")}
-            fieldId="version"
-            validated={getValidatedFromError(formik.errors.version)}
-            helperTextInvalid={formik.errors.version}
-          >
-            <TextInput
-              type="text"
-              name="version"
-              aria-label="Binary version"
-              aria-describedby="Binary version"
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.version}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.version,
-                formik.touched.version
-              )}
-            />
-          </FormGroup>
-          <FormGroup
-            label={t("terms.binaryPackaging")}
-            fieldId="packaging"
-            validated={getValidatedFromError(formik.errors.packaging)}
-            helperTextInvalid={formik.errors.packaging}
-          >
-            <TextInput
-              type="text"
-              name="packaging"
-              aria-label="Binary Packaging"
-              aria-describedby="Binary Packaging"
-              onChange={onChangeField}
-              onBlur={formik.handleBlur}
-              value={formik.values.packaging}
-              validated={getValidatedFromErrorTouched(
-                formik.errors.packaging,
-                formik.touched.packaging
-              )}
-            />
-          </FormGroup>
+          <Form>
+            <FormGroup
+              label={t("terms.binaryGroup")}
+              fieldId="group"
+              validated={getValidatedFromError(formik.errors.group)}
+              helperTextInvalid={formik.errors.group}
+            >
+              <TextInput
+                type="text"
+                name="group"
+                aria-label="Binary Group"
+                aria-describedby="Binary Group"
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.group}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.group,
+                  formik.touched.group
+                )}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.binaryArtifact")}
+              fieldId="artifact"
+              validated={getValidatedFromError(formik.errors.artifact)}
+              helperTextInvalid={formik.errors.artifact}
+            >
+              <TextInput
+                type="text"
+                name="artifact"
+                aria-label="Binary Artifact"
+                aria-describedby="Binary Artifact"
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.artifact}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.artifact,
+                  formik.touched.artifact
+                )}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.binaryVersion")}
+              fieldId="version"
+              validated={getValidatedFromError(formik.errors.version)}
+              helperTextInvalid={formik.errors.version}
+            >
+              <TextInput
+                type="text"
+                name="version"
+                aria-label="Binary version"
+                aria-describedby="Binary version"
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.version}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.version,
+                  formik.touched.version
+                )}
+              />
+            </FormGroup>
+            <FormGroup
+              label={t("terms.binaryPackaging")}
+              labelIcon={
+                <Popover
+                  position={PopoverPosition.top}
+                  aria-label="binary-packaging-details"
+                  bodyContent={t("message.binaryPackaging")}
+                  className="popover"
+                >
+                  <span className="pf-c-icon pf-m-info">
+                    <QuestionCircleIcon />
+                  </span>
+                </Popover>
+              }
+              fieldId="packaging"
+              validated={getValidatedFromError(formik.errors.packaging)}
+              helperTextInvalid={formik.errors.packaging}
+            >
+              <TextInput
+                type="text"
+                name="packaging"
+                aria-label="Binary Packaging"
+                aria-describedby="Binary Packaging"
+                onChange={onChangeField}
+                onBlur={formik.handleBlur}
+                value={formik.values.packaging}
+                validated={getValidatedFromErrorTouched(
+                  formik.errors.packaging,
+                  formik.touched.packaging
+                )}
+              />
+            </FormGroup>
+          </Form>
         </ExpandableSection>
         <ActionGroup>
           <Button