diff --git a/src/main/java/org/ilgcc/app/inputs/Providerresponse.java b/src/main/java/org/ilgcc/app/inputs/Providerresponse.java
index 710d9f24b..d0669306f 100644
--- a/src/main/java/org/ilgcc/app/inputs/Providerresponse.java
+++ b/src/main/java/org/ilgcc/app/inputs/Providerresponse.java
@@ -6,7 +6,9 @@
 import formflow.library.utils.RegexUtils;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Pattern;
+import java.util.List;
 
 public class Providerresponse extends FlowInputs {
 
@@ -118,4 +120,7 @@ public class Providerresponse extends FlowInputs {
     private String providerTaxIdSSN;
     @Pattern(regexp = "\\d{9}", message = "{registration-tax-id-ein.error}")
     private String providerTaxIdEIN;
+    @NotEmpty(message = "{registration-service-languages.error}")
+    private List<String> providerLanguagesOffered;
+    private String providerLanguagesOffered_other;
 }
diff --git a/src/main/java/org/ilgcc/app/pdf/ProviderLanguagesPreparer.java b/src/main/java/org/ilgcc/app/pdf/ProviderLanguagesPreparer.java
new file mode 100644
index 000000000..96d453d53
--- /dev/null
+++ b/src/main/java/org/ilgcc/app/pdf/ProviderLanguagesPreparer.java
@@ -0,0 +1,60 @@
+package org.ilgcc.app.pdf;
+
+import formflow.library.data.Submission;
+import formflow.library.pdf.PdfMap;
+import formflow.library.pdf.SingleField;
+import formflow.library.pdf.SubmissionField;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import org.ilgcc.app.utils.enums.ProviderLanguagesOffered;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ProviderLanguagesPreparer extends ProviderSubmissionFieldPreparer {
+
+  @Override
+  public Map<String, SubmissionField> prepareSubmissionFields(Submission familySubmission, PdfMap pdfMap) {
+    var results = new HashMap<String, SubmissionField>();
+    Optional<Submission> providerSubmission = getProviderSubmission(familySubmission);
+    if (providerSubmission.isEmpty()) {
+      return results;
+    }
+
+    var providerInputData = providerSubmission.get().getInputData();
+    List<String> otherLanguages = new ArrayList<>();
+    if (providerInputData.containsKey("providerLanguagesOffered[]")) {
+      List<String> providerLanguagesOffered = (List<String>) providerInputData.get("providerLanguagesOffered[]");
+      if (providerLanguagesOffered.isEmpty() || providerLanguagesOffered.contains("NONE")) {
+        return results;
+      }
+
+      for (ProviderLanguagesOffered provider : ProviderLanguagesOffered.values()) {
+        if (providerLanguagesOffered.contains(provider.getValue())) {
+          if (!provider.getProviderLanguagePdfFieldValue().equalsIgnoreCase("Other")) {
+            String pdfMapInputName = String.format("providerLanguage%s", provider.getValue());
+            results.put(pdfMapInputName, new SingleField(pdfMapInputName, "true", null));
+          } else {
+            results.put("providerLanguageOther", new SingleField("providerLanguageOther", "true", null));
+            otherLanguages.add(provider.getProviderLanguageOtherDetailPdfFieldValue());
+          }
+        }
+      }
+
+      if (providerLanguagesOffered.contains("other")) {
+        if (otherLanguages.isEmpty()) {
+          results.put("providerLanguageOther", new SingleField("providerLanguageOther", "true", null));
+        }
+      }
+
+      if (!otherLanguages.isEmpty()) {
+        String otherLanguagesList = String.join(", ", otherLanguages);
+        results.put("providerLanguageOtherDetail", new SingleField("providerLanguageOtherDetail", otherLanguagesList, null));
+      }
+      return results;
+    }
+    return results;
+  }
+}
diff --git a/src/main/java/org/ilgcc/app/utils/enums/ProviderLanguagesOffered.java b/src/main/java/org/ilgcc/app/utils/enums/ProviderLanguagesOffered.java
new file mode 100644
index 000000000..4b792e8bb
--- /dev/null
+++ b/src/main/java/org/ilgcc/app/utils/enums/ProviderLanguagesOffered.java
@@ -0,0 +1,28 @@
+package org.ilgcc.app.utils.enums;
+
+import lombok.Getter;
+
+@Getter
+
+public enum ProviderLanguagesOffered {
+  ENGLISH("registration-service-languages.provider-languages.english", "English", "ENGLISH", ""),
+  SPANISH("registration-service-languages.provider-languages.spanish" ,"Spanish", "SPANISH", ""),
+  POLISH("registration-service-languages.provider-languages.polish","Polish", "POLISH", ""),
+  CHINESE("registration-service-languages.provider-languages.chinese" ,"Chinese", "CHINESE", ""),
+  TAGALOG("registration-service-languages.provider-languages.tagalog", "Tagalog","OTHER",
+      "Tagalog (including Filipino)"),
+  HINDI("registration-service-languages.provider-languages.hindi", "Hindi","OTHER", "Hindi"),
+  ARABIC("registration-service-languages.provider-languages.arabic", "Arabic","OTHER", "Arabic");
+  private final String label;
+  private final String value;
+  private final String providerLanguagePdfFieldValue;
+  private final String providerLanguageOtherDetailPdfFieldValue;
+
+  ProviderLanguagesOffered(String label, String value ,String providerLanguagePdfFieldValue, String providerLanguageOtherDetailPdfFieldValue) {
+    this.label = label;
+    this.value = value;
+    this.providerLanguagePdfFieldValue = providerLanguagePdfFieldValue;
+    this.providerLanguageOtherDetailPdfFieldValue = providerLanguageOtherDetailPdfFieldValue;
+  }
+}
+
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 1e360d4c3..9f68aa86e 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -1364,14 +1364,14 @@ registration-tax-id.reveal-body=Providers can be paid by paper check, direct dep
 registration-tax-id.ssn=SSN (Social Security Number)
 registration-tax-id.fein=FEIN (Federal Employer Identification Number)
 
-#registration-tax-id-ssn
+# registration-tax-id-ssn
 registration-tax-id-ssn.title=SSN
 registration-tax-id-ssn.header=What is your Social Security Number?
 registration-tax-id-ssn.helper=You don't need it to register for CCAP, but you will need it to get paid.
 registration-tax-id-ssn.linkText=Your information is secure and will be handled in accordance with our <a id='link-to-ilgcc-privacy-policy' href="/privacy" target="_blank" rel="noopener noreferrer">privacy policy</a>.
 registration-tax-id-ssn.error=Make sure the SSN is valid and 9 digits
 
-#registration-tax-id-ein
+# registration-tax-id-ein
 registration-tax-id-ein.title=Employer Identification Number (EIN)
 registration-tax-id-ein.header=What is your Employer Identification Number (EIN)?
 registration-tax-id-ein.helper=This is also known as a federal tax identification number. This isn't required to register for CCAP, but will be required in order to actually get paid by CCAP.
@@ -1382,6 +1382,20 @@ registration-start-date.title=Child care start date
 registration-start-date.header=When do you plan to start child care services under CCAP?
 registration-start-date.subtext=<p>If you are not sure, enter the date the family requested you start care on.</p><p>You can be paid by CCAP for child care services <strong>up to 7 business days</strong> before the CCR&R receives your application.</p><div class="notice notice--gray spacing-below-60">If there is already a date below, it has been pre-filled from the family's CCAP application. It represents the first day they want child care.</div>
 
+# registration-service-languages
+registration-service-languages.title=Child care service languages
+registration-service-languages.header=What language(s) do you provide services in?
+registration-service-languages.provider-languages.english=English
+registration-service-languages.provider-languages.spanish=Spanish
+registration-service-languages.provider-languages.polish=Polish
+registration-service-languages.provider-languages.chinese=Chinese (including Mandarin, Cantonese)
+registration-service-languages.provider-languages.tagalog=Tagalog (including Filipino)
+registration-service-languages.provider-languages.hindi=Hindi
+registration-service-languages.provider-languages.arabic=Arabic
+registration-service-languages.provider-languages.other=Other
+registration-service-languages.provider-languages.other-follow-up=Please tell us what other language(s) you provide services in.
+registration-service-languages.error=Select an option
+
 # registration-checks-trainings-intro
 registration-checks-trainings-intro.title=Background checks and trainings
 registration-checks-trainings-intro.1=Your background history
diff --git a/src/main/resources/pdf-map.yaml b/src/main/resources/pdf-map.yaml
index 551e6a4a9..807be0143 100644
--- a/src/main/resources/pdf-map.yaml
+++ b/src/main/resources/pdf-map.yaml
@@ -168,6 +168,12 @@ inputFields:
   providerConvictionExplanation: PROVIDER_CONVICTION_EXPLANATION
   providerIdentityCheckDateOfBirthDate: PROVIDER_DOB
   providerSSN: PROVIDER_SSN
+  providerLanguageEnglish: PROVIDER_LANGUAGE_ENGLISH
+  providerLanguageSpanish: PROVIDER_LANGUAGE_SPANISH
+  providerLanguagePolish: PROVIDER_LANGUAGE_POLISH
+  providerLanguageChinese: PROVIDER_LANGUAGE_CHINESE
+  providerLanguageOther: PROVIDER_LANGUAGE_OTHER
+  providerLanguageOtherDetail: PROVIDER_LANGUAGE_OTHER_DETAIL
   providerSignature: PROVIDER_SIGNATURE
   providerTaxIdEIN: PROVIDER_FEIN
   providerSignatureDate: PROVIDER_SIGNATURE_DATE
diff --git a/src/main/resources/pdfs/IL-CCAP-Form.pdf b/src/main/resources/pdfs/IL-CCAP-Form.pdf
index 737ac757c..e8c47336d 100644
Binary files a/src/main/resources/pdfs/IL-CCAP-Form.pdf and b/src/main/resources/pdfs/IL-CCAP-Form.pdf differ
diff --git a/src/main/resources/templates/providerresponse/registration-service-languages.html b/src/main/resources/templates/providerresponse/registration-service-languages.html
index 97d4587d8..0c13709b0 100644
--- a/src/main/resources/templates/providerresponse/registration-service-languages.html
+++ b/src/main/resources/templates/providerresponse/registration-service-languages.html
@@ -1,28 +1,40 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/head :: head(title='TEMPLATE')}"></head>
-<body>
-<div class="page-wrapper">
-  <div th:replace="~{fragments/toolbar :: toolbar}"></div>
-  <section class="slab">
-    <div class="grid">
-      <div th:replace="~{fragments/goBack :: goBackLink}"></div>
-      <main id="content" role="main" class="form-card spacing-above-35">
-        <th:block th:replace="~{fragments/cardHeader :: cardHeader(header='#{placeholder}', subtext='#{placeholder}')}"/>
-        <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
-          <th:block th:ref="formContent">
-            <div class="form-card__content">
-
-            </div>
-            <div class="form-card__footer">
-              <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(text=#{general.inputs.continue})}"/>
-            </div>
-          </th:block>
-        </th:block>
-      </main>
-    </div>
-  </section>
-</div>
-<th:block th:replace="~{fragments/footer :: footer}"/>
-</body>
-</html>
\ No newline at end of file
+<th:block
+  th:replace="~{fragments/screens/screenWithOneInput ::
+  screenWithOneInput(
+    title=#{registration-service-languages.title},
+    header=#{registration-service-languages.header},
+    iconFragment=~{fragments/gcc-icons :: language-preference},
+    required='true',
+    buttonLabel=#{general.inputs.continue},
+    formAction=${formAction},
+    inputContent=~{::inputContent})}">
+  <th:block th:ref="inputContent">
+<th:block th:replace="~{fragments/inputs/checkboxFieldset ::
+  checkboxFieldset(inputName='providerLanguagesOffered',
+  noneOfTheAboveLabel=#{general.inputs.prefer-not-to-answer},
+  ariaLabel='header',
+  content=~{::providerLanguagesContent})}">
+    <th:block th:ref="providerLanguagesContent">
+      <th:block th:each="option : ${T(org.ilgcc.app.utils.enums.ProviderLanguagesOffered).values()}">
+        <th:block th:replace="~{fragments/inputs/checkboxInSet ::
+                          checkboxInSet(inputName=${inputName},
+                          value=${option.getValue()},
+                          label=${#strings.isEmpty(option.getLabel()) ? null : #messages.msg(option.getLabel())})}"/>
+      </th:block>
+      <div class="question-with-follow-up spacing-below-15">
+        <div class="question-with-follow-up__question">
+          <th:block
+              th:replace="~{fragments/inputs/checkboxInSet :: checkboxInSet(inputName=${inputName},value='other', label=#{registration-service-languages.provider-languages.other}, followUpId='#provider-languages-other-followUp')}"/>
+        </div>
+        <div class="question-with-follow-up__follow-up" id="provider-languages-other-followUp">
+          <th:block th:replace="~{fragments/inputs/text ::
+                            text(inputName='providerLanguagesOffered_other',
+                            label=#{registration-service-languages.provider-languages.other-follow-up})}"/>
+        </div>
+      </div>
+      <th:block th:replace="~{fragments/inputs/checkboxInSet ::
+            checkboxInSet(inputName=${inputName}, value='NONE', label=${noneOfTheAboveLabel}, noneOfTheAbove=true)}"/>
+    </th:block>
+</th:block>
+  </th:block>
+</th:block>
\ No newline at end of file
diff --git a/src/test/java/org/ilgcc/app/journeys/ProviderresponseProviderRegistrationJourneyTest.java b/src/test/java/org/ilgcc/app/journeys/ProviderresponseProviderRegistrationJourneyTest.java
index 5b53ee4bf..4c155adaf 100644
--- a/src/test/java/org/ilgcc/app/journeys/ProviderresponseProviderRegistrationJourneyTest.java
+++ b/src/test/java/org/ilgcc/app/journeys/ProviderresponseProviderRegistrationJourneyTest.java
@@ -119,6 +119,15 @@ void BasicInfoFlow() {
         testPage.enter("providerTaxIdSSN", "333-22-2222");
         testPage.clickContinue();
 
+        //registration-service-languages-error
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-service-languages.title"));
+        testPage.clickContinue();
+        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.error"))).isTrue();
+
+        //registration-service-languages
+        testPage.clickElementById("providerLanguagesOffered-English-label");
+        testPage.clickContinue();
+
     }
 
     @Test
@@ -206,12 +215,18 @@ void LicenseExemptInProviderHomeFlow() {
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-tax-id.title"));
         testPage.clickElementById("providerTaxIdType-SSN-label");
         testPage.clickContinue();
-        //
+
         assertThat(testPage.getTitle()).isNotEqualTo(getEnMessage("registration-tax-id-ssn.title"));
         assertThat(testPage.getTitle()).isNotEqualTo(getEnMessage("registration-tax-id-ein.title"));
 
-        // registration-service-languages
-//        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.title"))).isTrue();
+        //registration-service-languages-error
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-service-languages.title"));
+        testPage.clickContinue();
+        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.error"))).isTrue();
+
+        //registration-service-languages
+        testPage.clickElementById("providerLanguagesOffered-other");
+        testPage.enter("providerLanguagesOffered_other", "Test");
         testPage.clickContinue();
 
         // registration-start-date
@@ -350,8 +365,12 @@ void LicenseExemptInChildHomeFlow() {
         testPage.enter("providerTaxIdEIN", "123456789");
         testPage.clickContinue();
 
-        // registration-service-languages
-//        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.title"))).isTrue();
+        //Test Prefer Not to Answer Implementation
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-service-languages.title"));
+        testPage.clickElementById("providerLanguagesOffered-English-label");
+        assertThat(testPage.findElementById("providerLanguagesOffered-English").isSelected()).isTrue();
+        testPage.clickElementById("none__checkbox-providerLanguagesOffered");
+        assertThat(testPage.findElementById("providerLanguagesOffered-English").isSelected()).isFalse() ;
         testPage.clickContinue();
 
         // registration-start-date
@@ -462,12 +481,26 @@ void LicensedChildCareHomeFlow() {
         testPage.clickElementById("providerTaxIdType-SSN-label");
         testPage.clickContinue();
 
-        //
         assertThat(testPage.getTitle()).isNotEqualTo(getEnMessage("registration-tax-id-ssn.title"));
         assertThat(testPage.getTitle()).isNotEqualTo(getEnMessage("registration-tax-id-ein.title"));
 
-        // registration-service-languages
-//        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.title"))).isTrue();
+        //registration-service-languages
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-service-languages.title"));
+        testPage.clickElementById("providerLanguagesOffered-Arabic-label");
+        testPage.clickElementById("providerLanguagesOffered-Chinese-label");
+        testPage.clickElementById("providerLanguagesOffered-Polish-label");
+        testPage.clickElementById("providerLanguagesOffered-Tagalog-label");
+        testPage.clickElementById("providerLanguagesOffered-other");
+        testPage.enter("providerLanguagesOffered_other", "Test");
+        testPage.clickContinue();
+        testPage.goBack();
+
+        assertThat(testPage.findElementById("providerLanguagesOffered-Arabic").isSelected()).isTrue();
+        assertThat(testPage.findElementById("providerLanguagesOffered-Tagalog").isSelected()).isTrue();
+        assertThat(testPage.findElementById("providerLanguagesOffered-Chinese").isSelected()).isTrue();
+        assertThat(testPage.findElementById("providerLanguagesOffered-English-label").isSelected()).isFalse();
+        assertThat(testPage.findElementById("providerLanguagesOffered-other").isSelected()).isTrue();
+        assertThat(testPage.getInputValue("providerLanguagesOffered_other")).isEqualTo("Test");
         testPage.clickContinue();
 
         // registration-start-date
@@ -580,8 +613,13 @@ void LicensedChildCareCenterFlow() {
         testPage.enter("providerTaxIdEIN", "123456789");
         testPage.clickContinue();
 
-        // registration-service-languages
-//        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.title"))).isTrue();
+        //registration-service-languages-error
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-service-languages.title"));
+        testPage.clickContinue();
+        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.error"))).isTrue();
+
+        //registration-service-languages
+        testPage.clickElementById("providerLanguagesOffered-Polish-label");
         testPage.clickContinue();
 
         // registration-start-date
@@ -693,8 +731,13 @@ void LicensedGroupChildCareHomeFlow() {
         testPage.clickElementById("providerTaxIdType-SSN-label");
         testPage.clickContinue();
 
-        // registration-service-languages
-//        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.title"))).isTrue();
+        //registration-service-languages-error
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-service-languages.title"));
+        testPage.clickContinue();
+        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.error"))).isTrue();
+
+        //registration-service-languages
+        testPage.clickElementById("providerLanguagesOffered-Hindi-label");
         testPage.clickContinue();
 
         // registration-start-date
@@ -836,10 +879,14 @@ void LicenseExemptChildCareCenter() {
         testPage.clickElementById("providerTaxIdType-SSN-label");
         testPage.clickContinue();
 
+        //registration-tax-id-ssn.title
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-tax-id-ssn.title"));
+        testPage.enter("providerTaxIdSSN", "333-22-2222");
         testPage.clickContinue();
 
-        // registration-service-languages
-//        assertThat(testPage.hasErrorText(getEnMessage("registration-service-languages.title"))).isTrue();
+        //registration-service-languages
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("registration-service-languages.title"));
+        testPage.clickElementById("providerLanguagesOffered-Spanish-label");
         testPage.clickContinue();
 
         // registration-start-date
diff --git a/src/test/java/org/ilgcc/app/pdf/ProviderLanguagePreparerTest.java b/src/test/java/org/ilgcc/app/pdf/ProviderLanguagePreparerTest.java
new file mode 100644
index 000000000..9d3556a3a
--- /dev/null
+++ b/src/test/java/org/ilgcc/app/pdf/ProviderLanguagePreparerTest.java
@@ -0,0 +1,184 @@
+package org.ilgcc.app.pdf;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.ilgcc.app.utils.enums.ProviderLanguagesOffered.*;
+
+import formflow.library.data.Submission;
+import formflow.library.data.SubmissionRepositoryService;
+import formflow.library.pdf.SingleField;
+import formflow.library.pdf.SubmissionField;
+import java.util.List;
+import java.util.Map;
+import org.ilgcc.app.IlGCCApplication;
+import org.ilgcc.app.utils.SubmissionTestBuilder;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+@SpringBootTest(
+        classes = IlGCCApplication.class,
+        properties = "il-gcc.dts.expand-existing-provider-flow=true"
+)
+@ActiveProfiles("test")
+public class ProviderLanguagePreparerTest {
+
+
+    @Autowired
+    private ProviderLanguagesPreparer preparer;
+
+    @Autowired
+    private SubmissionRepositoryService submissionRepositoryService;
+    private Submission familySubmission;
+    private Submission providerSubmission;
+
+    @Test
+    public void doesNotSetProviderLanguageIfProviderLanguagesOfferedIsNone() {
+        providerSubmission = new SubmissionTestBuilder()
+                .withFlow("providerresponse")
+                .withProviderSubmissionData()
+                .with("providerLanguagesOffered[]", List.of("None"))
+                .build();
+        submissionRepositoryService.save(providerSubmission);
+
+        familySubmission = new SubmissionTestBuilder()
+                .withFlow("gcc")
+                .with("providerResponseSubmissionId", providerSubmission.getId())
+                .build();
+        Map<String, SubmissionField> result = preparer.prepareSubmissionFields(familySubmission, null);
+        assertThat(result.get("providerLanguageEnglish")).isEqualTo(null);
+        assertThat(result.get("providerLanguageSpanish")).isEqualTo(null);
+        assertThat(result.get("providerLanguagePolish")).isEqualTo(null);
+        assertThat(result.get("providerLanguageChinese")).isEqualTo(null);
+        assertThat(result.get("providerLanguageOther")).isEqualTo(null);
+        assertThat(result.get("providerLanguageOtherDetail")).isEqualTo(null);
+    }
+
+
+    @Test
+    public void doesNotSetProviderLanguageIfProviderLanguagesOfferedIsNotPresent() {
+        providerSubmission = new SubmissionTestBuilder()
+            .withFlow("providerresponse")
+            .withProviderSubmissionData()
+            .build();
+        submissionRepositoryService.save(providerSubmission);
+
+        familySubmission = new SubmissionTestBuilder()
+            .withFlow("gcc")
+            .with("providerResponseSubmissionId", providerSubmission.getId())
+            .build();
+        Map<String, SubmissionField> result = preparer.prepareSubmissionFields(familySubmission, null);
+        assertThat(result.get("providerLanguageEnglish")).isEqualTo(null);
+        assertThat(result.get("providerLanguageSpanish")).isEqualTo(null);
+        assertThat(result.get("providerLanguagePolish")).isEqualTo(null);
+        assertThat(result.get("providerLanguageChinese")).isEqualTo(null);
+        assertThat(result.get("providerLanguageOther")).isEqualTo(null);
+        assertThat(result.get("providerLanguageOtherDetail")).isEqualTo(null);
+    }
+    @Test
+    public void selectsProviderLanguageCheckboxesWhenProviderLanguagesOfferedIncludesSupportedLanguages() {
+        //English, Spanish, Polish, and Chinese languages have Provider Language checkboxes that can be selected
+        //Any other language that is included in the providerLanguages offered array results in the PROVIDER_LANGUAGE_OTHER field being set to true
+        providerSubmission = new SubmissionTestBuilder()
+            .withFlow("providerresponse")
+            .withProviderSubmissionData()
+            .with("providerLanguagesOffered[]", List.of("English", "Spanish", "Polish", "Chinese"))
+            .build();
+        submissionRepositoryService.save(providerSubmission);
+
+        familySubmission = new SubmissionTestBuilder()
+            .withFlow("gcc")
+            .with("providerResponseSubmissionId", providerSubmission.getId())
+            .build();
+        Map<String, SubmissionField> result = preparer.prepareSubmissionFields(familySubmission, null);
+        assertThat(result.get("providerLanguageEnglish")).isEqualTo(new SingleField("providerLanguageEnglish", "true", null));
+        assertThat(result.get("providerLanguageSpanish")).isEqualTo(new SingleField("providerLanguageSpanish", "true", null));
+        assertThat(result.get("providerLanguagePolish")).isEqualTo(new SingleField("providerLanguagePolish", "true", null));
+        assertThat(result.get("providerLanguageChinese")).isEqualTo(new SingleField("providerLanguageChinese", "true", null));
+        assertThat(result.get("providerLanguageOther")).isEqualTo(null);
+        assertThat(result.get("providerLanguageOtherDetail")).isEqualTo(null);
+    }
+    @Test
+    public void selectOtherCheckboxAndListLanguagesInOtherDetailWhenProviderLanguagesValueIsOther() {
+        providerSubmission = new SubmissionTestBuilder()
+                .withFlow("providerresponse")
+                .withProviderSubmissionData()
+                .with("providerLanguagesOffered[]", List.of("Tagalog", "Hindi"))
+                .build();
+        submissionRepositoryService.save(providerSubmission);
+
+        familySubmission = new SubmissionTestBuilder()
+                .withFlow("gcc")
+                .with("providerResponseSubmissionId", providerSubmission.getId())
+                .build();
+        Map<String, SubmissionField> result = preparer.prepareSubmissionFields(familySubmission, null);
+        assertThat(result.get("providerLanguageOther")).isEqualTo(new SingleField("providerLanguageOther", "true", null));
+        assertThat(result.get("providerLanguageOtherDetail")).isEqualTo(new SingleField("providerLanguageOtherDetail",
+            String.format("%s, %s", TAGALOG.getProviderLanguageOtherDetailPdfFieldValue(), HINDI.getProviderLanguageOtherDetailPdfFieldValue()), null));
+    }
+
+    @Test
+    public void whenOtherIsIncludedAsProviderLanguageOfferedSelectOtherCheckbox() {
+        String providerLanguagesOfferedOtherString = "test, double test, gibberish";
+        providerSubmission = new SubmissionTestBuilder()
+                .withFlow("providerresponse")
+                .withProviderSubmissionData()
+                .with("providerLanguagesOffered[]", List.of("other"))
+                .with("providerLanguagesOffered_other", providerLanguagesOfferedOtherString)
+                .build();
+        submissionRepositoryService.save(providerSubmission);
+
+        familySubmission = new SubmissionTestBuilder()
+                .withFlow("gcc")
+                .with("providerResponseSubmissionId", providerSubmission.getId())
+                .build();
+        Map<String, SubmissionField> result = preparer.prepareSubmissionFields(familySubmission, null);
+        assertThat(result.get("providerLanguageOther")).isEqualTo(new SingleField("providerLanguageOther", "true", null));
+        assertThat(result.get("providerLanguageOtherDetail")).isEqualTo(null);
+    }
+
+    @Test
+    public void shouldSelectOtherCheckboxAndAllOtherLanguagesExceptManuallyInputedLanguagesWhenOtherProviderLanguagesAreSelected() {
+        String providerLanguagesOfferedOtherString = "test, double gibberish";
+        providerSubmission = new SubmissionTestBuilder()
+                .withFlow("providerresponse")
+                .withProviderSubmissionData()
+                .with("providerLanguagesOffered[]", List.of("Tagalog", "other"))
+                .with("providerLanguagesOffered_other", providerLanguagesOfferedOtherString)
+                .build();
+        submissionRepositoryService.save(providerSubmission);
+
+        familySubmission = new SubmissionTestBuilder()
+                .withFlow("gcc")
+                .with("providerResponseSubmissionId", providerSubmission.getId())
+                .build();
+        Map<String, SubmissionField> result = preparer.prepareSubmissionFields(familySubmission, null);
+        assertThat(result.get("providerLanguageOther")).isEqualTo(new SingleField("providerLanguageOther", "true", null));
+        assertThat(result.get("providerLanguageOtherDetail")).isEqualTo(new SingleField("providerLanguageOtherDetail",
+            TAGALOG.getProviderLanguageOtherDetailPdfFieldValue(), null));
+    }
+
+    @Test
+    public void shouldSelectLanguagesWithCheckboxesAndOtherLanguagesCheckboxesExceptManuallyInputedLanguagesWhenLanguagesWithCheckboxesAndOtherProviderLanguagesAreSelected() {
+        String providerLanguagesOfferedOtherString = "test, double gibberish";
+        providerSubmission = new SubmissionTestBuilder()
+            .withFlow("providerresponse")
+            .withProviderSubmissionData()
+            .with("providerLanguagesOffered[]", List.of("English", "Tagalog", "Spanish", "Hindi","other"))
+            .with("providerLanguagesOffered_other", providerLanguagesOfferedOtherString)
+            .build();
+        submissionRepositoryService.save(providerSubmission);
+
+        familySubmission = new SubmissionTestBuilder()
+                .withFlow("gcc")
+                .with("providerResponseSubmissionId", providerSubmission.getId())
+                .build();
+        Map<String, SubmissionField> result = preparer.prepareSubmissionFields(familySubmission, null);
+        assertThat(result.get("providerLanguageEnglish")).isEqualTo(new SingleField("providerLanguageEnglish", "true", null));
+        assertThat(result.get("providerLanguageSpanish")).isEqualTo(new SingleField("providerLanguageSpanish", "true", null));
+        assertThat(result.get("providerLanguageOther")).isEqualTo(new SingleField("providerLanguageOther", "true", null));
+        assertThat(result.get("providerLanguageOtherDetail")).isEqualTo(new SingleField("providerLanguageOtherDetail",
+            String.format("%s, %s", TAGALOG.getProviderLanguageOtherDetailPdfFieldValue(), HINDI.getProviderLanguageOtherDetailPdfFieldValue()), null));
+        assertThat(result.get("providerLanguageChinese")).isNotEqualTo(new SingleField("providerLanguageChinese", "true", null));
+    }
+}
diff --git a/src/test/resources/output/test_filled_ccap.pdf b/src/test/resources/output/test_filled_ccap.pdf
index 0b9f92a2a..0180abe23 100644
Binary files a/src/test/resources/output/test_filled_ccap.pdf and b/src/test/resources/output/test_filled_ccap.pdf differ