diff --git a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx
index 2683e218ec..0edd03452a 100644
--- a/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx
+++ b/packages/web/src/components/ai-attribution-modal/AiAttributionDropdown.tsx
@@ -47,7 +47,10 @@ const selectSearchResults = createSelector(getSearchResults, (results) => {
   return { items }
 })
 
-type AiAttributionDropdownProps = SelectProps
+type AiAttributionDropdownProps = SelectProps & {
+  error?: string | false
+  helperText?: string | false
+}
 
 export const AiAttributionDropdown = (props: AiAttributionDropdownProps) => {
   const dispatch = useDispatch()
@@ -69,6 +72,7 @@ export const AiAttributionDropdown = (props: AiAttributionDropdownProps) => {
       size='large'
       input={searchInput}
       onSearch={handleSearch}
+      layout='vertical'
       {...props}
     />
   )
diff --git a/packages/web/src/components/ai-attribution-modal/DropdownInput.js b/packages/web/src/components/ai-attribution-modal/DropdownInput.js
index 4b2bf43713..ac33176994 100644
--- a/packages/web/src/components/ai-attribution-modal/DropdownInput.js
+++ b/packages/web/src/components/ai-attribution-modal/DropdownInput.js
@@ -5,6 +5,7 @@ import cn from 'classnames'
 import PropTypes from 'prop-types'
 
 import { ReactComponent as IconCaretDown } from 'assets/img/iconCaretDown.svg'
+import { HelperText } from 'components/data-entry/HelperText'
 
 import styles from './DropdownInput.module.css'
 
@@ -37,6 +38,7 @@ class DropdownInput extends Component {
       labelStyle,
       dropdownStyle,
       dropdownInputStyle,
+      helperText,
       layout,
       size,
       variant,
@@ -155,6 +157,9 @@ class DropdownInput extends Component {
           </Select>
           <IconCaretDown className={styles.arrow} />
         </div>
+        {helperText ? (
+          <HelperText error={error}>{helperText}</HelperText>
+        ) : null}
       </div>
     )
   }
diff --git a/packages/web/src/components/data-entry/ContextualMenu.tsx b/packages/web/src/components/data-entry/ContextualMenu.tsx
index 3a1717f4b1..8b2f33efbd 100644
--- a/packages/web/src/components/data-entry/ContextualMenu.tsx
+++ b/packages/web/src/components/data-entry/ContextualMenu.tsx
@@ -164,9 +164,9 @@ export const ContextualMenu = <
   const handleSubmit = useCallback(
     (values: FormValues, helpers: FormikHelpers<FormValues>) => {
       onSubmit(values, helpers)
-      toggleMenu()
+      if (!error) toggleMenu()
     },
-    [onSubmit, toggleMenu]
+    [error, onSubmit, toggleMenu]
   )
 
   return (
diff --git a/packages/web/src/components/data-entry/HelperText.tsx b/packages/web/src/components/data-entry/HelperText.tsx
index ba94cf7808..7416d45306 100644
--- a/packages/web/src/components/data-entry/HelperText.tsx
+++ b/packages/web/src/components/data-entry/HelperText.tsx
@@ -14,7 +14,6 @@ export const HelperText = (props: HelperTextProps) => {
   return (
     <div className={styles.root}>
       <Text
-        variant='body'
         size='xSmall'
         strength='default'
         // @ts-expect-error
diff --git a/packages/web/src/pages/upload-page/components/EditPageNew.tsx b/packages/web/src/pages/upload-page/components/EditPageNew.tsx
index a7c01ae9ee..97cdbcaa68 100644
--- a/packages/web/src/pages/upload-page/components/EditPageNew.tsx
+++ b/packages/web/src/pages/upload-page/components/EditPageNew.tsx
@@ -1,5 +1,13 @@
 import { useCallback, useMemo } from 'react'
 
+import {
+  Genre,
+  HashId,
+  Mood,
+  PremiumConditionsFollowUserId,
+  PremiumConditionsNFTCollection,
+  PremiumConditionsTipUserId
+} from '@audius/sdk'
 import {
   HarmonyButton,
   HarmonyButtonType,
@@ -9,7 +17,8 @@ import {
 import cn from 'classnames'
 import { Form, Formik, FormikProps, useField } from 'formik'
 import moment from 'moment'
-import * as Yup from 'yup'
+import { z } from 'zod'
+import { toFormikValidationSchema } from 'zod-formik-adapter'
 
 import { ReactComponent as IconCaretLeft } from 'assets/img/iconCaretLeft.svg'
 import layoutStyles from 'components/layout/layout.module.css'
@@ -32,7 +41,11 @@ const messages = {
   multiTrackCount: (index: number, total: number) =>
     `TRACK ${index} of ${total}`,
   prev: 'Prev',
-  next: 'Next Track'
+  next: 'Next Track',
+  titleRequiredError: 'Your track must have a name',
+  artworkRequiredError: 'Artwork is required',
+  genreRequiredError: 'Genre is required',
+  invalidReleaseDateError: 'Release date should no be in the future'
 }
 
 type EditPageProps = {
@@ -41,19 +54,107 @@ type EditPageProps = {
   onContinue: () => void
 }
 
-const EditTrackSchema = Yup.object().shape({
-  title: Yup.string().required(messages.titleError),
-  artwork: Yup.object({
-    url: Yup.string()
-  }).required(messages.artworkError),
-  trackArtwork: Yup.string().nullable(),
-  genre: Yup.string().required(messages.genreError),
-  description: Yup.string().max(1000).nullable()
-})
+// TODO: KJ - Need to update the schema in sdk and then import here
+const createUploadTrackMetadataSchema = () =>
+  z.object({
+    aiAttributionUserId: z.optional(HashId),
+    description: z.optional(z.string().max(1000)),
+    download: z.optional(
+      z
+        .object({
+          cid: z.string(),
+          isDownloadable: z.boolean(),
+          requiresFollow: z.boolean()
+        })
+        .strict()
+        .nullable()
+    ),
+    fieldVisibility: z.optional(
+      z.object({
+        mood: z.optional(z.boolean()),
+        tags: z.optional(z.boolean()),
+        genre: z.optional(z.boolean()),
+        share: z.optional(z.boolean()),
+        playCount: z.optional(z.boolean()),
+        remixes: z.optional(z.boolean())
+      })
+    ),
+    genre: z
+      .enum(Object.values(Genre) as [Genre, ...Genre[]])
+      .nullable()
+      .refine((val) => val !== null, {
+        message: messages.genreRequiredError
+      }),
+    isPremium: z.optional(z.boolean()),
+    isrc: z.optional(z.string().nullable()),
+    isUnlisted: z.optional(z.boolean()),
+    iswc: z.optional(z.string().nullable()),
+    license: z.optional(z.string().nullable()),
+    mood: z
+      .optional(z.enum(Object.values(Mood) as [Mood, ...Mood[]]))
+      .nullable(),
+    premiumConditions: z.optional(
+      z.union([
+        PremiumConditionsNFTCollection,
+        PremiumConditionsFollowUserId,
+        PremiumConditionsTipUserId
+      ])
+    ),
+    releaseDate: z.optional(
+      z.date().max(new Date(), { message: messages.invalidReleaseDateError })
+    ),
+    remixOf: z.optional(
+      z
+        .object({
+          tracks: z
+            .array(
+              z.object({
+                parentTrackId: HashId
+              })
+            )
+            .min(1)
+        })
+        .strict()
+    ),
+    tags: z.optional(z.string()),
+    title: z.string({
+      required_error: messages.titleRequiredError
+    }),
+    previewStartSeconds: z.optional(z.number()),
+    audioUploadId: z.optional(z.string()),
+    previewCid: z.optional(z.string())
+  })
+
+const createTrackMetadataSchema = () => {
+  return createUploadTrackMetadataSchema()
+    .merge(
+      z.object({
+        artwork: z
+          .object({
+            url: z.string()
+          })
+          .nullable()
+      })
+    )
+    .refine((form) => form.artwork !== null, {
+      message: messages.artworkRequiredError,
+      path: ['artwork']
+    })
+}
+
+export type TrackMetadataValues = z.input<
+  ReturnType<typeof createTrackMetadataSchema>
+>
+
+const EditFormValidationSchema = () =>
+  z.object({
+    trackMetadatas: z.array(createTrackMetadataSchema())
+  })
 
 export const EditPageNew = (props: EditPageProps) => {
   const { tracks, setTracks, onContinue } = props
 
+  // @ts-ignore - Slight differences in the sdk vs common track metadata types
   const initialValues: TrackEditFormValues = useMemo(
     () => ({
       trackMetadatasIndex: 0,
@@ -61,7 +162,7 @@ export const EditPageNew = (props: EditPageProps) => {
         ...track.metadata,
         artwork: null,
         description: '',
-        releaseDate: moment().startOf('day'),
+        releaseDate: new Date(moment().startOf('day').toString()),
         tags: '',
         field_visibility: {
           ...defaultHiddenFields,
@@ -93,7 +194,8 @@ export const EditPageNew = (props: EditPageProps) => {
     <Formik<TrackEditFormValues>
       initialValues={initialValues}
       onSubmit={onSubmit}
-      validationSchema={EditTrackSchema}
+      // @ts-ignore - There are slight mismatches between the sdk and common track metadata types
+      validationSchema={toFormikValidationSchema(EditFormValidationSchema())}
     >
       {TrackEditForm}
     </Formik>
diff --git a/packages/web/src/pages/upload-page/fields/ModalField.tsx b/packages/web/src/pages/upload-page/fields/ModalField.tsx
index a8ad15e1fd..aa65666f94 100644
--- a/packages/web/src/pages/upload-page/fields/ModalField.tsx
+++ b/packages/web/src/pages/upload-page/fields/ModalField.tsx
@@ -1,8 +1,8 @@
-import React, { PropsWithChildren, ReactElement, useState } from 'react'
+import { PropsWithChildren, ReactElement, useState } from 'react'
 
 import {
-  Button,
-  ButtonType,
+  HarmonyButton,
+  HarmonyButtonType,
   IconCaretRight,
   Modal,
   ModalContent,
@@ -11,6 +11,7 @@ import {
   ModalTitle
 } from '@audius/stems'
 import { useFormikContext } from 'formik'
+import { isEmpty } from 'lodash'
 
 import styles from './ModalField.module.css'
 
@@ -27,7 +28,7 @@ type ModalFieldProps = PropsWithChildren & {
 export const ModalField = (props: ModalFieldProps) => {
   const { children, title, icon, preview } = props
   const [isModalOpen, setIsModalOpen] = useState(false)
-  const { submitForm, resetForm } = useFormikContext()
+  const { submitForm, resetForm, errors } = useFormikContext()
 
   const open = () => setIsModalOpen(true)
   const close = () => setIsModalOpen(false)
@@ -45,14 +46,14 @@ export const ModalField = (props: ModalFieldProps) => {
       </ModalHeader>
       <ModalContent>{children}</ModalContent>
       <ModalFooter>
-        <Button
-          type={ButtonType.PRIMARY}
+        <HarmonyButton
+          variant={HarmonyButtonType.PRIMARY}
           text={messages.save}
           onClick={() => {
             submitForm()
-            close()
+            isEmpty(errors) && close()
           }}
-          buttonType='submit'
+          type='submit'
         />
       </ModalFooter>
     </Modal>
diff --git a/packages/web/src/pages/upload-page/fields/ReleaseDateField.tsx b/packages/web/src/pages/upload-page/fields/ReleaseDateField.tsx
index 8c2209a327..bfdd27b6a7 100644
--- a/packages/web/src/pages/upload-page/fields/ReleaseDateField.tsx
+++ b/packages/web/src/pages/upload-page/fields/ReleaseDateField.tsx
@@ -37,7 +37,9 @@ export const ReleaseDateField = () => {
 
   const onSubmit = useCallback(
     (values: ReleaseDateFormValues) => {
-      setValue(values[RELEASE_DATE])
+      const date = new Date(values[RELEASE_DATE].toString())
+      // @ts-ignore - There are slight differences in the sdk and common track metadata types
+      setValue(date)
     },
     [setValue]
   )
diff --git a/packages/web/src/pages/upload-page/fields/TrackMetadataFields.module.css b/packages/web/src/pages/upload-page/fields/TrackMetadataFields.module.css
index f6f31a3e80..fb92da42e9 100644
--- a/packages/web/src/pages/upload-page/fields/TrackMetadataFields.module.css
+++ b/packages/web/src/pages/upload-page/fields/TrackMetadataFields.module.css
@@ -12,23 +12,28 @@
   flex: 1 auto;
   min-width: 335px;
 }
+
 .fields > div {
   margin-bottom: var(--unit-4);
 }
+
 .fields > div.description > .textArea > textarea {
   min-height: 90px;
 }
+
 .fields > div.description {
   margin-bottom: var(--unit-4);
 }
 
 .categorization {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
 }
+
 .categorization > div {
   flex: 1 auto;
 }
+
 .categorization > div:first-child {
   margin-right: var(--unit-2);
 }
diff --git a/packages/web/src/pages/upload-page/forms/AttributionModalForm.module.css b/packages/web/src/pages/upload-page/forms/AttributionModalForm.module.css
index ccc922f02d..a2b11cfce6 100644
--- a/packages/web/src/pages/upload-page/forms/AttributionModalForm.module.css
+++ b/packages/web/src/pages/upload-page/forms/AttributionModalForm.module.css
@@ -31,3 +31,8 @@
 .licenseIcons {
   gap: 6px;
 }
+
+.textFieldContainer {
+  flex: 1 1 0;
+  align-self: flex-start;
+}
diff --git a/packages/web/src/pages/upload-page/forms/AttributionModalForm.tsx b/packages/web/src/pages/upload-page/forms/AttributionModalForm.tsx
index 3c4abadd64..7c4490a5e0 100644
--- a/packages/web/src/pages/upload-page/forms/AttributionModalForm.tsx
+++ b/packages/web/src/pages/upload-page/forms/AttributionModalForm.tsx
@@ -1,15 +1,23 @@
 import { useCallback, useMemo } from 'react'
 
-import { Nullable, creativeCommons } from '@audius/common'
+import {
+  Nullable,
+  creativeCommons,
+  encodeHashId,
+  decodeHashId
+} from '@audius/common'
 import { SegmentedControl } from '@audius/stems'
 import cn from 'classnames'
 import { Formik, useField } from 'formik'
 import { get, set } from 'lodash'
+import { z } from 'zod'
+import { toFormikValidationSchema } from 'zod-formik-adapter'
 
 import { ReactComponent as IconCreativeCommons } from 'assets/img/iconCreativeCommons.svg'
 import { AiAttributionDropdown } from 'components/ai-attribution-modal/AiAttributionDropdown'
-import { InputV2, InputV2Variant } from 'components/data-entry/InputV2'
+import { InputV2Variant } from 'components/data-entry/InputV2'
 import { Divider } from 'components/divider'
+import { TextField } from 'components/form-fields'
 import layoutStyles from 'components/layout/layout.module.css'
 import { Text } from 'components/typography'
 
@@ -30,15 +38,18 @@ const messages = {
     header: 'Mark this track as AI generated',
     description:
       'If your AI generated track was trained on an existing Audius artist, you can give them credit here. Only users who have opted-in will appear in this list.',
-    placeholder: 'Search for Users'
+    placeholder: 'Search for Users',
+    requiredError: 'Valid user must be selected'
   },
   isrc: {
     header: 'ISRC',
-    placeholder: 'CC-XXX-YY-NNNNN'
+    placeholder: 'CC-XXX-YY-NNNNN',
+    validError: 'Must be valid ISRC format'
   },
   iswc: {
     header: 'ISWC',
-    placeholder: 'T-345246800-1'
+    placeholder: 'T-345246800-1',
+    validError: 'Must be valid ISWC format'
   },
   licenseType: 'License Type',
   allowAttribution: {
@@ -67,6 +78,7 @@ const messages = {
 
 const IS_AI_ATTRIBUTED = 'isAiAttribution'
 const AI_USER_ID = 'ai_attribution_user_id'
+const AI_USER_NUM_ID = 'ai_attribution_user_num_id'
 const ISRC = 'isrc'
 const ISWC = 'iswc'
 const LICENSE_TYPE = 'licenseType'
@@ -93,19 +105,39 @@ const derivativeWorksValues = [
   { key: null, text: messages.derivativeWorks.options.null }
 ]
 
-type AttributionFormValues = {
-  [IS_AI_ATTRIBUTED]: boolean
-  [AI_USER_ID]?: number
-  [ISRC]: string
-  [ISWC]: string
-  [ALLOW_ATTRIBUTION]: boolean
-  [COMMERCIAL_USE]: boolean
-  [DERIVATIVE_WORKS]: Nullable<boolean>
-}
+const isrcRegex = /^[A-Z]{2}-[A-Z\d]{3}-\d{2}-\d{5}$/i
+const iswcRegex = /^T-\d{9}-\d$/i
+
+const AttributionFormSchema = z
+  .object({
+    [IS_AI_ATTRIBUTED]: z.optional(z.boolean()),
+    [AI_USER_ID]: z.optional(z.string().nullable()),
+    [AI_USER_NUM_ID]: z.optional(z.number().nullable()),
+    [ISRC]: z.optional(z.string().nullable()),
+    [ISWC]: z.optional(z.string().nullable()),
+    [ALLOW_ATTRIBUTION]: z.optional(z.boolean()),
+    [COMMERCIAL_USE]: z.optional(z.boolean()),
+    [DERIVATIVE_WORKS]: z.optional(z.boolean().nullable())
+  })
+  .refine((form) => !form[IS_AI_ATTRIBUTED] || form[AI_USER_ID], {
+    message: messages.aiGenerated.requiredError,
+    path: [AI_USER_ID]
+  })
+  .refine((form) => !form[ISRC] || isrcRegex.test(form[ISRC]), {
+    message: messages.isrc.validError,
+    path: [ISRC]
+  })
+  .refine((form) => !form[ISWC] || iswcRegex.test(form[ISWC]), {
+    message: messages.iswc.validError,
+    path: [ISWC]
+  })
+
+export type AttributionFormValues = z.input<typeof AttributionFormSchema>
 
 export const AttributionModalForm = () => {
-  const [{ value: aiUserId }, , { setValue: setAiUserId }] =
-    useTrackField<SingleTrackEditValues[typeof AI_USER_ID]>(AI_USER_ID)
+  const [{ value: aiUserId }, , { setValue: setAiUserId }] = useTrackField<
+    string | undefined
+  >(AI_USER_ID)
   const [{ value: isrcValue }, , { setValue: setIsrc }] =
     useTrackField<SingleTrackEditValues[typeof ISRC]>(ISRC)
   const [{ value: iswcValue }, , { setValue: setIswc }] =
@@ -126,6 +158,11 @@ export const AttributionModalForm = () => {
   const initialValues = useMemo(() => {
     const initialValues = {}
     set(initialValues, AI_USER_ID, aiUserId)
+    set(
+      initialValues,
+      AI_USER_NUM_ID,
+      aiUserId ? decodeHashId(aiUserId) : undefined
+    )
     if (aiUserId) {
       set(initialValues, IS_AI_ATTRIBUTED, true)
     }
@@ -147,22 +184,28 @@ export const AttributionModalForm = () => {
   const onSubmit = useCallback(
     (values: AttributionFormValues) => {
       if (get(values, IS_AI_ATTRIBUTED)) {
-        setAiUserId(get(values, AI_USER_ID))
+        setAiUserId(get(values, AI_USER_ID) ?? aiUserId)
       } else {
         setAiUserId(undefined)
       }
-      setIsrc(get(values, ISRC))
-      setIswc(get(values, ISWC))
-      setAllowAttribution(get(values, ALLOW_ATTRIBUTION))
+      setIsrc(get(values, ISRC) ?? isrcValue)
+      setIswc(get(values, ISWC) ?? iswcValue)
+      setAllowAttribution(get(values, ALLOW_ATTRIBUTION) ?? allowAttribution)
       if (get(values, ALLOW_ATTRIBUTION)) {
-        setCommercialUse(get(values, COMMERCIAL_USE))
-        setDerivateWorks(get(values, DERIVATIVE_WORKS))
+        setCommercialUse(get(values, COMMERCIAL_USE) ?? commercialUse)
+        setDerivateWorks(get(values, DERIVATIVE_WORKS) ?? derivativeWorks)
       } else {
         setCommercialUse(false)
         setDerivateWorks(false)
       }
     },
     [
+      aiUserId,
+      allowAttribution,
+      commercialUse,
+      derivativeWorks,
+      isrcValue,
+      iswcValue,
       setAiUserId,
       setAllowAttribution,
       setCommercialUse,
@@ -185,11 +228,12 @@ export const AttributionModalForm = () => {
     <Formik<AttributionFormValues>
       initialValues={initialValues}
       onSubmit={onSubmit}
+      validationSchema={toFormikValidationSchema(AttributionFormSchema)}
       enableReinitialize
     >
       <ModalField
         title={messages.title}
-        icon={<IconCreativeCommons className={styles.titleIcon} />}
+        icon={<IconCreativeCommons />}
         preview={preview}
       >
         <AttributionModalFields />
@@ -199,9 +243,13 @@ export const AttributionModalForm = () => {
 }
 
 const AttributionModalFields = () => {
-  const [aiUserIdField, , { setValue: setAiUserId }] = useField({
-    name: AI_USER_ID,
-    type: 'select'
+  const [aiUserIdField, aiUserHelperFields, { setValue: setAiUserId }] =
+    useField({
+      name: AI_USER_ID,
+      type: 'select'
+    })
+  const [aiUserNumIdField, , { setValue: setAiUserNumId }] = useField({
+    name: AI_USER_NUM_ID
   })
   const [isrcField] = useField(ISRC)
   const [iswcField] = useField(ISWC)
@@ -225,6 +273,9 @@ const AttributionModalFields = () => {
     derivativeWorks
   )
 
+  const dropdownHasError =
+    aiUserHelperFields.touched && aiUserHelperFields.error
+
   return (
     <div className={cn(layoutStyles.col, layoutStyles.gap4)}>
       <SwitchRowField
@@ -234,9 +285,14 @@ const AttributionModalFields = () => {
       >
         <AiAttributionDropdown
           {...aiUserIdField}
-          onSelect={(value: AttributionFormValues[typeof AI_USER_ID]) =>
-            setAiUserId(value)
-          }
+          {...aiUserHelperFields}
+          error={dropdownHasError}
+          helperText={dropdownHasError && aiUserHelperFields.error}
+          value={aiUserNumIdField.value}
+          onSelect={(value: SingleTrackEditValues[typeof AI_USER_ID]) => {
+            setAiUserId(value ? encodeHashId(value) : null)
+            setAiUserNumId(value ?? null)
+          }}
         />
       </SwitchRowField>
       <Divider />
@@ -245,18 +301,22 @@ const AttributionModalFields = () => {
           {`${messages.isrc.header} / ${messages.iswc.header}`}
         </Text>
         <span className={cn(layoutStyles.row, layoutStyles.gap6)}>
-          <InputV2
-            {...isrcField}
-            variant={InputV2Variant.ELEVATED_PLACEHOLDER}
-            label={messages.isrc.header}
-            placeholder={messages.isrc.placeholder}
-          />
-          <InputV2
-            {...iswcField}
-            variant={InputV2Variant.ELEVATED_PLACEHOLDER}
-            label={messages.iswc.header}
-            placeholder={messages.iswc.placeholder}
-          />
+          <div className={styles.textFieldContainer}>
+            <TextField
+              {...isrcField}
+              variant={InputV2Variant.ELEVATED_PLACEHOLDER}
+              label={messages.isrc.header}
+              placeholder={messages.isrc.placeholder}
+            />
+          </div>
+          <div className={styles.textFieldContainer}>
+            <TextField
+              {...iswcField}
+              variant={InputV2Variant.ELEVATED_PLACEHOLDER}
+              label={messages.iswc.header}
+              placeholder={messages.iswc.placeholder}
+            />
+          </div>
         </span>
       </div>
       <Divider />
diff --git a/packages/web/src/pages/upload-page/forms/RemixModalForm.tsx b/packages/web/src/pages/upload-page/forms/RemixModalForm.tsx
index aeaa3f16ca..4cfe38bdb0 100644
--- a/packages/web/src/pages/upload-page/forms/RemixModalForm.tsx
+++ b/packages/web/src/pages/upload-page/forms/RemixModalForm.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import {
   Track,
@@ -10,20 +10,20 @@ import {
   useGetTrackByPermalink,
   SquareSizes,
   accountSelectors,
-  FieldVisibility
+  FieldVisibility,
+  encodeHashId
 } from '@audius/common'
 import { Formik, useField } from 'formik'
 import { get, set } from 'lodash'
 import { useSelector } from 'react-redux'
+import { z } from 'zod'
+import { toFormikValidationSchema } from 'zod-formik-adapter'
 
 import { ReactComponent as IconRemix } from 'assets/img/iconRemixGray.svg'
-import {
-  InputV2,
-  InputV2Size,
-  InputV2Variant
-} from 'components/data-entry/InputV2'
+import { InputV2Size, InputV2Variant } from 'components/data-entry/InputV2'
 import { Divider } from 'components/divider'
 import DynamicImage from 'components/dynamic-image/DynamicImage'
+import { TextField } from 'components/form-fields'
 import { Text } from 'components/typography'
 import UserBadges from 'components/user-badges/UserBadges'
 import { useTrackCoverArt } from 'hooks/useTrackCoverArt'
@@ -53,7 +53,8 @@ const messages = {
     description:
       "Paste the original Audius track link if yours is a remix. Your remix will typically appear on the original track's page.",
     linkLabel: 'Link to Remix'
-  }
+  },
+  remixLinkError: 'Must provide valid remix link'
 }
 
 export type RemixOfField = Nullable<{ tracks: { parent_track_id: ID }[] }>
@@ -64,12 +65,21 @@ export const SHOW_REMIXES = `field_visibility.remixes`
 
 const IS_REMIX = 'is_remix'
 const REMIX_LINK = 'remix_of_link'
+const IS_VALID_REMIX_LINK = 'is_valid_remix_link'
 
-export type RemixFormValues = {
-  [SHOW_REMIXES]: boolean
-  [IS_REMIX]: boolean
-  [REMIX_LINK]: string | null
-}
+const RemixFormSchema = z
+  .object({
+    [SHOW_REMIXES]: z.optional(z.boolean()),
+    [IS_REMIX]: z.boolean(),
+    [REMIX_LINK]: z.optional(z.string()),
+    [IS_VALID_REMIX_LINK]: z.boolean()
+  })
+  .refine((form) => !form[IS_REMIX] || form[IS_VALID_REMIX_LINK], {
+    message: messages.remixLinkError,
+    path: [REMIX_LINK]
+  })
+
+export type RemixFormValues = z.input<typeof RemixFormSchema>
 
 /**
  * This is a subform that expects to exist within a parent TrackEdit form.
@@ -90,7 +100,7 @@ export const RemixModalForm = () => {
 
   const remixLink = initialRemixedTrack?.permalink
     ? fullTrackPage(initialRemixedTrack?.permalink)
-    : null
+    : ''
 
   const initialValues = useMemo(() => {
     const initialValues = {}
@@ -101,6 +111,7 @@ export const RemixModalForm = () => {
       !!remixOfValue?.tracks.some((track) => !!track)
     )
     set(initialValues, REMIX_LINK, remixLink)
+    set(initialValues, IS_VALID_REMIX_LINK, false)
     return initialValues as RemixFormValues
   }, [showRemixesValue, remixOfValue?.tracks, remixLink])
 
@@ -114,20 +125,22 @@ export const RemixModalForm = () => {
 
   const onSubmit = useCallback(
     (values: RemixFormValues) => {
-      setShowRemixesValue(get(values, SHOW_REMIXES))
+      setShowRemixesValue(get(values, SHOW_REMIXES) ?? showRemixesValue)
       if (get(values, IS_REMIX) && get(values, REMIX_LINK)) {
         // TODO: handle undefined linkedTrack with form validation
         setRemixOfValue({
           tracks: [
             {
               // @ts-ignore only the track_id is required for the form
-              parent_track_id: linkedTrack?.track_id
+              parent_track_id: linkedTrack
+                ? encodeHashId(linkedTrack?.track_id)
+                : undefined
             }
           ]
         })
       }
     },
-    [setShowRemixesValue, setRemixOfValue, linkedTrack?.track_id]
+    [setShowRemixesValue, showRemixesValue, setRemixOfValue, linkedTrack]
   )
 
   const preview = (
@@ -145,15 +158,20 @@ export const RemixModalForm = () => {
     <Formik<RemixFormValues>
       initialValues={initialValues}
       onSubmit={onSubmit}
+      validationSchema={toFormikValidationSchema(RemixFormSchema)}
       enableReinitialize
     >
-      <ModalField
-        title={messages.title}
-        icon={<IconRemix className={styles.titleIcon} />}
-        preview={preview}
-      >
-        <RemixModalFields setUrl={setUrl} />
-      </ModalField>
+      {() => {
+        return (
+          <ModalField
+            title={messages.title}
+            icon={<IconRemix className={styles.titleIcon} />}
+            preview={preview}
+          >
+            <RemixModalFields setUrl={setUrl} />
+          </ModalField>
+        )
+      }}
     </Formik>
   )
 }
@@ -165,6 +183,7 @@ type RemixModalFieldsProps = {
 const RemixModalFields = (props: RemixModalFieldsProps) => {
   const { setUrl } = props
   const [{ onChange: onLinkFieldChange, ...linkField }] = useField(REMIX_LINK)
+  const [, , { setValue: setIsValidRemixLink }] = useField(IS_VALID_REMIX_LINK)
   const permalink = getPathFromTrackUrl(linkField.value)
   const currentUserId = useSelector(getUserId)
   const { data: track } = useGetTrackByPermalink(
@@ -175,6 +194,10 @@ const RemixModalFields = (props: RemixModalFieldsProps) => {
     { disabled: !permalink }
   )
 
+  useEffect(() => {
+    setIsValidRemixLink(!!track)
+  }, [setIsValidRemixLink, track])
+
   return (
     <div className={styles.fields}>
       <SwitchRowField
@@ -189,7 +212,7 @@ const RemixModalFields = (props: RemixModalFieldsProps) => {
         header={messages.remixOf.header}
         description={messages.remixOf.description}
       >
-        <InputV2
+        <TextField
           id='remix_of_input'
           variant={InputV2Variant.ELEVATED_PLACEHOLDER}
           label={messages.remixOf.linkLabel}
diff --git a/packages/web/src/pages/upload-page/forms/SourceFilesModalForm.tsx b/packages/web/src/pages/upload-page/forms/SourceFilesModalForm.tsx
index c62f557955..3fdfb6baec 100644
--- a/packages/web/src/pages/upload-page/forms/SourceFilesModalForm.tsx
+++ b/packages/web/src/pages/upload-page/forms/SourceFilesModalForm.tsx
@@ -24,10 +24,13 @@ import { processFiles } from '../store/utils/processFiles'
 import styles from './SourceFilesModalForm.module.css'
 import { useTrackField } from './utils'
 
+// NOTE: SDK uses camel casing for the fields within download
 const ALLOW_DOWNLOAD_BASE = 'is_downloadable'
-const ALLOW_DOWNLOAD = 'download.is_downloadable'
+// const ALLOW_DOWNLOAD = 'download.is_downloadable'
+const ALLOW_DOWNLOAD = 'download.isDownloadable'
 const FOLLOWER_GATED_BASE = 'requires_follow'
-const FOLLOWER_GATED = 'download.requires_follow'
+// const FOLLOWER_GATED = 'download.requires_follow'
+const FOLLOWER_GATED = 'download.requiresFollow'
 const STEMS = 'stems'
 
 const messages = {
@@ -78,11 +81,21 @@ export const SourceFilesModalForm = () => {
 
   const onSubmit = useCallback(
     (values: SourceFilesFormValues) => {
-      setAllowDownloadValue(get(values, ALLOW_DOWNLOAD))
-      setFollowerGatedValue(get(values, FOLLOWER_GATED))
+      setAllowDownloadValue(
+        get(values, ALLOW_DOWNLOAD) ?? allowDownloadValue ?? false
+      )
+      setFollowerGatedValue(
+        get(values, FOLLOWER_GATED) ?? followerGatedValue ?? false
+      )
       setStemsValue(get(values, STEMS))
     },
-    [setAllowDownloadValue, setFollowerGatedValue, setStemsValue]
+    [
+      allowDownloadValue,
+      followerGatedValue,
+      setAllowDownloadValue,
+      setFollowerGatedValue,
+      setStemsValue
+    ]
   )
 
   const preview = (
@@ -107,13 +120,13 @@ export const SourceFilesModalForm = () => {
         icon={<IconSourceFiles className={styles.titleIcon} />}
         preview={preview}
       >
-        <SourceFilesModalFiels />
+        <SourceFilesModalFields />
       </ModalField>
     </Formik>
   )
 }
 
-const SourceFilesModalFiels = () => {
+const SourceFilesModalFields = () => {
   const [
     { onChange: allowDownloadOnChange },
     ,