diff --git a/apps/redi-talent-pool/src/components/organisms/company-profile-editables/EditableJobPostings.tsx b/apps/redi-talent-pool/src/components/organisms/company-profile-editables/EditableJobPostings.tsx
index 65c2083f2..7daff72ac 100644
--- a/apps/redi-talent-pool/src/components/organisms/company-profile-editables/EditableJobPostings.tsx
+++ b/apps/redi-talent-pool/src/components/organisms/company-profile-editables/EditableJobPostings.tsx
@@ -141,7 +141,8 @@ const MIN_CHARS_COUNT = 200
 
 const validationSchema = Yup.object().shape({
   title: Yup.string().required('Please provide a job title'),
-  location: Yup.string().required('Please provide a location'),
+  location: Yup.string().required('Please provide a work location'),
+  federalState: Yup.array().min(1, 'Please select at least one federal state'),
   summary: Yup.string().required().min(MIN_CHARS_COUNT),
   relatesToPositions: Yup.array().min(
     1,
@@ -259,15 +260,17 @@ function ModalForm({
           />
           <FormInput
             name={`location`}
-            placeholder="Where is the position based"
-            label="Location*"
+            placeholder="City where is the position based"
+            label="City*"
             {...formik}
           />
           <FormSelect
             name="federalState"
-            label="Location (Federal State in Germany)"
+            label="Federal State in Germany*"
+            placeholder="State where is the position based"
             items={federalStatesOptions}
             {...formik}
+            multiselect
           />
           <Checkbox.Form
             name="isRemotePossible"
diff --git a/libs/shared-types/src/lib/TpJobListing.ts b/libs/shared-types/src/lib/TpJobListing.ts
index fc63dd402..f244e6377 100644
--- a/libs/shared-types/src/lib/TpJobListing.ts
+++ b/libs/shared-types/src/lib/TpJobListing.ts
@@ -4,6 +4,7 @@ export type TpJobListing = {
   id: string
   title?: string
   location?: string
+  federalState: string[]
   summary?: string
   idealTechnicalSkills?: string[]
   relatesToPositions?: string[]