diff --git a/shared-helpers/package.json b/shared-helpers/package.json
index 59e93c018a..4d93741b85 100644
--- a/shared-helpers/package.json
+++ b/shared-helpers/package.json
@@ -17,7 +17,7 @@
     "prettier": "prettier --write \"**/*.ts\""
   },
   "dependencies": {
-    "@bloom-housing/ui-components": "13.0.3",
+    "@bloom-housing/ui-components": "13.0.6",
     "@bloom-housing/ui-seeds": "3.3.1",
     "@heroicons/react": "^2.1.1",
     "axios-cookiejar-support": "^5.0.5",
diff --git a/sites/partners/package.json b/sites/partners/package.json
index 7fd3237278..b0bfe4594a 100644
--- a/sites/partners/package.json
+++ b/sites/partners/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@bloom-housing/shared-helpers": "^7.7.1",
-    "@bloom-housing/ui-components": "13.0.3",
+    "@bloom-housing/ui-components": "13.0.6",
     "@bloom-housing/ui-seeds": "3.3.1",
     "@heroicons/react": "^2.2.0",
     "@mapbox/mapbox-sdk": "^0.13.0",
diff --git a/sites/public/package.json b/sites/public/package.json
index d7d8f96619..2bd4d2bf79 100644
--- a/sites/public/package.json
+++ b/sites/public/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@bloom-housing/shared-helpers": "^7.7.1",
-    "@bloom-housing/ui-components": "13.0.3",
+    "@bloom-housing/ui-components": "13.0.6",
     "@bloom-housing/ui-seeds": "3.3.1",
     "@heroicons/react": "^2.1.1",
     "@mapbox/mapbox-sdk": "^0.13.0",
diff --git a/sites/public/src/pages/applications/contact/address.tsx b/sites/public/src/pages/applications/contact/address.tsx
index 242e8e4c47..48fc485a86 100644
--- a/sites/public/src/pages/applications/contact/address.tsx
+++ b/sites/public/src/pages/applications/contact/address.tsx
@@ -177,7 +177,7 @@ const ApplicationAddress = () => {
               {t("errors.errorsToResolve")}
             </Alert>
           )}
-          <div style={{ display: verifyAddress ? "none" : "block" }}>
+          <div style={{ display: verifyAddress ? "none" : "block" }} aria-hidden={verifyAddress}>
             <CardSection divider={"inset"}>
               <fieldset>
                 <legend className={"text__caps-spaced"}>
@@ -253,41 +253,45 @@ const ApplicationAddress = () => {
                         setValue("additionalPhoneNumberType", "")
                       }
                     },
+                    "aria-expanded": additionalPhone,
+                    "aria-controls": "additional-phone-fields",
                   }}
                   dataTestId={"app-primary-additional-phone"}
+                  className={"mb-0"}
                 />
-
-                {additionalPhone && (
-                  <>
-                    <PhoneField
-                      id="additionalPhoneNumber"
-                      name="additionalPhoneNumber"
-                      label={t("application.contact.secondNumber")}
-                      required={true}
-                      error={errors.additionalPhoneNumber}
-                      errorMessage={t("errors.phoneNumberError")}
-                      control={control}
-                      defaultValue={application.additionalPhoneNumber}
-                      controlClassName="control"
-                      dataTestId={"app-primary-additional-phone-number"}
-                      subNote={t("application.contact.number.subNote")}
-                    />
-                    <Select
-                      id="additionalPhoneNumberType"
-                      name="additionalPhoneNumberType"
-                      defaultValue={application.additionalPhoneNumberType}
-                      validation={{ required: true }}
-                      error={errors?.additionalPhoneNumberType}
-                      errorMessage={t("errors.phoneNumberTypeError")}
-                      register={register}
-                      controlClassName="control"
-                      label={t("application.contact.phoneNumberTypes.prompt")}
-                      options={phoneNumberKeys}
-                      keyPrefix="application.contact.phoneNumberTypes"
-                      dataTestId={"app-primary-additional-phone-number-type"}
-                    />
-                  </>
-                )}
+                <div id="additional-phone-fields">
+                  {additionalPhone && (
+                    <div className="seeds-m-bs-4">
+                      <PhoneField
+                        id="additionalPhoneNumber"
+                        name="additionalPhoneNumber"
+                        label={t("application.contact.secondNumber")}
+                        required={true}
+                        error={errors.additionalPhoneNumber}
+                        errorMessage={t("errors.phoneNumberError")}
+                        control={control}
+                        defaultValue={application.additionalPhoneNumber}
+                        controlClassName="control"
+                        dataTestId={"app-primary-additional-phone-number"}
+                        subNote={t("application.contact.number.subNote")}
+                      />
+                      <Select
+                        id="additionalPhoneNumberType"
+                        name="additionalPhoneNumberType"
+                        defaultValue={application.additionalPhoneNumberType}
+                        validation={{ required: true }}
+                        error={errors?.additionalPhoneNumberType}
+                        errorMessage={t("errors.phoneNumberTypeError")}
+                        register={register}
+                        controlClassName="control"
+                        label={t("application.contact.phoneNumberTypes.prompt")}
+                        options={phoneNumberKeys}
+                        keyPrefix="application.contact.phoneNumberTypes"
+                        dataTestId={"app-primary-additional-phone-number-type"}
+                      />
+                    </div>
+                  )}
+                </div>
               </fieldset>
             </CardSection>
             <CardSection divider={"inset"}>
@@ -389,106 +393,111 @@ const ApplicationAddress = () => {
                   register={register}
                   inputProps={{
                     defaultChecked: application.sendMailToMailingAddress,
+                    "aria-controls": "additional-mailing-address-fields",
+                    "aria-expanded": sendMailToMailingAddress,
                   }}
                   dataTestId={"app-primary-send-to-mailing"}
                 />
               </fieldset>
             </CardSection>
 
-            {clientLoaded && (sendMailToMailingAddress || application.sendMailToMailingAddress) && (
-              <CardSection divider={"inset"}>
-                <fieldset>
-                  <legend className="text__caps-spaced">
-                    {t("application.contact.mailingAddress")}
-                  </legend>
+            <div id="additional-mailing-address-fields">
+              {clientLoaded &&
+                (sendMailToMailingAddress || application.sendMailToMailingAddress) && (
+                  <CardSection divider={"inset"}>
+                    <fieldset>
+                      <legend className="text__caps-spaced">
+                        {t("application.contact.mailingAddress")}
+                      </legend>
 
-                  <p className="field-note mb-4">
-                    {t("application.contact.provideAMailingAddress")}
-                  </p>
+                      <p className="field-note mb-4">
+                        {t("application.contact.provideAMailingAddress")}
+                      </p>
 
-                  <Field
-                    id="mailingAddressStreet"
-                    name="applicationsMailingAddress.street"
-                    defaultValue={application.applicationsMailingAddress.street}
-                    label={t("application.contact.streetAddress")}
-                    validation={{ required: true, maxLength: 64 }}
-                    error={errors.applicationsMailingAddress?.street}
-                    errorMessage={
-                      errors.applicationsMailingAddress?.street?.type === "maxLength"
-                        ? t("errors.maxLength", { length: 64 })
-                        : t("errors.streetError")
-                    }
-                    register={register}
-                    dataTestId={"app-primary-mailing-address-street"}
-                  />
+                      <Field
+                        id="mailingAddressStreet"
+                        name="applicationsMailingAddress.street"
+                        defaultValue={application.applicationsMailingAddress.street}
+                        label={t("application.contact.streetAddress")}
+                        validation={{ required: true, maxLength: 64 }}
+                        error={errors.applicationsMailingAddress?.street}
+                        errorMessage={
+                          errors.applicationsMailingAddress?.street?.type === "maxLength"
+                            ? t("errors.maxLength", { length: 64 })
+                            : t("errors.streetError")
+                        }
+                        register={register}
+                        dataTestId={"app-primary-mailing-address-street"}
+                      />
 
-                  <Field
-                    id="mailingAddressStreet2"
-                    name="applicationsMailingAddress.street2"
-                    label={t("application.contact.apt")}
-                    defaultValue={application.applicationsMailingAddress.street2}
-                    register={register}
-                    dataTestId={"app-primary-mailing-address-street2"}
-                    validation={{ maxLength: 64 }}
-                    error={errors.applicationsMailingAddress?.street2}
-                    errorMessage={t("errors.maxLength", { length: 64 })}
-                  />
+                      <Field
+                        id="mailingAddressStreet2"
+                        name="applicationsMailingAddress.street2"
+                        label={t("application.contact.apt")}
+                        defaultValue={application.applicationsMailingAddress.street2}
+                        register={register}
+                        dataTestId={"app-primary-mailing-address-street2"}
+                        validation={{ maxLength: 64 }}
+                        error={errors.applicationsMailingAddress?.street2}
+                        errorMessage={t("errors.maxLength", { length: 64 })}
+                      />
 
-                  <div className="flex max-w-2xl">
-                    <Field
-                      id="mailingAddressCity"
-                      name="applicationsMailingAddress.city"
-                      label={t("application.contact.city")}
-                      defaultValue={application.applicationsMailingAddress.city}
-                      validation={{ required: true, maxLength: 64 }}
-                      error={errors.applicationsMailingAddress?.city}
-                      errorMessage={
-                        errors.applicationsMailingAddress?.city?.type === "maxLength"
-                          ? t("errors.maxLength", { length: 64 })
-                          : t("errors.cityError")
-                      }
-                      register={register}
-                      dataTestId={"app-primary-mailing-address-city"}
-                    />
-
-                    <Select
-                      id="mailingAddressState"
-                      name="applicationsMailingAddress.state"
-                      label={t("application.contact.state")}
-                      defaultValue={application.applicationsMailingAddress.state}
-                      validation={{ required: true, maxLength: 64 }}
-                      errorMessage={
-                        errors.applicationsMailingAddress?.state?.type === "maxLength"
-                          ? t("errors.maxLength", { length: 64 })
-                          : t("errors.stateError")
-                      }
-                      error={errors.applicationsMailingAddress?.state}
-                      register={register}
-                      controlClassName="control"
-                      options={stateKeys}
-                      keyPrefix="states"
-                      dataTestId={"app-primary-mailing-address-state"}
-                    />
-                  </div>
+                      <div className="flex max-w-2xl">
+                        <Field
+                          id="mailingAddressCity"
+                          name="applicationsMailingAddress.city"
+                          label={t("application.contact.city")}
+                          defaultValue={application.applicationsMailingAddress.city}
+                          validation={{ required: true, maxLength: 64 }}
+                          error={errors.applicationsMailingAddress?.city}
+                          errorMessage={
+                            errors.applicationsMailingAddress?.city?.type === "maxLength"
+                              ? t("errors.maxLength", { length: 64 })
+                              : t("errors.cityError")
+                          }
+                          register={register}
+                          dataTestId={"app-primary-mailing-address-city"}
+                        />
 
-                  <Field
-                    id="mailingAddressZipCode"
-                    name="applicationsMailingAddress.zipCode"
-                    label={t("application.contact.zip")}
-                    defaultValue={application.applicationsMailingAddress.zipCode}
-                    validation={{ required: true, maxLength: 10 }}
-                    error={errors.applicationsMailingAddress?.zipCode}
-                    errorMessage={
-                      errors.applicationsMailingAddress?.zipCode?.type === "maxLength"
-                        ? t("errors.maxLength", { length: 10 })
-                        : t("errors.zipCodeError")
-                    }
-                    register={register}
-                    dataTestId={"app-primary-mailing-address-zip"}
-                  />
-                </fieldset>
-              </CardSection>
-            )}
+                        <Select
+                          id="mailingAddressState"
+                          name="applicationsMailingAddress.state"
+                          label={t("application.contact.state")}
+                          defaultValue={application.applicationsMailingAddress.state}
+                          validation={{ required: true, maxLength: 64 }}
+                          errorMessage={
+                            errors.applicationsMailingAddress?.state?.type === "maxLength"
+                              ? t("errors.maxLength", { length: 64 })
+                              : t("errors.stateError")
+                          }
+                          error={errors.applicationsMailingAddress?.state}
+                          register={register}
+                          controlClassName="control"
+                          options={stateKeys}
+                          keyPrefix="states"
+                          dataTestId={"app-primary-mailing-address-state"}
+                        />
+                      </div>
+
+                      <Field
+                        id="mailingAddressZipCode"
+                        name="applicationsMailingAddress.zipCode"
+                        label={t("application.contact.zip")}
+                        defaultValue={application.applicationsMailingAddress.zipCode}
+                        validation={{ required: true, maxLength: 10 }}
+                        error={errors.applicationsMailingAddress?.zipCode}
+                        errorMessage={
+                          errors.applicationsMailingAddress?.zipCode?.type === "maxLength"
+                            ? t("errors.maxLength", { length: 10 })
+                            : t("errors.zipCodeError")
+                        }
+                        register={register}
+                        dataTestId={"app-primary-mailing-address-zip"}
+                      />
+                    </fieldset>
+                  </CardSection>
+                )}
+            </div>
 
             <CardSection divider={"inset"}>
               <fieldset>
@@ -543,6 +552,7 @@ const ApplicationAddress = () => {
                     inputProps={{
                       value: "yes",
                       defaultChecked: application.applicant.workInRegion == "yes",
+                      "aria-controls": "work-in-region",
                     }}
                     dataTestId={"app-primary-work-in-region-yes"}
                   />
@@ -559,6 +569,7 @@ const ApplicationAddress = () => {
                     inputProps={{
                       value: "no",
                       defaultChecked: application.applicant.workInRegion == "no",
+                      "aria-controls": "work-in-region",
                     }}
                     dataTestId={"app-primary-work-in-region-no"}
                   />
@@ -569,97 +580,103 @@ const ApplicationAddress = () => {
                   )}
                 </fieldset>
 
-                {(workInRegion == "yes" ||
-                  (!workInRegion && application.applicant.workInRegion == "yes")) && (
-                  <div className="form-card__group mx-0 px-0 mt-2">
-                    <fieldset>
-                      <legend className="text__caps-spaced">
-                        {t("application.contact.workAddress")}
-                      </legend>
-
-                      <Field
-                        id="applicantWorkAddressStreet"
-                        name="applicant.applicantWorkAddress.street"
-                        defaultValue={application.applicant.applicantWorkAddress.street}
-                        validation={{ required: true, maxLength: 64 }}
-                        error={errors.applicant?.applicantWorkAddress?.street}
-                        errorMessage={
-                          errors.applicant?.applicantWorkAddress?.street?.type === "maxLength"
-                            ? t("errors.maxLength", { length: 64 })
-                            : t("errors.streetError")
-                        }
-                        register={register}
-                        dataTestId={"app-primary-work-address-street"}
-                        label={t("application.contact.streetAddress")}
-                      />
-
-                      <Field
-                        id="applicantWorkAddressStreet2"
-                        name="applicant.applicantWorkAddress.street2"
-                        label={t("application.contact.apt")}
-                        defaultValue={application.applicant.applicantWorkAddress.street2}
-                        register={register}
-                        error={errors.applicant?.applicantWorkAddress?.street2}
-                        validation={{ maxLength: 64 }}
-                        errorMessage={"errors.maxLength"}
-                        dataTestId={"app-primary-work-address-street2"}
-                      />
+                <div id="work-in-region">
+                  {(workInRegion == "yes" ||
+                    (!workInRegion && application.applicant.workInRegion == "yes")) && (
+                    <div className="form-card__group mx-0 px-0 mt-2">
+                      <fieldset>
+                        <legend className="text__caps-spaced">
+                          {t("application.contact.workAddress")}
+                        </legend>
 
-                      <div className="flex max-w-2xl">
                         <Field
-                          id="applicantWorkAddressCity"
-                          name="applicant.applicantWorkAddress.city"
-                          label={t("application.contact.city")}
-                          defaultValue={application.applicant.applicantWorkAddress.city}
+                          id="applicantWorkAddressStreet"
+                          name="applicant.applicantWorkAddress.street"
+                          defaultValue={application.applicant.applicantWorkAddress.street}
                           validation={{ required: true, maxLength: 64 }}
-                          error={errors.applicant?.applicantWorkAddress?.city}
+                          error={errors.applicant?.applicantWorkAddress?.street}
                           errorMessage={
-                            errors.applicant?.applicantWorkAddress?.city?.type === "maxLength"
+                            errors.applicant?.applicantWorkAddress?.street?.type === "maxLength"
                               ? t("errors.maxLength", { length: 64 })
-                              : t("errors.cityError")
+                              : t("errors.streetError")
                           }
                           register={register}
-                          dataTestId={"app-primary-work-address-city"}
+                          dataTestId={"app-primary-work-address-street"}
+                          label={t("application.contact.streetAddress")}
                         />
 
-                        <Select
-                          id="applicantWorkAddressState"
-                          name="applicant.applicantWorkAddress.state"
-                          label={t("application.contact.state")}
-                          defaultValue={application.applicant.applicantWorkAddress.state}
-                          validation={{ required: true, maxLength: 64 }}
-                          error={errors.applicant?.applicantWorkAddress?.state}
+                        <Field
+                          id="applicantWorkAddressStreet2"
+                          name="applicant.applicantWorkAddress.street2"
+                          label={t("application.contact.apt")}
+                          defaultValue={application.applicant.applicantWorkAddress.street2}
+                          register={register}
+                          error={errors.applicant?.applicantWorkAddress?.street2}
+                          validation={{ maxLength: 64 }}
                           errorMessage={
-                            errors.applicant?.applicantWorkAddress?.state?.type === "maxLength"
+                            errors.applicant?.applicantWorkAddress?.street2?.type === "maxLength"
                               ? t("errors.maxLength", { length: 64 })
-                              : t("errors.stateError")
+                              : t("errors.streetError")
                           }
-                          register={register}
-                          controlClassName="control"
-                          options={stateKeys}
-                          keyPrefix="states"
-                          dataTestId={"app-primary-work-address-state"}
+                          dataTestId={"app-primary-work-address-street2"}
                         />
-                      </div>
 
-                      <Field
-                        id="applicantWorkAddressZipCode"
-                        name="applicant.applicantWorkAddress.zipCode"
-                        label={t("application.contact.zip")}
-                        defaultValue={application.applicant.applicantWorkAddress.zipCode}
-                        validation={{ required: true, maxLength: 10 }}
-                        error={errors.applicant?.applicantWorkAddress?.zipCode}
-                        errorMessage={
-                          errors.applicant?.applicantWorkAddress?.zipCode?.type === "maxLength"
-                            ? t("errors.maxLength", { length: 10 })
-                            : t("errors.zipCodeError")
-                        }
-                        register={register}
-                        dataTestId={"app-primary-work-address-zip"}
-                      />
-                    </fieldset>
-                  </div>
-                )}
+                        <div className="flex max-w-2xl">
+                          <Field
+                            id="applicantWorkAddressCity"
+                            name="applicant.applicantWorkAddress.city"
+                            label={t("application.contact.city")}
+                            defaultValue={application.applicant.applicantWorkAddress.city}
+                            validation={{ required: true, maxLength: 64 }}
+                            error={errors.applicant?.applicantWorkAddress?.city}
+                            errorMessage={
+                              errors.applicant?.applicantWorkAddress?.city?.type === "maxLength"
+                                ? t("errors.maxLength", { length: 64 })
+                                : t("errors.cityError")
+                            }
+                            register={register}
+                            dataTestId={"app-primary-work-address-city"}
+                          />
+
+                          <Select
+                            id="applicantWorkAddressState"
+                            name="applicant.applicantWorkAddress.state"
+                            label={t("application.contact.state")}
+                            defaultValue={application.applicant.applicantWorkAddress.state}
+                            validation={{ required: true, maxLength: 64 }}
+                            error={errors.applicant?.applicantWorkAddress?.state}
+                            errorMessage={
+                              errors.applicant?.applicantWorkAddress?.state?.type === "maxLength"
+                                ? t("errors.maxLength", { length: 64 })
+                                : t("errors.stateError")
+                            }
+                            register={register}
+                            controlClassName="control"
+                            options={stateKeys}
+                            keyPrefix="states"
+                            dataTestId={"app-primary-work-address-state"}
+                          />
+                        </div>
+
+                        <Field
+                          id="applicantWorkAddressZipCode"
+                          name="applicant.applicantWorkAddress.zipCode"
+                          label={t("application.contact.zip")}
+                          defaultValue={application.applicant.applicantWorkAddress.zipCode}
+                          validation={{ required: true, maxLength: 10 }}
+                          error={errors.applicant?.applicantWorkAddress?.zipCode}
+                          errorMessage={
+                            errors.applicant?.applicantWorkAddress?.zipCode?.type === "maxLength"
+                              ? t("errors.maxLength", { length: 10 })
+                              : t("errors.zipCodeError")
+                          }
+                          register={register}
+                          dataTestId={"app-primary-work-address-zip"}
+                        />
+                      </fieldset>
+                    </div>
+                  )}
+                </div>
               </CardSection>
             )}
             {enableFullTimeStudentQuestion && (
diff --git a/sites/public/src/pages/applications/contact/alternate-contact-type.tsx b/sites/public/src/pages/applications/contact/alternate-contact-type.tsx
index 3a32641003..df24be9a0a 100644
--- a/sites/public/src/pages/applications/contact/alternate-contact-type.tsx
+++ b/sites/public/src/pages/applications/contact/alternate-contact-type.tsx
@@ -116,28 +116,32 @@ const ApplicationAlternateContactType = () => {
                       inputProps={{
                         value: option,
                         defaultChecked: application.alternateContact.type === option,
+                        "aria-controls": option === "other" ? "other-type" : undefined,
                       }}
                       dataTestId={"app-alternate-type"}
                     />
-
-                    {option === "other" && type === "other" && (
-                      <Field
-                        controlClassName="mt-4"
-                        id="otherType"
-                        name="otherType"
-                        label={t("application.alternateContact.type.otherTypeFormPlaceholder")}
-                        defaultValue={application.alternateContact.otherType}
-                        validation={{ required: true, maxLength: 64 }}
-                        error={errors.otherType}
-                        errorMessage={
-                          errors.otherType?.type === "maxLength"
-                            ? t("errors.maxLength", { length: 64 })
-                            : t("application.alternateContact.type.otherTypeValidationErrorMessage")
-                        }
-                        register={register}
-                        dataTestId={"app-alternate-other-type"}
-                      />
-                    )}
+                    <div id="other-type">
+                      {option === "other" && type === "other" && (
+                        <Field
+                          className="seeds-p-be-4"
+                          id="otherType"
+                          name="otherType"
+                          label={t("application.alternateContact.type.otherTypeFormPlaceholder")}
+                          defaultValue={application.alternateContact.otherType}
+                          validation={{ required: true, maxLength: 64 }}
+                          error={errors.otherType}
+                          errorMessage={
+                            errors.otherType?.type === "maxLength"
+                              ? t("errors.maxLength", { length: 64 })
+                              : t(
+                                  "application.alternateContact.type.otherTypeValidationErrorMessage"
+                                )
+                          }
+                          register={register}
+                          dataTestId={"app-alternate-other-type"}
+                        />
+                      )}
+                    </div>
                     {i === altContactRelationshipKeys.length - 1 && (
                       <>
                         {errors.type && (
diff --git a/sites/public/src/pages/applications/contact/name.tsx b/sites/public/src/pages/applications/contact/name.tsx
index b0fed3fccf..2085389b83 100644
--- a/sites/public/src/pages/applications/contact/name.tsx
+++ b/sites/public/src/pages/applications/contact/name.tsx
@@ -173,8 +173,11 @@ const ApplicationName = () => {
                   {t("application.name.yourDateOfBirth")}
                 </>
               }
+              ariaDescribedBy="dob-helper"
             />
-            <p className={"field-sub-note"}>{t("application.name.dobHelper")}</p>
+            <p id="dob-helper" className={"field-sub-note"}>
+              {t("application.name.dobHelper")}
+            </p>
           </CardSection>
           <CardSection divider={"flush"} className={"border-none"}>
             <legend
diff --git a/sites/public/src/pages/applications/household/member.tsx b/sites/public/src/pages/applications/household/member.tsx
index 0ffe45e7e9..5293373a53 100644
--- a/sites/public/src/pages/applications/household/member.tsx
+++ b/sites/public/src/pages/applications/household/member.tsx
@@ -146,12 +146,18 @@ const ApplicationMember = () => {
       label: t("t.yes"),
       value: YesNoEnum.yes,
       defaultChecked: member?.sameAddress === "yes",
+      inputProps: {
+        "aria-controls": "householdMemberAddress",
+      },
     },
     {
       id: "sameAddressNo",
       label: t("t.no"),
       value: YesNoEnum.no,
       defaultChecked: member?.sameAddress === "no",
+      inputProps: {
+        "aria-controls": "householdMemberAddress",
+      },
     },
   ]
 
@@ -161,12 +167,18 @@ const ApplicationMember = () => {
       label: t("t.yes"),
       value: YesNoEnum.yes,
       defaultChecked: member?.workInRegion === "yes",
+      inputProps: {
+        "aria-controls": "householdMemberWorkAddress",
+      },
     },
     {
       id: "workInRegionNo",
       label: t("t.no"),
       value: YesNoEnum.no,
       defaultChecked: member?.workInRegion === "no",
+      inputProps: {
+        "aria-controls": "householdMemberWorkAddress",
+      },
     },
   ]
 
@@ -310,176 +322,65 @@ const ApplicationMember = () => {
               />
             </fieldset>
 
-            {(sameAddress == "no" || (!sameAddress && member.sameAddress == "no")) && (
-              <fieldset className="mt-8">
-                <legend className="text__caps-spaced">{t("application.contact.address")}</legend>
-
-                <Field
-                  id="householdMemberAddress.street"
-                  name="householdMemberAddress.street"
-                  defaultValue={member.householdMemberAddress.street}
-                  validation={{ required: true, maxLength: 64 }}
-                  errorMessage={
-                    errors.householdMemberAddress?.street?.type === "maxLength"
-                      ? t("errors.maxLength", { length: 64 })
-                      : t("errors.streetError")
-                  }
-                  error={errors.householdMemberAddress?.street}
-                  register={register}
-                  dataTestId={"app-household-member-address-street"}
-                  label={t("application.contact.streetAddress")}
-                />
-
-                <Field
-                  id="householdMemberAddress.street2"
-                  name="householdMemberAddress.street2"
-                  label={t("application.contact.apt")}
-                  defaultValue={member.householdMemberAddress.street2}
-                  error={errors.householdMemberAddress?.street2}
-                  validation={{ maxLength: 64 }}
-                  errorMessage={t("errors.maxLength", { length: 64 })}
-                  register={register}
-                  dataTestId={"app-household-member-address-street2"}
-                />
-
-                <div className="flex max-w-2xl">
-                  <Field
-                    id="householdMemberAddress.city"
-                    name="householdMemberAddress.city"
-                    label={t("application.contact.city")}
-                    defaultValue={member.householdMemberAddress.city}
-                    validation={{ required: true, maxLength: 64 }}
-                    errorMessage={
-                      errors.householdMemberAddress?.city?.type === "maxLength"
-                        ? t("errors.maxLength", { length: 64 })
-                        : t("errors.cityError")
-                    }
-                    error={errors.householdMemberAddress?.city}
-                    register={register}
-                    dataTestId={"app-household-member-address-city"}
-                  />
-
-                  <Select
-                    id="householdMemberAddress.state"
-                    name="householdMemberAddress.state"
-                    label={t("application.contact.state")}
-                    defaultValue={member.householdMemberAddress.state}
-                    validation={{ required: true, maxLength: 64 }}
-                    error={errors.householdMemberAddress?.state}
-                    errorMessage={
-                      errors.householdMemberAddress?.state?.type === "maxLength"
-                        ? t("errors.maxLength", { length: 64 })
-                        : t("errors.stateError")
-                    }
-                    register={register}
-                    controlClassName="control"
-                    options={stateKeys}
-                    keyPrefix="states"
-                    dataTestId={"app-household-member-address-state"}
-                  />
-                </div>
-
-                <Field
-                  id="householdMemberAddress.zipCode"
-                  name="householdMemberAddress.zipCode"
-                  label={t("application.contact.zip")}
-                  defaultValue={member.householdMemberAddress.zipCode}
-                  validation={{ required: true, maxLength: 10 }}
-                  error={errors.householdMemberAddress?.zipCode}
-                  errorMessage={
-                    errors.address?.householdMemberAddress?.type === "maxLength"
-                      ? t("errors.maxLength", { length: 10 })
-                      : t("errors.zipCodeError")
-                  }
-                  register={register}
-                  dataTestId={"app-household-member-address-zip"}
-                />
-              </fieldset>
-            )}
-          </CardSection>
-
-          {!disableWorkInRegion && (
-            <CardSection divider={"inset"}>
-              <fieldset>
-                <legend className="text__caps-spaced">
-                  {t("application.household.member.workInRegion", {
-                    county:
-                      listing?.listingsBuildingAddress?.county || listing?.jurisdictions?.name,
-                  })}
-                </legend>
-                <FieldGroup
-                  name="workInRegion"
-                  fieldGroupClassName="grid grid-cols-1"
-                  fieldClassName="ml-0"
-                  groupNote={t("application.household.member.workInRegionNote")}
-                  type="radio"
-                  register={register}
-                  validation={{ required: true }}
-                  error={errors.workInRegion}
-                  errorMessage={t("errors.selectOption")}
-                  fields={workInRegionOptions}
-                  dataTestId={"app-household-member-work-in-region"}
-                />
-              </fieldset>
-
-              {(workInRegion == "yes" || (!workInRegion && member.workInRegion == "yes")) && (
+            <div id="householdMemberAddress">
+              {(sameAddress === "no" || (!sameAddress && member.sameAddress == "no")) && (
                 <fieldset className="mt-8">
                   <legend className="text__caps-spaced">{t("application.contact.address")}</legend>
 
                   <Field
-                    id="householdMemberWorkAddress.street"
-                    name="householdMemberWorkAddress.street"
-                    label={t("application.contact.streetAddress")}
-                    defaultValue={member.householdMemberWorkAddress.street}
+                    id="householdMemberAddress.street"
+                    name="householdMemberAddress.street"
+                    defaultValue={member.householdMemberAddress.street}
                     validation={{ required: true, maxLength: 64 }}
-                    error={errors.householdMemberWorkAddress?.street}
                     errorMessage={
-                      errors.householdMemberWorkAddress?.street?.type === "maxLength"
+                      errors.householdMemberAddress?.street?.type === "maxLength"
                         ? t("errors.maxLength", { length: 64 })
                         : t("errors.streetError")
                     }
+                    error={errors.householdMemberAddress?.street}
                     register={register}
-                    dataTestId={"app-household-member-work-address-street"}
+                    dataTestId={"app-household-member-address-street"}
+                    label={t("application.contact.streetAddress")}
                   />
 
                   <Field
-                    id="householdMemberWorkAddress.street2"
-                    name="householdMemberWorkAddress.street2"
+                    id="householdMemberAddress.street2"
+                    name="householdMemberAddress.street2"
                     label={t("application.contact.apt")}
-                    defaultValue={member.householdMemberWorkAddress.street2}
-                    error={errors.householdMemberWorkAddress?.street2}
-                    errorMessage={t("errors.maxLength", { length: 64 })}
+                    defaultValue={member.householdMemberAddress.street2}
+                    error={errors.householdMemberAddress?.street2}
                     validation={{ maxLength: 64 }}
+                    errorMessage={t("errors.maxLength", { length: 64 })}
                     register={register}
-                    dataTestId={"app-household-member-work-address-street2"}
+                    dataTestId={"app-household-member-address-street2"}
                   />
 
                   <div className="flex max-w-2xl">
                     <Field
-                      id="householdMemberWorkAddress.city"
-                      name="householdMemberWorkAddress.city"
+                      id="householdMemberAddress.city"
+                      name="householdMemberAddress.city"
                       label={t("application.contact.city")}
-                      defaultValue={member.householdMemberWorkAddress.city}
+                      defaultValue={member.householdMemberAddress.city}
                       validation={{ required: true, maxLength: 64 }}
-                      error={errors.householdMemberWorkAddress?.city}
                       errorMessage={
-                        errors.householdMemberWorkAddress?.city?.type === "maxLength"
+                        errors.householdMemberAddress?.city?.type === "maxLength"
                           ? t("errors.maxLength", { length: 64 })
                           : t("errors.cityError")
                       }
+                      error={errors.householdMemberAddress?.city}
                       register={register}
-                      dataTestId={"app-household-member-work-address-city"}
+                      dataTestId={"app-household-member-address-city"}
                     />
 
                     <Select
-                      id="householdMemberWorkAddress.state"
-                      name="householdMemberWorkAddress.state"
+                      id="householdMemberAddress.state"
+                      name="householdMemberAddress.state"
                       label={t("application.contact.state")}
-                      defaultValue={member.householdMemberWorkAddress.state}
+                      defaultValue={member.householdMemberAddress.state}
                       validation={{ required: true, maxLength: 64 }}
-                      error={errors.householdMemberWorkAddress?.state}
+                      error={errors.householdMemberAddress?.state}
                       errorMessage={
-                        errors.householdMemberWorkAddress?.state?.type === "maxLength"
+                        errors.householdMemberAddress?.state?.type === "maxLength"
                           ? t("errors.maxLength", { length: 64 })
                           : t("errors.stateError")
                       }
@@ -487,27 +388,144 @@ const ApplicationMember = () => {
                       controlClassName="control"
                       options={stateKeys}
                       keyPrefix="states"
-                      dataTestId={"app-household-member-work-address-state"}
+                      dataTestId={"app-household-member-address-state"}
                     />
                   </div>
 
                   <Field
-                    id="householdMemberWorkAddress.zipCode"
-                    name="householdMemberWorkAddress.zipCode"
+                    id="householdMemberAddress.zipCode"
+                    name="householdMemberAddress.zipCode"
                     label={t("application.contact.zip")}
-                    defaultValue={member.householdMemberWorkAddress.zipCode}
+                    defaultValue={member.householdMemberAddress.zipCode}
                     validation={{ required: true, maxLength: 10 }}
-                    error={errors.householdMemberWorkAddress?.zipCode}
+                    error={errors.householdMemberAddress?.zipCode}
                     errorMessage={
-                      errors.householdMemberWorkAddress?.zipCode?.type === "maxLength"
+                      errors.householdMemberAddress?.zipCode?.type === "maxLength"
                         ? t("errors.maxLength", { length: 10 })
                         : t("errors.zipCodeError")
                     }
                     register={register}
-                    dataTestId={"app-household-member-work-address-zip"}
+                    dataTestId={"app-household-member-address-zip"}
                   />
                 </fieldset>
               )}
+            </div>
+          </CardSection>
+
+          {!disableWorkInRegion && (
+            <CardSection divider={"inset"}>
+              <fieldset>
+                <legend className="text__caps-spaced">
+                  {t("application.household.member.workInRegion", {
+                    county:
+                      listing?.listingsBuildingAddress?.county || listing?.jurisdictions?.name,
+                  })}
+                </legend>
+                <FieldGroup
+                  name="workInRegion"
+                  fieldGroupClassName="grid grid-cols-1"
+                  fieldClassName="ml-0"
+                  groupNote={t("application.household.member.workInRegionNote")}
+                  type="radio"
+                  register={register}
+                  validation={{ required: true }}
+                  error={errors.workInRegion}
+                  errorMessage={t("errors.selectOption")}
+                  fields={workInRegionOptions}
+                  dataTestId={"app-household-member-work-in-region"}
+                />
+              </fieldset>
+
+              <div id="householdMemberWorkAddress">
+                {(workInRegion == "yes" || (!workInRegion && member.workInRegion == "yes")) && (
+                  <fieldset className="mt-8">
+                    <legend className="text__caps-spaced">
+                      {t("application.contact.address")}
+                    </legend>
+
+                    <Field
+                      id="householdMemberWorkAddress.street"
+                      name="householdMemberWorkAddress.street"
+                      label={t("application.contact.streetAddress")}
+                      defaultValue={member.householdMemberWorkAddress.street}
+                      validation={{ required: true, maxLength: 64 }}
+                      error={errors.householdMemberWorkAddress?.street}
+                      errorMessage={
+                        errors.householdMemberWorkAddress?.street?.type === "maxLength"
+                          ? t("errors.maxLength", { length: 64 })
+                          : t("errors.streetError")
+                      }
+                      register={register}
+                      dataTestId={"app-household-member-work-address-street"}
+                    />
+
+                    <Field
+                      id="householdMemberWorkAddress.street2"
+                      name="householdMemberWorkAddress.street2"
+                      label={t("application.contact.apt")}
+                      defaultValue={member.householdMemberWorkAddress.street2}
+                      error={errors.householdMemberWorkAddress?.street2}
+                      errorMessage={t("errors.maxLength", { length: 64 })}
+                      validation={{ maxLength: 64 }}
+                      register={register}
+                      dataTestId={"app-household-member-work-address-street2"}
+                    />
+
+                    <div className="flex max-w-2xl">
+                      <Field
+                        id="householdMemberWorkAddress.city"
+                        name="householdMemberWorkAddress.city"
+                        label={t("application.contact.city")}
+                        defaultValue={member.householdMemberWorkAddress.city}
+                        validation={{ required: true, maxLength: 64 }}
+                        error={errors.householdMemberWorkAddress?.city}
+                        errorMessage={
+                          errors.householdMemberWorkAddress?.city?.type === "maxLength"
+                            ? t("errors.maxLength", { length: 64 })
+                            : t("errors.cityError")
+                        }
+                        register={register}
+                        dataTestId={"app-household-member-work-address-city"}
+                      />
+
+                      <Select
+                        id="householdMemberWorkAddress.state"
+                        name="householdMemberWorkAddress.state"
+                        label={t("application.contact.state")}
+                        defaultValue={member.householdMemberWorkAddress.state}
+                        validation={{ required: true, maxLength: 64 }}
+                        error={errors.householdMemberWorkAddress?.state}
+                        errorMessage={
+                          errors.householdMemberWorkAddress?.state?.type === "maxLength"
+                            ? t("errors.maxLength", { length: 64 })
+                            : t("errors.stateError")
+                        }
+                        register={register}
+                        controlClassName="control"
+                        options={stateKeys}
+                        keyPrefix="states"
+                        dataTestId={"app-household-member-work-address-state"}
+                      />
+                    </div>
+
+                    <Field
+                      id="householdMemberWorkAddress.zipCode"
+                      name="householdMemberWorkAddress.zipCode"
+                      label={t("application.contact.zip")}
+                      defaultValue={member.householdMemberWorkAddress.zipCode}
+                      validation={{ required: true, maxLength: 10 }}
+                      error={errors.householdMemberWorkAddress?.zipCode}
+                      errorMessage={
+                        errors.householdMemberWorkAddress?.zipCode?.type === "maxLength"
+                          ? t("errors.maxLength", { length: 10 })
+                          : t("errors.zipCodeError")
+                      }
+                      register={register}
+                      dataTestId={"app-household-member-work-address-zip"}
+                    />
+                  </fieldset>
+                )}
+              </div>
             </CardSection>
           )}
 
diff --git a/yarn.lock b/yarn.lock
index c8eec8a0ce..a966c18f8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1006,10 +1006,10 @@
   resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@bloom-housing/ui-components@13.0.3":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@bloom-housing/ui-components/-/ui-components-13.0.3.tgz#7120699d7fce6603b7f5c1636baa06bb7edafb67"
-  integrity sha512-yMi1aIjWO7iNEJeX1YkRRvd1pemzJ9/Td3gpG9DiPkXh5gsnRH/CT5EATJAOzPtzq6w5VCpJ3yTOvbHraOVr0w==
+"@bloom-housing/ui-components@13.0.6":
+  version "13.0.6"
+  resolved "https://registry.yarnpkg.com/@bloom-housing/ui-components/-/ui-components-13.0.6.tgz#d9f5a75780b1a2e3280fae550396952d9c8f5735"
+  integrity sha512-1xguoeK3QmDzTxrLusCDIgP4x5ZbOTWaYFtOrm8zwI2PiGKl8yaSwlG2JDDDTtphl6x5xWWKY932tjDvTxxKSg==
   dependencies:
     "@fortawesome/fontawesome-svg-core" "^6.1.1"
     "@fortawesome/free-regular-svg-icons" "^6.1.1"