diff --git a/strr-host-pm-web/app/components/document/upload/Select.vue b/strr-host-pm-web/app/components/document/upload/Select.vue
index 5e44b5c82..9d0487cf7 100644
--- a/strr-host-pm-web/app/components/document/upload/Select.vue
+++ b/strr-host-pm-web/app/components/document/upload/Select.vue
@@ -4,6 +4,7 @@ const props = defineProps({
   isDisabled: { type: Boolean, default: false },
   isRequired: { type: Boolean, default: false },
   isInvalid: { type: Boolean, default: false },
+  docOptions: { type: Array<{ label: string; value: DocumentUploadType }>, default: undefined },
   label: { type: String, default: '' },
   size: { type: String, default: 'lg' },
   helpId: { type: String, default: undefined },
@@ -78,7 +79,7 @@ onChange((files) => {
       v-model="docStore.selectedDocType"
       size="lg"
       :color="'gray'"
-      :options="docStore.docTypeOptions"
+      :options="docOptions ?? docStore.docTypeOptions"
       :aria-label="label"
       :aria-required="isRequired"
       :aria-invalid="isInvalid"
diff --git a/strr-host-pm-web/app/components/document/upload/Type.vue b/strr-host-pm-web/app/components/document/upload/Type.vue
new file mode 100644
index 000000000..134ff1f8c
--- /dev/null
+++ b/strr-host-pm-web/app/components/document/upload/Type.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup>
+
+const { t } = useI18n()
+const docStore = useDocumentStore()
+const strrModal = useStrrModals()
+
+const props = defineProps<{
+  title: string,
+  formFieldName: string,
+  docUploadType: DocumentUploadTypeEnum // document types for upload for the dropdown
+  docUploadStep: DocumentUploadStep,
+  hasError: boolean
+}>()
+
+const { storedDocuments } = storeToRefs(docStore)
+
+const docUploadHelpId = useId() // id for aria-describedby on doc select
+
+const allowedDocumentTypes = Object.values(props.docUploadType) as DocumentUploadType[]
+
+const uploadedDocuments = computed(() =>
+  storedDocuments.value.filter(doc => allowedDocumentTypes.includes(doc.type))) // filter all uploaded docs based on allowed types
+
+const docOptions = computed(() =>
+  allowedDocumentTypes.map(type => ({
+    label: t(`form.pr.docType.${type}`),
+    value: type
+  }))
+)
+
+</script>
+
+<template>
+  <ConnectFormSection
+    :title="props.title"
+    :error="props.hasError"
+  >
+    <div class="max-w-bcGovInput space-y-5">
+      <UFormGroup
+        :name="props.formFieldName"
+        :ui="{ help: 'mt-2 ml-10' }"
+      >
+        <DocumentUploadSelect
+          id="supporting-documents-type-select"
+          :label="$t('label.chooseDocs')"
+          :is-invalid="props.hasError"
+          :error="props.hasError"
+          :is-required="docStore.requiredDocs.length > 0"
+          :help-id="docUploadHelpId"
+          :doc-options="docOptions"
+          accept="application/pdf,image/jpeg"
+          @change="docStore.addStoredDocument($event, docUploadStep)"
+          @cancel="docStore.selectedDocType = undefined"
+          @error="e => strrModal.openErrorModal(
+            $t(`error.docUpload.${e}.title`), $t(`error.docUpload.${e}.description`), false
+          )"
+          @reset="docStore.selectedDocType = undefined"
+        />
+
+        <template #help>
+          <span :id="docUploadHelpId">
+            {{ $t('hint.docUpload') }}
+          </span>
+        </template>
+
+        <template #error="{ error }">
+          <span :id="docUploadHelpId">
+            {{ error }}
+          </span>
+        </template>
+      </UFormGroup>
+      <DocumentListItem
+        :documents="uploadedDocuments"
+        @remove="docStore.removeStoredDocument"
+      />
+    </div>
+  </ConnectFormSection>
+</template>
diff --git a/strr-host-pm-web/app/components/form/AddDocuments/index.vue b/strr-host-pm-web/app/components/form/AddDocuments/index.vue
index 22a1d2576..bf746cfca 100644
--- a/strr-host-pm-web/app/components/form/AddDocuments/index.vue
+++ b/strr-host-pm-web/app/components/form/AddDocuments/index.vue
@@ -1,13 +1,21 @@
 <script setup lang="ts">
 import type { Form } from '#ui/types'
+import {
+  ProofOfIdentityDocuments, ProofOfTenancyDocuments, ProofOfPrincipalResidenceDocuments, BusinessLicenceDocuments,
+  ProofOfFractionalOwnershipDocuments, StrataDocuments
+} from '~/enums/document-upload-type'
 
+const { t } = useI18n()
 const config = useRuntimeConfig().public
 const reqStore = usePropertyReqStore()
 const docStore = useDocumentStore()
 const propStore = useHostPropertyStore()
 const strrModal = useStrrModals()
 const { openSupportingDocumentsHelpModal } = useHostPmModals()
-const { isNewPrDocumentsListEnabled } = useHostFeatureFlags()
+const { isNewPrDocumentsListEnabled, isEnhancedDocumentUploadEnabled } = useHostFeatureFlags()
+
+const { propertyReqs, prRequirements } = storeToRefs(reqStore)
+const { unitDetails } = storeToRefs(propStore)
 
 const props = defineProps<{
   docUploadStep: DocumentUploadStep,
@@ -34,6 +42,92 @@ watch(
   { immediate: true, deep: true }
 )
 
+const showEnhancedDocumentUpload = computed(() =>
+  isEnhancedDocumentUploadEnabled.value && isNewPrDocumentsListEnabled.value
+)
+
+// display conditions for document upload types
+
+const isPrRequiredWithoutExemption = computed(() =>
+  propertyReqs.value.isPrincipalResidenceRequired &&
+  prRequirements.value.prExemptionReason === undefined
+)
+
+const showProofOfIdentity = computed(() => isPrRequiredWithoutExemption.value &&
+  unitDetails.value.hostType !== undefined)
+
+const showProofOfPr = computed(() =>
+  isPrRequiredWithoutExemption.value ||
+  prRequirements.value.prExemptionReason === PrExemptionReason.FARM_LAND
+)
+
+const showProofOfFractionalOwnership = computed(() =>
+  prRequirements.value.prExemptionReason === PrExemptionReason.FRACTIONAL_OWNERSHIP
+)
+
+const showBusinessLicence = computed(() =>
+  propertyReqs.value.isBusinessLicenceRequired && !blExempt.value
+)
+
+const showProofOfTenancy = computed(() =>
+  unitDetails.value.hostType === PropertyHostType.LONG_TERM_TENANT &&
+  isPrRequiredWithoutExemption.value
+)
+
+const showStrataDocs = computed(() =>
+  prRequirements.value.prExemptionReason === PrExemptionReason.STRATA_HOTEL
+)
+
+// configurations for document upload dropdowns
+const documentUploadConfig = computed<DocumentUploadConfig[]>(() => {
+  const config: DocumentUploadConfig[] = [
+    {
+      testId: 'proof-of-identity-upload',
+      title: t('label.proofOfIdentity'),
+      fieldName: 'identityDocUpload',
+      uploadType: ProofOfIdentityDocuments,
+      isDisplayed: showProofOfIdentity.value
+    },
+    {
+      testId: 'proof-of-pr-upload',
+      title: t('label.proofOfPr'),
+      fieldName: 'prDocUpload',
+      uploadType: ProofOfPrincipalResidenceDocuments,
+      isDisplayed: showProofOfPr.value
+    },
+    {
+      testId: 'proof-of-fractional-ownership-upload',
+      title: t('label.proofOfFractionalOwnership'),
+      fieldName: 'fractionalOwnerDocUpload',
+      uploadType: ProofOfFractionalOwnershipDocuments,
+      isDisplayed: showProofOfFractionalOwnership.value
+    },
+    {
+      testId: 'business-licence-upload',
+      title: t('label.localGovBL'),
+      fieldName: 'blDocUpload',
+      uploadType: BusinessLicenceDocuments,
+      isDisplayed: showBusinessLicence.value
+    },
+    {
+      testId: 'proof-of-tenancy-upload',
+      title: t('label.proofOfTenancy'),
+      fieldName: 'tenancyDocUpload',
+      uploadType: ProofOfTenancyDocuments,
+      isDisplayed: showProofOfTenancy.value
+    },
+    {
+      testId: 'strata-docs-upload',
+      title: t('label.supportingStrataDocs'),
+      fieldName: 'strataDocUpload',
+      uploadType: StrataDocuments,
+      isDisplayed: showStrataDocs.value
+    }
+  ]
+
+  return config.filter(docConfig => docConfig.isDisplayed)
+})
+
 onMounted(async () => {
   // validate form if step marked as complete
   if (props.isComplete) {
@@ -112,10 +206,34 @@ onMounted(async () => {
           <UForm
             ref="docFormRef"
             :state="docStore.requiredDocs"
-            :validate="docStore.validateRequiredDocuments"
+            :validate="showEnhancedDocumentUpload
+              ? docStore.validateDocumentDropdowns
+              : docStore.validateRequiredDocuments
+            "
             :validate-on="['submit']"
+            class="pb-10"
           >
-            <div class="py-10">
+            <div
+              v-if="showEnhancedDocumentUpload"
+              data-testid="enhanced-doc-upload"
+            >
+              <DocumentUploadType
+                v-for="docConfig in documentUploadConfig"
+                :key="docConfig.fieldName"
+                :data-testid="docConfig.testId"
+                :title="docConfig.title"
+                :form-field-name="docConfig.fieldName"
+                :doc-upload-type="docConfig.uploadType"
+                :doc-upload-step="docUploadStep"
+                :has-error="isComplete && hasFormErrors(docFormRef, [docConfig.fieldName])"
+                class="pt-10"
+              />
+            </div>
+            <div
+              v-else
+              class="pt-10"
+              data-testid="standard-doc-upload"
+            >
               <ConnectFormSection
                 :title="$t('label.fileUpload')"
                 :error="isComplete && hasFormErrors(docFormRef, ['documentUpload'])"
@@ -128,6 +246,7 @@ onMounted(async () => {
                   >
                     <DocumentUploadSelect
                       id="supporting-documents"
+                      data-testid="document-upload-select"
                       :label="$t('label.chooseDocs')"
                       :is-invalid="isComplete && hasFormErrors(docFormRef, ['documentUpload'])"
                       :error="isComplete && hasFormErrors(docFormRef, ['documentUpload'])"
@@ -177,8 +296,10 @@ onMounted(async () => {
         }"
       />
 
-      <!-- TODO: add aria label to page section ?? -->
-      <ConnectPageSection v-if="!blExempt">
+      <ConnectPageSection
+        v-if="!blExempt"
+        data-testid="bl-section-info"
+      >
         <UForm
           ref="blFormRef"
           :schema="propStore.blInfoSchema"
diff --git a/strr-host-pm-web/app/composables/useHostFeatureFlags.ts b/strr-host-pm-web/app/composables/useHostFeatureFlags.ts
index 4aed318d1..cb4cb1c0c 100644
--- a/strr-host-pm-web/app/composables/useHostFeatureFlags.ts
+++ b/strr-host-pm-web/app/composables/useHostFeatureFlags.ts
@@ -8,6 +8,8 @@ export const useHostFeatureFlags = () => {
     isNewRentalUnitSetupEnabled: isFeatureEnabled('enable-host-new-rental-unit-setup'),
     isNewPrDocumentsListEnabled: isFeatureEnabled('enable-host-new-pr-documents'),
     isDashboardTableSortingEnabled: isFeatureEnabled('enable-host-dashboard-table-sorting'),
-    isNewDashboardEnabled: isFeatureEnabled('enable-new-host-dashboard')
+    isNewDashboardEnabled: isFeatureEnabled('enable-new-host-dashboard'),
+    isBusinessLicenseDocumentUploadEnabled: isFeatureEnabled('enable-business-license-document-upload'),
+    isEnhancedDocumentUploadEnabled: isFeatureEnabled('enable-host-enhanced-document-upload')
   }
 }
diff --git a/strr-host-pm-web/app/enums/document-upload-type.ts b/strr-host-pm-web/app/enums/document-upload-type.ts
index e7589c732..d490494cc 100644
--- a/strr-host-pm-web/app/enums/document-upload-type.ts
+++ b/strr-host-pm-web/app/enums/document-upload-type.ts
@@ -30,3 +30,44 @@ export enum DocumentUploadType {
   ASSESSMENT_ACT_NOTICE = 'ASSESSMENT_ACT_NOTICE',
   MORTGAGE_STATEMENT_OR_SAVINGS_DOC = 'MORTGAGE_STATEMENT_OR_SAVINGS_DOC'
 }
+
+export enum ProofOfIdentityDocuments {
+  BC_DRIVERS_LICENSE = 'BC_DRIVERS_LICENSE',
+  BCSC = 'BCSC',
+  COMBINED_BCSC_LICENSE = 'COMBINED_BCSC_LICENSE'
+}
+
+export enum ProofOfPrincipalResidenceDocuments {
+  PROPERTY_ASSESSMENT_NOTICE = 'PROPERTY_ASSESSMENT_NOTICE',
+  ICBC_CERTIFICATE_OF_INSURANCE = 'ICBC_CERTIFICATE_OF_INSURANCE',
+  HOME_INSURANCE_SUMMARY = 'HOME_INSURANCE_SUMMARY',
+  PROPERTY_TAX_NOTICE = 'PROPERTY_TAX_NOTICE',
+  GOVT_OR_CROWN_CORP_OFFICIAL_NOTICE = 'GOVT_OR_CROWN_CORP_OFFICIAL_NOTICE',
+  TITLE_CERTIFICATE_OR_SEARCH = 'TITLE_CERTIFICATE_OR_SEARCH',
+  SPECULATION_VACANCY_TAX_DECLARATION = 'SPECULATION_VACANCY_TAX_DECLARATION',
+  HOME_OWNER_GRANT_APPROVAL = 'HOME_OWNER_GRANT_APPROVAL',
+  NOTARIZED_REAL_ESTATE_DOC = 'NOTARIZED_REAL_ESTATE_DOC',
+  PROPERTY_TRANSFER_TAX_RETURN = 'PROPERTY_TRANSFER_TAX_RETURN',
+  AFFIDAVIT_PRINCIPAL_RESIDENCE = 'AFFIDAVIT_PRINCIPAL_RESIDENCE',
+  ASSESSMENT_ACT_NOTICE = 'ASSESSMENT_ACT_NOTICE',
+  MORTGAGE_STATEMENT_OR_SAVINGS_DOC = 'MORTGAGE_STATEMENT_OR_SAVINGS_DOC',
+  OTHERS = 'OTHERS'
+}
+
+export enum ProofOfTenancyDocuments {
+  TENANCY_AGREEMENT = 'TENANCY_AGREEMENT',
+  RENT_RECEIPT_OR_BANK_STATEMENT = 'RENT_RECEIPT_OR_BANK_STATEMENT'
+}
+
+export enum ProofOfFractionalOwnershipDocuments {
+  FRACTIONAL_OWNERSHIP_AGREEMENT = 'FRACTIONAL_OWNERSHIP_AGREEMENT',
+  PROPERTY_TITLE_WITH_FRACTIONAL_OWNERSHIP = 'PROPERTY_TITLE_WITH_FRACTIONAL_OWNERSHIP'
+}
+
+export enum BusinessLicenceDocuments {
+  LOCAL_GOVT_BUSINESS_LICENSE = 'LOCAL_GOVT_BUSINESS_LICENSE'
+}
+
+export enum StrataDocuments {
+  STRATA_HOTEL_DOCUMENTATION = 'STRATA_HOTEL_DOCUMENTATION'
+}
diff --git a/strr-host-pm-web/app/interfaces/document-upload-config.ts b/strr-host-pm-web/app/interfaces/document-upload-config.ts
new file mode 100644
index 000000000..0d809fd8c
--- /dev/null
+++ b/strr-host-pm-web/app/interfaces/document-upload-config.ts
@@ -0,0 +1,8 @@
+// interface to configure enhanced multi-dropdown document upload
+export interface DocumentUploadConfig {
+  testId: string // unique id for tests
+  title: string // title for dropdown section
+  fieldName: string // form field name for the uploaded document (used for validation)
+  uploadType: DocumentUploadTypeEnum // category/type of document being uploaded
+  isDisplayed: boolean // show or hide the dropdown based on requirements in propStore, reqStore, etc.
+}
diff --git a/strr-host-pm-web/app/stores/document.ts b/strr-host-pm-web/app/stores/document.ts
index c3147c4d1..8a008678f 100644
--- a/strr-host-pm-web/app/stores/document.ts
+++ b/strr-host-pm-web/app/stores/document.ts
@@ -8,7 +8,7 @@ export const useDocumentStore = defineStore('host/document', () => {
   const strrModal = useStrrModals()
   const reqStore = usePropertyReqStore()
   const propStore = useHostPropertyStore()
-  const { isNewPrDocumentsListEnabled } = useHostFeatureFlags()
+  const { isNewPrDocumentsListEnabled, isEnhancedDocumentUploadEnabled } = useHostFeatureFlags()
 
   const storedDocuments = ref<UiDocument[]>([])
   const selectedDocType = ref<DocumentUploadType | undefined>(undefined)
@@ -36,48 +36,98 @@ export const useDocumentStore = defineStore('host/document', () => {
     const blExempt = reqStore.blRequirements.isBusinessLicenceExempt
     const docs = []
 
-    if (reqs.isBusinessLicenceRequired && !blExempt) {
-      const isBlValid = apiDocuments.value.some(
-        item => item.documentType === DocumentUploadType.LOCAL_GOVT_BUSINESS_LICENSE)
-      docs.push({
-        isValid: isBlValid,
-        icon: isBlValid ? 'i-mdi-check' : 'i-mdi-close',
-        label: t('label.localGovShortTermRentalBL')
-      })
-    }
     if (reqs.isPrincipalResidenceRequired && exemptionReason === undefined) {
-      const isPrValid = validatePrincipalResidenceDocuments()
+      const isIdValid = validateIdentityDocumentDropdown()
+
+      const isPrValid = isEnhancedDocumentUploadEnabled.value
+        ? validatePrincipalResidenceDropdown()
+        : validatePrincipalResidenceDocuments()
 
       const hostType = propStore.unitDetails.hostType
 
       if (isNewPrDocumentsListEnabled.value &&
         (hostType === PropertyHostType.OWNER || hostType === PropertyHostType.FRIEND_RELATIVE)) {
-        docs.push({
-          isValid: isPrValid,
-          icon: isPrValid ? 'i-mdi-check' : 'i-mdi-close',
-          label: t('label.proofOfPrOwner')
-        })
+        if (isEnhancedDocumentUploadEnabled.value) {
+          docs.push({
+            isValid: isIdValid,
+            icon: isIdValid ? 'i-mdi-check' : 'i-mdi-close',
+            label: t('label.proofOfIdentity'),
+            formFieldName: 'identityDocUpload'
+          })
+          docs.push({
+            isValid: isPrValid,
+            icon: isPrValid ? 'i-mdi-check' : 'i-mdi-close',
+            label: t('label.proofOfPrWithDocs'),
+            formFieldName: 'prDocUpload'
+          })
+        } else {
+          docs.push({
+            isValid: isPrValid,
+            icon: isPrValid ? 'i-mdi-check' : 'i-mdi-close',
+            label: t('label.proofOfPrOwner'),
+            formFieldName: 'prDocUpload'
+          })
+        }
       } else if (isNewPrDocumentsListEnabled.value && hostType === PropertyHostType.LONG_TERM_TENANT) {
-        docs.push({
-          isValid: isPrValid,
-          icon: isPrValid ? 'i-mdi-check' : 'i-mdi-close',
-          label: t('label.proofOfPrTenant')
-        })
+        if (isEnhancedDocumentUploadEnabled.value) {
+          docs.push({
+            isValid: isIdValid,
+            icon: isIdValid ? 'i-mdi-check' : 'i-mdi-close',
+            label: t('label.proofOfIdentity'),
+            formFieldName: 'identityDocUpload'
+          })
+          docs.push({
+            isValid: isPrValid,
+            icon: isPrValid ? 'i-mdi-check' : 'i-mdi-close',
+            label: t('label.proofOfPr'),
+            formFieldName: 'prDocUpload'
+          })
+        } else {
+          docs.push({
+            isValid: isPrValid,
+            icon: isPrValid ? 'i-mdi-check' : 'i-mdi-close',
+            label: t('label.proofOfPrTenant'),
+            formFieldName: 'tenancyDocUpload'
+          })
+        }
       } else {
         docs.push({
           isValid: isPrValid,
           icon: isPrValid ? 'i-mdi-check' : 'i-mdi-close',
-          label: t('label.proofOfPr')
+          label: t('label.proofOfPr'),
+          formFieldName: 'prDocUpload'
         })
       }
     }
+    if (exemptionReason === PrExemptionReason.FARM_LAND) {
+      const isPropAssessmentNoticeValid = apiDocuments.value.some(
+        item => item.documentType === DocumentUploadType.PROPERTY_ASSESSMENT_NOTICE
+      )
+      docs.push({
+        isValid: isPropAssessmentNoticeValid,
+        icon: isPropAssessmentNoticeValid ? 'i-mdi-check' : 'i-mdi-close',
+        label: t('label.propertyAssessmentNotice'),
+        formFieldName: 'prDocUpload'
+      })
+    }
+    if (reqs.isBusinessLicenceRequired && !blExempt) {
+      const isBlValid = apiDocuments.value.some(
+        item => item.documentType === DocumentUploadType.LOCAL_GOVT_BUSINESS_LICENSE)
+      docs.push({
+        isValid: isBlValid,
+        icon: isBlValid ? 'i-mdi-check' : 'i-mdi-close',
+        label: t('label.localGovShortTermRentalBL'),
+        formFieldName: 'blDocUpload'
+      })
+    }
     if (exemptionReason === PrExemptionReason.STRATA_HOTEL) {
       const isStrataValid = apiDocuments.value.some(
         item => item.documentType === DocumentUploadType.STRATA_HOTEL_DOCUMENTATION)
       docs.push({
         isValid: isStrataValid,
         icon: isStrataValid ? 'i-mdi-check' : 'i-mdi-close',
-        label: t('label.supportingStrataDocs')
+        label: t('label.supportingStrataDocs'),
+        formFieldName: 'strataDocUpload'
       })
     }
     if (exemptionReason === PrExemptionReason.FRACTIONAL_OWNERSHIP) {
@@ -90,22 +140,14 @@ export const useDocumentStore = defineStore('host/document', () => {
       docs.push({
         isValid: hasFractionalAgreement,
         icon: hasFractionalAgreement ? 'i-mdi-check' : 'i-mdi-close',
-        label: t(`form.pr.docType.${DocumentUploadType.FRACTIONAL_OWNERSHIP_AGREEMENT}`)
+        label: t(`form.pr.docType.${DocumentUploadType.FRACTIONAL_OWNERSHIP_AGREEMENT}`),
+        formFieldName: 'fractionalOwnerDocUpload'
       },
       {
         isValid: hasPropertyTitleWithFractional,
         icon: hasPropertyTitleWithFractional ? 'i-mdi-check' : 'i-mdi-close',
-        label: t(`form.pr.docType.${DocumentUploadType.PROPERTY_TITLE_WITH_FRACTIONAL_OWNERSHIP}`)
-      })
-    }
-    if (exemptionReason === PrExemptionReason.FARM_LAND) {
-      const isPropAssessmentNoticeValid = apiDocuments.value.some(
-        item => item.documentType === DocumentUploadType.PROPERTY_ASSESSMENT_NOTICE
-      )
-      docs.push({
-        isValid: isPropAssessmentNoticeValid,
-        icon: isPropAssessmentNoticeValid ? 'i-mdi-check' : 'i-mdi-close',
-        label: t('label.propertyAssessmentNotice')
+        label: t(`form.pr.docType.${DocumentUploadType.PROPERTY_TITLE_WITH_FRACTIONAL_OWNERSHIP}`),
+        formFieldName: 'fractionalOwnerDocUpload'
       })
     }
 
@@ -117,7 +159,8 @@ export const useDocumentStore = defineStore('host/document', () => {
       docs.push({
         isValid: isRentValid,
         icon: isRentValid ? 'i-mdi-check' : 'i-mdi-close',
-        label: t('label.rentalAgreementOrNoticeOfIncrease')
+        label: t('label.rentalAgreementOrNoticeOfIncrease'),
+        formFieldName: 'tenancyDocUpload'
       })
     }
 
@@ -589,6 +632,29 @@ export const useDocumentStore = defineStore('host/document', () => {
     ...documentCategories.value.rental
   ]
 
+  function validateIdentityDocumentDropdown (): boolean {
+    return apiDocuments.value.some(doc => documentCategories.value.bcId.includes(doc.documentType))
+  }
+
+  function validatePrincipalResidenceDropdown (): boolean {
+    // get unique column b docs
+    const columnBFilteredUnique = uniqBy(
+      apiDocuments.value.filter(item => documentCategories.value.uniqueColumnB.includes(item.documentType)),
+      'documentType'
+    )
+
+    // get non-unique column b docs
+    const columnBFilteredNonUnique = apiDocuments.value.filter(item =>
+      documentCategories.value.nonUniqueColumnB.includes(item.documentType)
+    )
+
+    // const columnACount = bcIdDocCount
+    const columnBCount = columnBFilteredUnique.length + columnBFilteredNonUnique.length
+
+    // validate at least 1 of column a and 2 of column b
+    return columnBCount >= 2
+  }
+
   function validatePrincipalResidenceDocuments (): boolean {
     // get unique column b docs
     const columnBFilteredUnique = uniqBy(
@@ -628,6 +694,21 @@ export const useDocumentStore = defineStore('host/document', () => {
     }
   }
 
+  function validateDocumentDropdowns (): Array<{ path: string, message: string }> {
+    const invalidDocs = requiredDocs.value.filter(doc => !doc.isValid)
+
+    if (invalidDocs.length === 0) {
+      return []
+    }
+
+    const validationErrors = invalidDocs.map(doc => ({
+      path: doc.formFieldName || '',
+      message: t('validation.missingReqDocs')
+    }))
+
+    return validationErrors
+  }
+
   // use this to remove documents from store and from api
   async function resetApiDocs () {
     const docsToDelete = [...storedDocuments.value]
@@ -658,6 +739,7 @@ export const useDocumentStore = defineStore('host/document', () => {
     addDocumentToRegistration,
     removeStoredDocument,
     validateRequiredDocuments,
+    validateDocumentDropdowns,
     resetApiDocs,
     removeDocumentsByType,
     $reset
diff --git a/strr-host-pm-web/app/stores/hostPermit.ts b/strr-host-pm-web/app/stores/hostPermit.ts
index e349c5f74..f446bcfcb 100644
--- a/strr-host-pm-web/app/stores/hostPermit.ts
+++ b/strr-host-pm-web/app/stores/hostPermit.ts
@@ -30,10 +30,9 @@ export const useHostPermitStore = defineStore('host/permit', () => {
     downloadRegistrationCert
   } = useStrrBasePermit<HostRegistrationResp, HostApplicationResp, ApiHostApplication>()
 
-  const { t } = useNuxtApp().$i18n
+  const { isBusinessLicenseDocumentUploadEnabled } = useHostFeatureFlags()
 
-  const { isFeatureEnabled } = useFeatureFlags()
-  const isBusinessLicenseDocumentUploadEnabled = isFeatureEnabled('enable-business-license-document-upload')
+  const { t } = useI18n()
 
   const renewalRegId = ref<string | undefined>(undefined)
   const isRegistrationRenewal = ref(false)
diff --git a/strr-host-pm-web/app/types/document-upload-type.ts b/strr-host-pm-web/app/types/document-upload-type.ts
new file mode 100644
index 000000000..74ce7de45
--- /dev/null
+++ b/strr-host-pm-web/app/types/document-upload-type.ts
@@ -0,0 +1,8 @@
+// Union type for all document upload type enums
+export type DocumentUploadTypeEnum =
+  | typeof ProofOfIdentityDocuments
+  | typeof ProofOfPrincipalResidenceDocuments
+  | typeof ProofOfTenancyDocuments
+  | typeof ProofOfFractionalOwnershipDocuments
+  | typeof BusinessLicenceDocuments
+  | typeof StrataDocuments
diff --git a/strr-host-pm-web/i18n/locales/en-CA.ts b/strr-host-pm-web/i18n/locales/en-CA.ts
index a6650d8d3..d048eaa9c 100644
--- a/strr-host-pm-web/i18n/locales/en-CA.ts
+++ b/strr-host-pm-web/i18n/locales/en-CA.ts
@@ -333,7 +333,11 @@ export default {
     fileUpload: 'File Upload',
     localGovBL: 'Local Government Business Licence',
     localGovShortTermRentalBL: 'Local government short-term rental business licence',
+    proofOfIdentity: 'Proof of identity',
+    proofOfTenancy: 'Proof of tenancy',
+    proofOfFractionalOwnership: 'Proof of fractional ownership',
     proofOfPr: 'Proof of principal residence',
+    proofOfPrWithDocs: 'Proof of principal residence (2 supporting documents)',
     proofOfPrOwner: 'Proof of principal residence (1 proof of identity and 2 supporting documents)',
     proofOfPrTenant: 'Proof of principal residence (1 proof of identity, 1 supporting document)',
     proofOfPrFractionalOwner: 'Proof of principal residence (1 proof of identity per fractional owner, 2 proof of fractional ownership)',
diff --git a/strr-host-pm-web/package.json b/strr-host-pm-web/package.json
index fb419eb65..5fb47fcff 100644
--- a/strr-host-pm-web/package.json
+++ b/strr-host-pm-web/package.json
@@ -2,7 +2,7 @@
   "name": "strr-host-pm-web",
   "private": true,
   "type": "module",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "scripts": {
     "build-check": "nuxt build",
     "build": "nuxt generate",
diff --git a/strr-host-pm-web/tests/mocks/mockedData.ts b/strr-host-pm-web/tests/mocks/mockedData.ts
index 42d5ffd2b..882fbe762 100644
--- a/strr-host-pm-web/tests/mocks/mockedData.ts
+++ b/strr-host-pm-web/tests/mocks/mockedData.ts
@@ -93,6 +93,7 @@ export const mockApplication: HostApplicationResp = {
     },
     unitDetails: {
       hostResidence: ResidenceType.SAME_UNIT,
+      hostType: PropertyHostType.OWNER,
       isUnitOnPrincipalResidenceProperty: true,
       numberOfRoomsForRent: 2,
       ownershipType: OwnershipType.OWN,
@@ -199,3 +200,36 @@ export const mockHostRegistration: HostRegistrationResp = {
   updatedDate: DateTime.utc(2026, 2, 2).toLocal(),
   user_id: 123
 }
+
+export const mockStoredDocuments: UiDocument[] = [
+  {
+    id: 'doc-1',
+    name: 'drivers-license.pdf',
+    type: DocumentUploadType.BC_DRIVERS_LICENSE,
+    file: {} as File,
+    apiDoc: {
+      documentType: DocumentUploadType.BC_DRIVERS_LICENSE,
+      fileKey: 'key-1',
+      fileName: 'drivers-license.pdf',
+      fileType: 'application/pdf'
+    },
+    loading: false,
+    uploadStep: DocumentUploadStep.APPLICATION,
+    uploadDate: '2024-01-01'
+  },
+  {
+    id: 'doc-2',
+    name: 'property-tax.pdf',
+    type: DocumentUploadType.PROPERTY_TAX_NOTICE,
+    file: {} as File,
+    apiDoc: {
+      documentType: DocumentUploadType.PROPERTY_TAX_NOTICE,
+      fileKey: 'key-2',
+      fileName: 'property-tax.pdf',
+      fileType: 'application/pdf'
+    },
+    loading: false,
+    uploadStep: DocumentUploadStep.APPLICATION,
+    uploadDate: '2024-01-01'
+  }
+]
diff --git a/strr-host-pm-web/tests/unit/application.spec.ts b/strr-host-pm-web/tests/unit/application.spec.ts
index c8a214f24..2a73b86ed 100644
--- a/strr-host-pm-web/tests/unit/application.spec.ts
+++ b/strr-host-pm-web/tests/unit/application.spec.ts
@@ -1,9 +1,8 @@
 import { mountSuspended } from '@nuxt/test-utils/runtime'
 import { describe, it, expect, vi, beforeAll } from 'vitest'
-import { ref, nextTick } from 'vue'
 import { flushPromises } from '@vue/test-utils'
 import { baseEnI18n } from '../mocks/i18n'
-import { mockApplication } from '../mocks/mockedData'
+import { mockApplication, mockStoredDocuments } from '../mocks/mockedData'
 import Application from '~/pages/application.vue'
 import {
   ConnectStepper,
@@ -15,13 +14,20 @@ import {
   FormReview,
   FormUnitAddressAutoComplete,
   FormUnitAddressManual,
-  FormUnitAddressManual2
+  FormUnitAddressManual2,
+  ConnectHelpExpand,
+  ConnectChecklistValidated,
+  SummaryOwners
 } from '#components'
+import { PropertyHostType } from '~/enums/property-type'
+import { PrExemptionReason } from '~/enums/pr-exemption-reason'
+
+const unitDetails = ref(mockApplication.registration.unitDetails)
 
 vi.mock('@/stores/hostProperty', () => ({
   useHostPropertyStore: () => ({
     unitAddress: { address: mockApplication.registration.unitAddress },
-    unitDetails: ref(mockApplication.registration.unitDetails),
+    unitDetails,
     blInfo: ref({
       businessLicense: '',
       businessLicenseExpiryDate: ''
@@ -41,21 +47,32 @@ vi.mock('@/stores/hostProperty', () => ({
   })
 }))
 
+const propertyReqs = ref<PropertyRequirements>({
+  isBusinessLicenceRequired: false,
+  isPrincipalResidenceRequired: true,
+  isStrProhibited: false,
+  isStraaExempt: false,
+  organizationNm: ''
+})
+
+const prRequirements = ref<PrRequirements>({
+  isPropertyPrExempt: false,
+  prExemptionReason: undefined
+})
+
 vi.mock('@/stores/propertyRequirements', () => ({
   usePropertyReqStore: () => ({
     showUnitDetailsForm: ref(true),
-    prRequirements: ref({
-      isPropertyPrExempt: false,
-      prExemptionReason: undefined
-    }),
+    prRequirements,
     blRequirements: ref({
       isBusinessLicenceExempt: false,
       blExemptReason: undefined
     }),
-    propertyReqs: ref({}),
+    propertyReqs,
     loadingReqs: ref(false),
     hasReqs: false,
     hasReqError: false,
+    overrideApplicationWarning: ref(false),
     validateBlExemption: () => true,
     validatePrRequirements: () => true,
     getPropertyReqs: vi.fn(),
@@ -67,6 +84,14 @@ vi.mock('@/stores/hostOwner', () => ({
   useHostOwnerStore: () => ({
     validateOwners: () => true,
     hostOwners: ref([]),
+    activeOwner: ref(undefined),
+    activeOwnerEditIndex: ref(undefined),
+    hasHost: ref(false),
+    hasCoHost: ref(false),
+    hasCompParty: ref(false),
+    hasPropertyManager: ref(false),
+    isCraNumberOptional: ref(false),
+    addHostOwner: vi.fn(),
     $reset: vi.fn()
   })
 }))
@@ -74,13 +99,26 @@ vi.mock('@/stores/hostOwner', () => ({
 vi.mock('@/stores/document', () => ({
   useDocumentStore: () => ({
     validateRequiredDocuments: () => [],
-    storedDocuments: ref([]),
+    validateDocumentDropdowns: () => [],
+    storedDocuments: ref(mockStoredDocuments),
+    requiredDocs: ref([
+      { label: 'Test Doc 1', isValid: true },
+      { label: 'Test Doc 2', isValid: false }
+    ]),
+    potentialRequiredDocs: ref([]),
+    selectedDocType: ref(undefined),
     prDocs: [],
-    documentCategories: {
+    documentCategories: ref({
+      bcId: [],
+      uniqueColumnB: [],
+      nonUniqueColumnB: [],
+      rental: [],
       exemption: [],
-      rental: []
-    },
+      bl: []
+    }),
     removeDocumentsByType: vi.fn(),
+    addStoredDocument: vi.fn(),
+    removeStoredDocument: vi.fn(),
     $reset: vi.fn()
   })
 }))
@@ -116,12 +154,16 @@ vi.mock('@/composables/useStrrModals', () => ({
   })
 }))
 
+const isEnhancedDocumentUploadEnabled = ref(false)
+
 vi.mock('@/composables/useHostFeatureFlags', () => ({
   useHostFeatureFlags: () => ({
     isSaveDraftEnabled: ref(true),
     isNewRentalUnitSetupEnabled: ref(true),
     isNewAddressFormEnabled: ref(true),
-    isNewDashboardEnabled: ref(false)
+    isNewDashboardEnabled: ref(false),
+    isEnhancedDocumentUploadEnabled,
+    isNewPrDocumentsListEnabled: ref(true)
   })
 }))
 
@@ -223,7 +265,7 @@ describe('Application Page', () => {
   })
 })
 
-describe('Rental Application Page - Step 1', () => {
+describe('Rental Application - Step 1', () => {
   let wrapper: any
 
   beforeAll(async () => {
@@ -232,12 +274,11 @@ describe('Rental Application Page - Step 1', () => {
         plugins: [baseEnI18n]
       }
     })
+    // need to wait for promises to resolve after moundSuspended (after upgrading to nuxt/test-utils 3.21+)
+    await flushPromises()
   })
 
-  it('renders the Step 1 and its components', async () => {
-    // wait for all promises to resolve (including the onMounted hook)
-    await flushPromises()
-    // make sure we are on step 1
+  it('renders the Step 1 and its components', () => {
     expect(wrapper.findComponent(ConnectStepper).vm.activeStepIndex).toBe(0)
 
     expect(wrapper.findComponent(FormDefineYourRentalUnitAddress).exists()).toBe(true)
@@ -258,3 +299,177 @@ describe('Rental Application Page - Step 1', () => {
     expect(rentalUnitDetails.find('[data-testid="unit-setup-option"]').exists()).toBe(true)
   })
 })
+
+describe('Rental Application - Step 2', () => {
+  let wrapper: any
+
+  beforeAll(async () => {
+    wrapper = await mountSuspended(Application, {
+      global: {
+        plugins: [baseEnI18n]
+      }
+    })
+    // need to wait for promises to resolve after moundSuspended (after upgrading to nuxt/test-utils 3.21+)
+    await flushPromises()
+  })
+
+  it('renders the Step 2 and its components', async () => {
+    await wrapper.findComponent(ConnectStepper).vm.$emit('update:activeStepIndex', 1)
+    await nextTick()
+
+    expect(wrapper.findComponent(ConnectStepper).vm.activeStepIndex).toBe(1)
+
+    const formAddOwners = wrapper.findComponent(FormAddOwners)
+    expect(formAddOwners.exists()).toBe(true)
+    expect(formAddOwners.find('[data-testid="add-owner"]').exists()).toBe(true)
+    expect(formAddOwners.findComponent(ConnectHelpExpand).exists()).toBe(true)
+    expect(formAddOwners.findComponent(ConnectChecklistValidated).exists()).toBe(true)
+    expect(formAddOwners.find('[data-testid="add-person-owner-btn"]').exists()).toBe(true)
+    expect(formAddOwners.find('[data-testid="add-business-owner-btn"]').exists()).toBe(true)
+    expect(formAddOwners.findComponent(SummaryOwners).exists()).toBe(true)
+  })
+})
+
+describe('Rental Application - Step 3', () => {
+  let wrapper: any
+
+  beforeAll(async () => {
+    wrapper = await mountSuspended(Application, {
+      global: {
+        plugins: [baseEnI18n]
+      }
+    })
+    // need to wait for promises to resolve after moundSuspended (after upgrading to nuxt/test-utils 3.21+)
+    await flushPromises()
+  })
+
+  it('renders the Step 3 and its components with standard document upload (single dropdown)', async () => {
+    await wrapper.findComponent(ConnectStepper).vm.$emit('update:activeStepIndex', 2)
+    await nextTick()
+
+    expect(wrapper.findComponent(ConnectStepper).vm.activeStepIndex).toBe(2)
+
+    const formAddDocuments = wrapper.findComponent(FormAddDocuments)
+    expect(formAddDocuments.exists()).toBe(true)
+
+    expect(wrapper.find('[data-testid="h2"]').exists()).toBe(true)
+
+    expect(formAddDocuments.find('[data-testid="pr-docs-help-modal"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="standard-doc-upload"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="document-upload-select"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="enhanced-doc-upload"]').exists()).toBe(false) // multi-dropdown is not visible
+    expect(formAddDocuments.find('[data-testid="bl-section-info"]').exists()).toBe(true)
+  })
+
+  it('renders the Step 3 with enhanced document upload feature enabled (multi-dropdowns)', async () => {
+    isEnhancedDocumentUploadEnabled.value = true
+
+    wrapper = await mountSuspended(Application, {
+      global: {
+        plugins: [baseEnI18n]
+      }
+    })
+
+    await flushPromises()
+
+    await wrapper.findComponent(ConnectStepper).vm.$emit('update:activeStepIndex', 2)
+    await nextTick()
+
+    expect(wrapper.findComponent(ConnectStepper).vm.activeStepIndex).toBe(2)
+
+    const formAddDocuments = wrapper.findComponent(FormAddDocuments)
+    expect(formAddDocuments.exists()).toBe(true)
+
+    expect(formAddDocuments.find('[data-testid="enhanced-doc-upload"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="proof-of-identity-upload"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="proof-of-pr-upload"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="proof-of-tenancy-upload"]').exists()).toBe(false)
+    expect(formAddDocuments.find('[data-testid="proof-of-fractional-ownership-upload"]').exists()).toBe(false)
+    expect(formAddDocuments.find('[data-testid="business-licence-upload"]').exists()).toBe(false)
+    expect(formAddDocuments.find('[data-testid="strata-docs-upload"]').exists()).toBe(false)
+
+    // reset feature flag
+    isEnhancedDocumentUploadEnabled.value = false
+  })
+
+  it('renders the Step 3 with Business License and Proof of Tenancy dropdowns', async () => {
+    isEnhancedDocumentUploadEnabled.value = true
+
+    // set property requirements for this test
+    propertyReqs.value = {
+      ...propertyReqs.value,
+      isBusinessLicenceRequired: true,
+      isPrincipalResidenceRequired: true
+    }
+
+    // set pr requirements for this test
+    prRequirements.value = {
+      isPropertyPrExempt: false,
+      prExemptionReason: undefined
+    }
+
+    // set user details for this test
+    unitDetails.value = {
+      ...mockApplication.registration.unitDetails,
+      hostType: PropertyHostType.LONG_TERM_TENANT
+    } as ApiUnitDetails
+
+    wrapper = await mountSuspended(Application, {
+      global: {
+        plugins: [baseEnI18n]
+      }
+    })
+
+    await flushPromises()
+    await wrapper.findComponent(ConnectStepper).vm.$emit('update:activeStepIndex', 2)
+    expect(wrapper.findComponent(ConnectStepper).vm.activeStepIndex).toBe(2)
+
+    const formAddDocuments = wrapper.findComponent(FormAddDocuments)
+
+    expect(formAddDocuments.find('[data-testid="proof-of-identity-upload"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="proof-of-pr-upload"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="business-licence-upload"]').exists()).toBe(true)
+    expect(formAddDocuments.find('[data-testid="proof-of-tenancy-upload"]').exists()).toBe(true)
+
+    // TODO: fix the test to verify doc checklist has 4 items
+    // expect(formAddDocuments.find('[data-testid="required-docs-checklist"]').findAll('li').length).toBe(4)
+
+    // reset feature flag
+    isEnhancedDocumentUploadEnabled.value = false
+    // reset unit details to defaults
+    unitDetails.value = mockApplication.registration.unitDetails
+  })
+
+  it('renders the Step 3 with Proof of Fractional Ownership dropdown', async () => {
+    isEnhancedDocumentUploadEnabled.value = true
+
+    // reset property requirements to defaults
+    propertyReqs.value = {
+      ...propertyReqs.value,
+      isBusinessLicenceRequired: false,
+      isPrincipalResidenceRequired: true
+    }
+
+    // set pr requirements for this test
+    prRequirements.value = {
+      isPropertyPrExempt: true,
+      prExemptionReason: PrExemptionReason.FRACTIONAL_OWNERSHIP
+    }
+
+    wrapper = await mountSuspended(Application, {
+      global: {
+        plugins: [baseEnI18n]
+      }
+    })
+
+    await flushPromises()
+    await wrapper.findComponent(ConnectStepper).vm.$emit('update:activeStepIndex', 2)
+    expect(wrapper.findComponent(ConnectStepper).vm.activeStepIndex).toBe(2)
+
+    const formAddDocuments = wrapper.findComponent(FormAddDocuments)
+    expect(formAddDocuments.find('[data-testid="proof-of-fractional-ownership-upload"]').exists()).toBe(true)
+
+    // reset feature flag
+    isEnhancedDocumentUploadEnabled.value = false
+  })
+})