diff --git a/frontend/src/components/SummaryDeclaration.vue b/frontend/src/components/SummaryDeclaration.vue
index 897c066c..bc6e785c 100644
--- a/frontend/src/components/SummaryDeclaration.vue
+++ b/frontend/src/components/SummaryDeclaration.vue
@@ -441,9 +441,11 @@ import { useAppStore } from '@/store/app.js';
 import { useOrganizationStore } from '@/store/ccof/organization.js';
 import { useSummaryDeclarationStore } from '@/store/summaryDeclaration.js';
 import { useApplicationStore } from '@/store/application.js';
+import { useCcfriAppStore } from '@/store/ccfriApp.js';
 import { useReportChangesStore } from '@/store/reportChanges.js';
 
 import {
+  AFS_STATUSES,
   PATHS,
   CHANGE_REQUEST_TYPES,
   PROGRAM_YEAR_LANGUAGE_TYPES,
@@ -529,6 +531,7 @@ export default {
       'isEceweComplete',
       'applicationMap',
     ]),
+    ...mapState(useCcfriAppStore, ['approvableFeeSchedules']),
     ...mapState(useReportChangesStore, ['changeRequestStore', 'isCREceweComplete', 'isCRLicenseComplete']),
     languageYearLabel() {
       return this.getLanguageYearLabel;
@@ -809,14 +812,22 @@ export default {
           unlockCcfri: facility.unlockCcfri,
           unlockNmf: facility.unlockNmf,
           unlockRfi: facility.unlockRfi,
+          unlockAfs: facility.unlockAfs,
         };
         // Create payload with only unlock propteries set to 1.
-
         unlockPayload = Object.fromEntries(Object.entries(unlockPayload).filter(([_, v]) => v == 1));
         // Update payload unlock properties from 1 to 0.
         Object.keys(unlockPayload).forEach((key) => {
           unlockPayload[key] = '0';
         });
+
+        const afs = this.approvableFeeSchedules?.find(
+          (item) => item.ccfriApplicationId === facility.ccfriApplicationId,
+        );
+        if (afs?.afsStatus === AFS_STATUSES.UPLOAD_DOCUMENTS) {
+          unlockPayload.enableAfs = '0';
+        }
+
         if (Object.keys(unlockPayload).length > 0) {
           ccrfiRelockPayload.push({ ...applicationIdPayload, ...unlockPayload });
         }
diff --git a/frontend/src/components/ccfriApplication/AFS/AfsDecisionCard.vue b/frontend/src/components/ccfriApplication/AFS/AfsDecisionCard.vue
new file mode 100644
index 00000000..5bd0df51
--- /dev/null
+++ b/frontend/src/components/ccfriApplication/AFS/AfsDecisionCard.vue
@@ -0,0 +1,63 @@
+<template>
+  <v-card elevation="2" class="pa-4">
+    <div class="mb-2">Please select one of the following options regarding the approvable fee schedule:</div>
+    <v-radio-group v-model="updatedValue" :rules="rules.required" :disabled="readonly" color="primary">
+      <v-radio label="I accept" :value="AFS_STATUSES.ACCEPT" />
+      <div v-if="updatedValue === AFS_STATUSES.ACCEPT" class="text-body-2 pl-2">
+        After submission please wait to receive notification confirming your approval to participate in CCFRI.
+      </div>
+      <v-radio label="I want to upload supporting documents" :value="AFS_STATUSES.UPLOAD_DOCUMENTS" />
+      <v-radio label="I decline" :value="AFS_STATUSES.DECLINE" />
+      <div v-if="updatedValue === AFS_STATUSES.DECLINE" class="text-body-2 pl-2">
+        After submission please wait to receive confirmation from the ministry on the results of your CCFRI application.
+      </div>
+    </v-radio-group>
+  </v-card>
+</template>
+
+<script>
+import { AFS_STATUSES } from '@/utils/constants.js';
+import rules from '@/utils/rules.js';
+
+export default {
+  name: 'AfsDecisionCard',
+  props: {
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+    modelValue: {
+      type: Number,
+      default: null,
+    },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      updatedValue: null,
+    };
+  },
+  watch: {
+    modelValue: {
+      handler(value) {
+        this.updatedValue = value;
+      },
+    },
+    updatedValue: {
+      handler(value) {
+        this.$emit('update:modelValue', value);
+      },
+    },
+  },
+  created() {
+    this.updatedValue = this.modelValue;
+    this.AFS_STATUSES = AFS_STATUSES;
+    this.rules = rules;
+  },
+};
+</script>
+<style scoped>
+:deep(.v-label) {
+  opacity: 1;
+}
+</style>
diff --git a/frontend/src/components/ccfriApplication/AFS/ApprovableFeeSchedule.vue b/frontend/src/components/ccfriApplication/AFS/ApprovableFeeSchedule.vue
index 8068ef81..e5f2ee3b 100644
--- a/frontend/src/components/ccfriApplication/AFS/ApprovableFeeSchedule.vue
+++ b/frontend/src/components/ccfriApplication/AFS/ApprovableFeeSchedule.vue
@@ -67,29 +67,13 @@
           </div>
           <v-skeleton-loader :loading="isEmpty(afs)" type="table-tbody">
             <v-container fluid class="pa-0">
-              <v-card elevation="2" class="pa-4">
-                <div class="mb-2">
-                  Please select one of the following options regarding the approvable fee schedule:
-                </div>
-                <v-radio-group v-model="afs.afsStatus" :rules="rules.required" :disabled="isReadOnly" color="primary">
-                  <v-radio label="I accept" :value="AFS_STATUSES.ACCEPT" />
-                  <div v-if="afs?.afsStatus === AFS_STATUSES.ACCEPT" class="text-body-2 pl-2">
-                    After submission please wait to receive notification confirming your approval to participate in
-                    CCFRI.
-                  </div>
-                  <v-radio label="I want to upload supporting documents" :value="AFS_STATUSES.UPLOAD_DOCUMENTS" />
-                  <v-radio label="I decline" :value="AFS_STATUSES.DECLINE" />
-                  <div v-if="afs?.afsStatus === AFS_STATUSES.DECLINE" class="text-body-2 pl-2">
-                    After submission please wait to receive confirmation from the ministry on the results of your CCFRI
-                    application.
-                  </div>
-                </v-radio-group>
-              </v-card>
+              <AfsDecisionCard v-model="afs.afsStatus" />
               <AppDocumentUpload
                 v-if="afs?.afsStatus === AFS_STATUSES.UPLOAD_DOCUMENTS"
                 :loading="isLoading"
                 :uploaded-documents="filteredUploadedDocuments"
                 :document-type="DOCUMENT_TYPES.APPLICATION_AFS"
+                :show-error-message="showErrorMessage && !isSupportingDocumentsUploaded"
                 title="Upload Supporting Documents (for example receipts, quotes, invoices and/or budget/finance documents here)."
                 class="mt-8"
                 @update-documents-to-upload="updateDocumentsToUpload"
@@ -118,6 +102,7 @@
 import { mapState, mapActions } from 'pinia';
 import { isEmpty, cloneDeep } from 'lodash';
 
+import AfsDecisionCard from '@/components/ccfriApplication/AFS/AfsDecisionCard.vue';
 import ApprovableParentFeesCards from '@/components/ccfriApplication/AFS/ApprovableParentFeesCards.vue';
 import FacilityHeader from '@/components/guiComponents/FacilityHeader.vue';
 import AppDocumentUpload from '@/components/util/AppDocumentUpload.vue';
@@ -136,26 +121,12 @@ import rules from '@/utils/rules.js';
 
 export default {
   name: 'ApprovableFeeSchedule',
-  components: { AppDocumentUpload, ApprovableParentFeesCards, FacilityHeader, NavButton },
+  components: { AppDocumentUpload, AfsDecisionCard, ApprovableParentFeesCards, FacilityHeader, NavButton },
   mixins: [alertMixin],
   async beforeRouteLeave(_to, _from, next) {
     await this.save(false);
     next();
   },
-  props: {
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-    ccfriApplicationId: {
-      type: String,
-      default: '',
-    },
-    facilityId: {
-      type: String,
-      default: '',
-    },
-  },
   data() {
     return {
       afs: {},
@@ -163,6 +134,7 @@ export default {
       uploadedDocumentsToDelete: [],
       isValidForm: false,
       processing: false,
+      showErrorMessage: false,
     };
   },
   computed: {
@@ -177,9 +149,7 @@ export default {
     ...mapState(useCcfriAppStore, ['approvableFeeSchedules']),
     ...mapState(useNavBarStore, ['navBarList', 'nextPath', 'previousPath']),
     currentFacility() {
-      return this.facilityId
-        ? this.navBarList?.find((el) => el.facilityId === this.facilityId)
-        : this.navBarList?.find((el) => el.ccfriApplicationId === this.$route.params.urlGuid);
+      return this.navBarList?.find((el) => el.ccfriApplicationId === this.$route.params.urlGuid);
     },
     filteredUploadedDocuments() {
       return this.applicationUploadedDocuments?.filter(
@@ -193,7 +163,7 @@ export default {
     },
     // Note: CCFRI-3752 - AFS for change request is not in scope at this time.
     isReadOnly() {
-      return this.readonly || this.isLoading || (this.isApplicationSubmitted && !this.currentFacility?.unlockAfs);
+      return this.isLoading || (this.isApplicationSubmitted && !this.currentFacility?.unlockAfs);
     },
     isSupportingDocumentsUploaded() {
       return this.filteredUploadedDocuments?.length + this.documentsToUpload?.length > 0;
@@ -214,6 +184,7 @@ export default {
     '$route.params.urlGuid': {
       handler() {
         this.reloadAfs();
+        this.$refs.form?.validate();
       },
     },
   },
@@ -230,15 +201,14 @@ export default {
     ...mapActions(useSupportingDocumentUploadStore, ['saveUploadedDocuments']),
     isEmpty,
     reloadAfs() {
-      this.afs = this.ccfriApplicationId
-        ? this.approvableFeeSchedules?.find((item) => item.ccfriApplicationId === this.ccfriApplicationId)
-        : this.approvableFeeSchedules?.find((item) => item.ccfriApplicationId === this.$route.params.urlGuid);
+      this.afs = this.approvableFeeSchedules?.find((item) => item.ccfriApplicationId === this.$route.params.urlGuid);
     },
     next() {
       this.$router.push(this.nextPath);
     },
     validateForm() {
       this.$refs.form?.validate();
+      this.showErrorMessage = true;
     },
     back() {
       this.$router.push(this.previousPath);
@@ -251,9 +221,11 @@ export default {
         const payload = {
           afsStatus: this.afs?.afsStatus,
         };
-        await this.updateApplicationCCFRI(this.$route.params.urlGuid, payload);
-        await this.processDocumentsToUpload();
-        await DocumentService.deleteDocuments(this.uploadedDocumentsToDelete);
+        await Promise.all([
+          this.updateApplicationCCFRI(this.$route.params.urlGuid, payload),
+          this.processDocumentsToUpload(),
+          DocumentService.deleteDocuments(this.uploadedDocumentsToDelete),
+        ]);
         await this.getApplicationUploadedDocuments();
         this.setNavBarAfsComplete({ ccfriId: this.$route.params.urlGuid, complete: this.isFormComplete });
         if (showMessage) {
diff --git a/frontend/src/components/summary/group/AFSSummary.vue b/frontend/src/components/summary/group/AFSSummary.vue
index 92b49377..ab2e4533 100644
--- a/frontend/src/components/summary/group/AFSSummary.vue
+++ b/frontend/src/components/summary/group/AFSSummary.vue
@@ -1,37 +1,62 @@
 <template>
   <v-row no-gutters class="d-flex flex-column">
-    <v-form ref="afsSummaryForm" v-model="isValidForm">
+    <v-form ref="afsSummaryForm">
       <v-expansion-panel-title>
         <h4 style="color: #003466">
           Approvable Fee Schedule
           <v-icon v-if="isValidForm" color="green" size="large"> mdi-check-circle-outline </v-icon>
           <v-icon v-if="!isValidForm" color="#ff5252" size="large"> mdi-alert-circle-outline </v-icon>
-          <span v-if="!isValidForm" style="color: #ff5252"
-            >Your form is missing required information. Click here to view</span
-          >
+          <span v-if="!isValidForm" style="color: #ff5252">
+            Your form is missing required information. Click here to view
+          </span>
         </h4>
       </v-expansion-panel-title>
       <v-expansion-panel-text eager class="ml-2">
-        <span class="summary-label pt-3">
-          Did you apply for Ministry funding to create new licensed spaces prior to April 1, 2021 (e.g. New Spaces Fund,
-          UBCM Community Child Care Space Creation Program, Start-up Grants, Rapid Renovation Funding)?</span
-        >
-        <ApprovableFeeSchedule :read-only="true" :facility-id="facilityId" :ccfri-application-id="ccfriId" />
+        <ApprovableParentFeesCards :loading="isEmpty(afs)" :approvable-fee-schedules="afs?.approvableFeeSchedules" />
+        <AfsDecisionCard v-if="!isEmpty(afs)" v-model="afs.afsStatus" :readonly="true" class="mb-4" />
+        <template v-if="afs?.afsStatus === AFS_STATUSES.UPLOAD_DOCUMENTS">
+          <template v-if="isEmpty(filteredUploadedDocuments)">
+            <v-card elevation="2" class="pa-4">
+              <h3>Uploaded Documents</h3>
+              <div class="error-message mt-4">Required</div>
+            </v-card>
+          </template>
+          <AppDocumentUpload
+            v-else
+            :loading="false"
+            :readonly="true"
+            :uploaded-documents="filteredUploadedDocuments"
+            :document-type="DOCUMENT_TYPES.APPLICATION_AFS"
+          />
+        </template>
+
+        <div class="mt-6">
+          <router-link v-if="!isValidForm" :to="getLink()">
+            <u class="error-message">To add this information, click here. This will bring you to a different page.</u>
+          </router-link>
+        </div>
       </v-expansion-panel-text>
     </v-form>
   </v-row>
 </template>
 <script>
+import { isEmpty } from 'lodash';
 import { mapState } from 'pinia';
 
-import ApprovableFeeSchedule from '@/components/ccfriApplication/AFS/ApprovableFeeSchedule.vue';
-import rules from '../../../utils/rules.js';
-import { PATHS, pcfUrlGuid } from '../../../utils/constants.js';
+import AfsDecisionCard from '@/components/ccfriApplication/AFS/AfsDecisionCard.vue';
+import ApprovableParentFeesCards from '@/components/ccfriApplication/AFS/ApprovableParentFeesCards.vue';
+import AppDocumentUpload from '@/components/util/AppDocumentUpload.vue';
+import { useApplicationStore } from '@/store/application.js';
+import { useCcfriAppStore } from '@/store/ccfriApp.js';
+import { useSummaryDeclarationStore } from '@/store/summaryDeclaration';
+import { AFS_STATUSES, DOCUMENT_TYPES, PATHS, pcfUrlGuid } from '@/utils/constants.js';
 
 export default {
   name: 'AFSSummary',
   components: {
-    ApprovableFeeSchedule,
+    AfsDecisionCard,
+    ApprovableParentFeesCards,
+    AppDocumentUpload,
   },
   props: {
     ccfriId: {
@@ -50,9 +75,7 @@ export default {
   emits: ['isSummaryValid'],
   data() {
     return {
-      PATHS,
-      rules,
-      isValidForm: true,
+      afs: {},
       formObj: {
         formName: 'AFSSummary',
         formId: this.facilityId,
@@ -60,20 +83,50 @@ export default {
     };
   },
   computed: {
-    ...mapState('summaryDeclaration', ['isLoadingComplete']),
+    ...mapState(useApplicationStore, ['applicationUploadedDocuments']),
+    ...mapState(useCcfriAppStore, ['approvableFeeSchedules']),
+    ...mapState(useSummaryDeclarationStore, ['isLoadingComplete']),
+    filteredUploadedDocuments() {
+      return this.applicationUploadedDocuments?.filter(
+        (document) =>
+          document.documentType === DOCUMENT_TYPES.APPLICATION_AFS && document.facilityId === this.facilityId,
+      );
+    },
+    isValidForm() {
+      return (
+        [AFS_STATUSES.ACCEPT, AFS_STATUSES.DECLINE].includes(this.afs?.afsStatus) ||
+        (this.afs?.afsStatus === AFS_STATUSES.UPLOAD_DOCUMENTS && !isEmpty(this.filteredUploadedDocuments))
+      );
+    },
+  },
+  watch: {
+    isLoadingComplete: {
+      handler: function (val) {
+        if (val) {
+          this.$refs.afsSummaryForm?.validate();
+          this.$emit('isSummaryValid', this.formObj, this.isValidForm);
+        }
+      },
+    },
+    approvableFeeSchedules: {
+      handler() {
+        this.reloadAfs();
+      },
+    },
+  },
+  created() {
+    this.AFS_STATUSES = AFS_STATUSES;
+    this.DOCUMENT_TYPES = DOCUMENT_TYPES;
+    this.PATHS = PATHS;
+    this.reloadAfs();
   },
-  // watch: {
-  //   isLoadingComplete: {
-  //     handler: function (val) {
-  //       if (val) {
-  //         this.$emit('isSummaryValid', this.formObj, this.isValidForm);
-  //       }
-  //     },
-  //   },
-  // },
   methods: {
+    isEmpty,
+    reloadAfs() {
+      this.afs = this.approvableFeeSchedules?.find((item) => item.ccfriApplicationId === this.ccfriId);
+    },
     getLink() {
-      return pcfUrlGuid(PATHS.CCFRI_NMF, this.programYearId, this.ccfriId);
+      return pcfUrlGuid(PATHS.CCFRI_AFS, this.programYearId, this.ccfriId);
     },
   },
 };
@@ -84,9 +137,9 @@ export default {
   font-size: small;
 }
 
->>> ::placeholder {
-  color: #ff5252 !important;
-  opacity: 1;
+:deep(::placeholder) {
+  color: red !important;
+  opacity: 1 !important;
 }
 
 .summary-value {
@@ -109,4 +162,8 @@ export default {
   font-size: small;
   font-weight: bold;
 }
+
+.error-message {
+  color: #ff5252;
+}
 </style>
diff --git a/frontend/src/components/util/AppDocumentUpload.vue b/frontend/src/components/util/AppDocumentUpload.vue
index 87113b22..ad5916f6 100644
--- a/frontend/src/components/util/AppDocumentUpload.vue
+++ b/frontend/src/components/util/AppDocumentUpload.vue
@@ -1,14 +1,16 @@
 <template>
   <v-form>
-    <div class="mb-2">
-      <span class="text-h6 font-weight-bold mr-6">{{ title }}</span>
-      <span> (Required)</span>
-    </div>
-    <div class="mb-4">
-      The maximum file size is 2MB for each document. Accepted file types are jpg, jpeg, heic, png, pdf, docx, doc, xls,
-      and xlsx.
-    </div>
-    <v-card elevation="2" class="pa-4 my-4">
+    <template v-if="!readonly">
+      <div class="mb-2">
+        <span class="text-h6 font-weight-bold mr-6">{{ title }}</span>
+        <span> (Required)</span>
+      </div>
+      <div class="mb-4">
+        The maximum file size is 2MB for each document. Accepted file types are jpg, jpeg, heic, png, pdf, docx, doc,
+        xls, and xlsx.
+      </div>
+    </template>
+    <v-card elevation="2" :class="!readonly ? 'pa-4 my-4' : ''">
       <AppButton
         v-if="showAddFileButton"
         id="add-new-file"
@@ -64,13 +66,7 @@
           <template #bottom><!-- no paging --></template>
         </v-data-table>
       </div>
-      <div>
-        <v-row>
-          <v-col>
-            <slot></slot>
-          </v-col>
-        </v-row>
-      </div>
+      <div v-if="showErrorMessage" class="error-message">Required</div>
     </v-card>
   </v-form>
 </template>
@@ -101,6 +97,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showErrorMessage: {
+      type: Boolean,
+      default: false,
+    },
     uploadedDocuments: {
       type: Array,
       default: () => [],
@@ -249,4 +249,8 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.error-message {
+  color: #ff5252;
+}
 </style>
diff --git a/frontend/src/components/util/NavBar.vue b/frontend/src/components/util/NavBar.vue
index a430573a..c3471f96 100644
--- a/frontend/src/components/util/NavBar.vue
+++ b/frontend/src/components/util/NavBar.vue
@@ -232,8 +232,10 @@ export default {
     async loadData() {
       try {
         if (this.isApplication) {
-          await this.getApprovableFeeSchedulesForFacilities(this.userProfileList);
-          await this.getApplicationUploadedDocuments();
+          await Promise.all([
+            this.getApprovableFeeSchedulesForFacilities(this.userProfileList),
+            this.getApplicationUploadedDocuments(),
+          ]);
           this.checkApprovableFeeSchedulesComplete();
         }
       } catch (error) {
diff --git a/frontend/src/store/summaryDeclaration.js b/frontend/src/store/summaryDeclaration.js
index 40b9596e..4ce2362c 100644
--- a/frontend/src/store/summaryDeclaration.js
+++ b/frontend/src/store/summaryDeclaration.js
@@ -4,6 +4,7 @@ import ApiService from '@/common/apiService.js';
 import { useAppStore } from '@/store/app.js';
 import { useApplicationStore } from '@/store/application.js';
 import { useAuthStore } from '@/store/auth.js';
+import { useCcfriAppStore } from '@/store/ccfriApp.js';
 import { useNavBarStore } from '@/store/navBar.js';
 import { useReportChangesStore } from '@/store/reportChanges.js';
 import { ApiRoutes, CHANGE_REQUEST_TYPES } from '@/utils/constants.js';
@@ -178,6 +179,7 @@ export const useSummaryDeclarationStore = defineStore('summaryDeclaration', {
       checkSession();
       const appStore = useAppStore();
       const applicationStore = useApplicationStore();
+      const ccfriAppStore = useCcfriAppStore();
       const navBarStore = useNavBarStore();
 
       let appID = applicationStore?.applicationMap?.get(applicationStore?.programYearId)?.applicationId;
@@ -206,6 +208,10 @@ export const useSummaryDeclarationStore = defineStore('summaryDeclaration', {
         let isSummaryLoading = new Array(summaryModel.facilities.length).fill(true);
 
         this.setIsSummaryLoading(isSummaryLoading);
+        await Promise.all([
+          ccfriAppStore.getApprovableFeeSchedulesForFacilities(navBarStore.userProfileList),
+          applicationStore.getApplicationUploadedDocuments(),
+        ]);
 
         //new app only?
         if (!applicationStore.isRenewal && payload.application?.organizationId) {
@@ -231,7 +237,6 @@ export const useSummaryDeclarationStore = defineStore('summaryDeclaration', {
               config,
             )
           ).data;
-          console.info('allDocuments', summaryModel['allDocuments'].length);
         }
 
         for (const facility of summaryModel.facilities) {