diff --git a/CHANGELOG.md b/CHANGELOG.md
index c27d4c0f1f..a28036713d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+## [100.45.2](https://github.com/dhis2/capture-app/compare/v100.45.1...v100.45.2) (2023-11-29)
+
+
+### Bug Fixes
+
+* [DHIS2-15693] Rules not triggered on program update ([#3472](https://github.com/dhis2/capture-app/issues/3472)) ([2dbca1e](https://github.com/dhis2/capture-app/commit/2dbca1efe36ed0e166d4aea803505c30c79cb35d))
+
+## [100.45.1](https://github.com/dhis2/capture-app/compare/v100.45.0...v100.45.1) (2023-11-26)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([8f28703](https://github.com/dhis2/capture-app/commit/8f28703ae8b56cfee283ec1ce0ec2b13dfd91e30))
+
+# [100.45.0](https://github.com/dhis2/capture-app/compare/v100.44.7...v100.45.0) (2023-11-20)
+
+
+### Features
+
+* [DHIS2-13237] Enrollment coordinates in enrollment widget ([#3141](https://github.com/dhis2/capture-app/issues/3141)) ([2f2e52c](https://github.com/dhis2/capture-app/commit/2f2e52c3103e9cb48e77766701a9a5fc9af6ad48))
+
+## [100.44.7](https://github.com/dhis2/capture-app/compare/v100.44.6...v100.44.7) (2023-11-19)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([46fb227](https://github.com/dhis2/capture-app/commit/46fb2270b21c4dec57f4447232608d8dd3cfb9af))
+
+## [100.44.6](https://github.com/dhis2/capture-app/compare/v100.44.5...v100.44.6) (2023-11-16)
+
+
+### Bug Fixes
+
+* [DHIS2-15967] allow enrolling TEIs with mandatory TET attributes ([#3455](https://github.com/dhis2/capture-app/issues/3455)) ([cc87a8a](https://github.com/dhis2/capture-app/commit/cc87a8a993001d5b4cea8493a84a6798f481cc5a))
+
 ## [100.44.5](https://github.com/dhis2/capture-app/compare/v100.44.4...v100.44.5) (2023-11-10)
 
 
diff --git a/i18n/cs.po b/i18n/cs.po
index 4e2e113dd9..171ec3d5b0 100644
--- a/i18n/cs.po
+++ b/i18n/cs.po
@@ -43,7 +43,7 @@ msgstr ""
 "mějte však na paměti, že se tím zavřou další verze."
 
 msgid "View {{programName}} dashboard"
-msgstr ""
+msgstr "Zobrazit {{programName}} ovládací panel"
 
 msgid "View dashboard"
 msgstr "Zobrazit ovládací panel"
@@ -80,7 +80,7 @@ msgstr "chyba"
 
 msgid ""
 "Plugins are not yet available - Please contact your system administrator"
-msgstr ""
+msgstr "Pluginy zatím nejsou k dispozici – obraťte se na správce systému"
 
 msgid "This value is validating"
 msgstr "Tato hodnota se ověřuje"
@@ -161,13 +161,13 @@ msgid "Complete event"
 msgstr "Dokončit událost"
 
 msgid "{{ stageName }} - Basic info"
-msgstr ""
+msgstr "{{ stageName }} - Základní informace"
 
 msgid "{{ stageName }} - Status"
-msgstr ""
+msgstr "{{ stageName }} - Stav"
 
 msgid "Please select {{categoryName}}"
-msgstr ""
+msgstr "Vyberte prosím {{categoryName}}"
 
 msgid "A future date is not allowed"
 msgstr "Budoucí datum není povoleno"
@@ -185,10 +185,10 @@ msgid "Metadata error. see log for details"
 msgstr "Chyba metadat. viz log pro podrobnosti"
 
 msgid "{{ stageName }} - Details"
-msgstr ""
+msgstr "{{ stageName }} - Podrobnosti"
 
 msgid "{{ stageName }} - {{ sectionName }}"
-msgstr ""
+msgstr "{{ stageName }} - {{ sectionName }}"
 
 msgid "Assigned user"
 msgstr "Přiřazený uživatel"
@@ -395,6 +395,8 @@ msgid ""
 "This event has unsaved changes. Leaving this page without saving will lose "
 "these changes. Are you sure you want to discard unsaved changes?"
 msgstr ""
+"Tato událost obsahuje neuložené změny. Opuštěním této stránky bez uložení "
+"tyto změny ztratíte. Opravdu chcete zahodit neuložené změny?"
 
 msgid "No events to display"
 msgstr "Žádné události k zobrazení"
@@ -534,6 +536,9 @@ msgstr "začněte psát pro vyhledávání"
 msgid "suggestions could not be retrieved"
 msgstr "návrhy nelze načíst"
 
+msgid "No results found"
+msgstr "Nenalezeny žádné výsledky"
+
 msgid "No items to display"
 msgstr "Žádné položky k zobrazení"
 
@@ -607,13 +612,13 @@ msgid "Write comment"
 msgstr "Napsat komentář"
 
 msgid "was blanked out and hidden by your last action"
-msgstr ""
+msgstr "byla vymazána a skryta vaší poslední akcí"
 
 msgid "Notice"
-msgstr ""
+msgstr "Oznámení"
 
 msgid "Close the notice"
-msgstr ""
+msgstr "Zavřít oznámení"
 
 msgid "Use new Enrollment dashboard for {{programName}}"
 msgstr "Použít nový ovládací panel zápisu pro {{programName}}"
@@ -629,18 +634,29 @@ msgid ""
 "functionality in Capture is ongoing and will be added in upcoming app "
 "releases."
 msgstr ""
+"Kliknutím na přihlášení níže začnete používat nový ovládací panel registrace"
+" v aplikaci Capture pro tento program Tracker. V současné době existuje "
+"určitá funkce z aplikace Tracker Capture, která ještě nebyla přidána, včetně"
+" funkcí vztahů a doporučení. Práce na zahrnutí této funkce sledování do "
+"Capture pokračují a budou přidány v nadcházejících vydáních aplikace."
 
 msgid ""
 "The core team appreciates any feedback on this new functionality which is "
 "currently being beta tested, please report any issues and feedback in the "
 "DHIS2 JIRA project."
 msgstr ""
+"Základní tým oceňuje jakoukoli zpětnou vazbu k této nové funkcionalitě, "
+"která je v současné době beta testována, nahlaste prosím jakékoli problémy a"
+" zpětnou vazbu v projektu DHIS2 JIRA."
 
 msgid ""
 "Click the button below to opt-in to the new enrollment dashboard "
 "functionality in the Capture app (beta) for this Tracker program for all "
 "users."
 msgstr ""
+"Kliknutím na tlačítko níže se přihlásíte k nové funkci ovládacího panelu "
+"registrace v aplikaci Capture (beta) pro tento program Tracker pro všechny "
+"uživatele."
 
 msgid "Yes, opt in"
 msgstr "Ano, přihlásit se"
@@ -662,6 +678,7 @@ msgstr ""
 msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
+"Při načítání registrací došlo k chybě. Zadejte prosím platnou adresu URL."
 
 msgid "Enrollment Dashboard"
 msgstr "Ovládací panel zápisu"
@@ -704,19 +721,19 @@ msgstr ""
 "vyberte všechny kategorie."
 
 msgid "Invalid enrollment id {{enrollmentId}}."
-msgstr ""
+msgstr "Neplatné id zápisu {{enrollmentId}}."
 
 msgid "Choose an enrollment to view the dashboard."
 msgstr "Chcete-li zobrazit ovládací panel, vyberte zápis."
 
 msgid "There are no active enrollments."
-msgstr ""
+msgstr "Nejsou žádné aktivní zápisy."
 
 msgid "Add new enrollment for {{teiDisplayName}} in this program."
-msgstr ""
+msgstr "Přidejte nový zápis pro {{teiDisplayName}} v tomto programu."
 
 msgid "No access to program owner."
-msgstr ""
+msgstr "Žádný přístup k vlastníkovi programu."
 
 msgid "{{teiDisplayName}} is not enrolled in this program."
 msgstr "{{teiDisplayName}} není v tomto programu zapsán."
@@ -783,7 +800,7 @@ msgid "Refer"
 msgstr "Odkazovat"
 
 msgid "You can't add any more {{ programStageName }} events"
-msgstr ""
+msgstr "Nemůžete přidat žádné další události {{ programStageName }}"
 
 msgid "Cancel without saving"
 msgstr "Zrušit bez uložení"
@@ -847,7 +864,7 @@ msgid "New Enrollment in program{{escape}} {{programName}}"
 msgstr "Nový zápis do programu{{escape}} {{programName}}"
 
 msgid "Save {{trackedEntityTypeName}}"
-msgstr ""
+msgstr "Uložit {{trackedEntityTypeName}}"
 
 msgid "Save {{trackedEntityName}}"
 msgstr "Uložit {{trackedEntityName}}"
@@ -956,14 +973,11 @@ msgid "Search by attributes"
 msgstr "Hledání podle atributů"
 
 msgid "Could not retrieve metadata. Please try again later."
-msgstr ""
+msgstr "Nepodařilo se načíst metadata. Prosím zkuste to znovu později."
 
 msgid "Possible duplicates found"
 msgstr "Byly nalezeny možné duplikáty"
 
-msgid "No results found"
-msgstr "Nenalezeny žádné výsledky"
-
 msgid "An error occurred loading possible duplicates"
 msgstr "Při načítání možných duplikátů došlo k chybě"
 
@@ -977,28 +991,28 @@ msgid "Add relationship"
 msgstr "Přidat vztah"
 
 msgid "No results found for "
-msgstr ""
+msgstr "Pro dotaz nebyly nalezeny žádné výsledky"
 
 msgid "Registering unit"
 msgstr "Registrační jednotka"
 
 msgid "Choose a registering unit"
-msgstr ""
+msgstr "Vyberte registrační jednotku"
 
 msgid "Clear selection"
-msgstr ""
+msgstr "Vymazat výběr"
 
 msgid "No programs available."
 msgstr "Nejsou k dispozici žádné programy."
 
 msgid "Search for a program"
-msgstr ""
+msgstr "Vyhledat program"
 
 msgid "Some programs are being filtered by the chosen registering unit"
-msgstr ""
+msgstr "Některé programy jsou filtrovány vybranou registrační jednotkou"
 
 msgid "Show all programs"
-msgstr ""
+msgstr "Zobrazit všechny programy"
 
 msgid "Choose a program"
 msgstr "Vyberte program"
@@ -1074,7 +1088,7 @@ msgid "Cannot search in all programs"
 msgstr "Nelze vyhledávat ve všech programech"
 
 msgid "Missing search criteria"
-msgstr ""
+msgstr "Chybí kritéria vyhledávání"
 
 msgid "Results found"
 msgstr "Nalezeny výsledky"
@@ -1113,20 +1127,22 @@ msgid "This program is protected"
 msgstr "Tento program je chráněn"
 
 msgid "Reason to check for enrollments"
-msgstr ""
+msgstr "Důvod ke kontrole zápisů"
 
 msgid ""
 "Describe the reason you are checking for enrollments in this protected "
 "program"
-msgstr ""
+msgstr "Popište důvod, proč kontrolujete zápisy v tomto chráněném programu"
 
 msgid "Check for enrollments"
-msgstr ""
+msgstr "Zkontrolujte zápisy"
 
 msgid ""
 "You must provide a reason to check for enrollments in this protected "
 "program. All activity will be logged."
 msgstr ""
+"Pro kontrolu zápisů v tomto chráněném programu musíte uvést důvod. Veškerá "
+"aktivita bude zaznamenána."
 
 msgid "Save comment"
 msgstr "Uložit komentář"
@@ -1173,6 +1189,7 @@ msgstr "Označit pro další sledování"
 
 msgid "Existing dates for auto-generated events will not be updated."
 msgstr ""
+"Stávající data pro automaticky generované události nebudou aktualizována."
 
 msgid "Enrollment date"
 msgstr "Datum zápisu"
@@ -1336,7 +1353,7 @@ msgid "New {{ eventName }} event"
 msgstr "Nová událost {{ eventName }}"
 
 msgid "To open this event, please wait until saving is complete"
-msgstr ""
+msgstr "Chcete-li otevřít tuto událost, počkejte na dokončení ukládání"
 
 msgid "Show {{ rest }} more"
 msgstr "Zobrazit {{rest}} více"
@@ -1366,38 +1383,38 @@ msgid "Stages and Events"
 msgstr "Fáze a události"
 
 msgid "New TEI Relationship"
-msgstr ""
+msgstr "Nový vztah TEI"
 
 msgid "Missing implementation step"
-msgstr ""
+msgstr "Chybí krok implementace"
 
 msgid "Go back without saving relationship"
-msgstr ""
+msgstr "Vraťte se zpět bez uložení vztahu"
 
 msgid "New Relationship"
-msgstr ""
+msgstr "Nový vztah"
 
 msgid "Link to an existing {{tetName}}"
-msgstr ""
+msgstr "Odkaz na existující {{tetName}}"
 
 msgid "An error occurred while adding the relationship"
-msgstr ""
+msgstr "Při přidávání vztahu došlo k chybě"
 
 msgid ""
 "Something went wrong while loading relationships. Please try again later."
-msgstr ""
+msgstr "Při načítání vztahů se něco pokazilo. Prosím zkuste to znovu později."
 
 msgid "{{trackedEntityTypeName}} relationships"
-msgstr ""
+msgstr "{{trackedEntityTypeName}} vztahy"
 
 msgid "To open this relationship, please wait until saving is complete"
-msgstr ""
+msgstr "Chcete-li otevřít tento vztah, počkejte na dokončení ukládání"
 
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 msgid "Created date"
-msgstr ""
+msgstr "Datum vytvoření"
 
 msgid "Program stage name"
 msgstr "Název fáze programu"
@@ -1436,19 +1453,19 @@ msgid "Choose a program stage to filter by {{label}}"
 msgstr "Vyberte fázi programu, kterou chcete filtrovat podle {{label}}"
 
 msgid "Active enrollments"
-msgstr ""
+msgstr "Aktivní zápisy"
 
 msgid "Completed enrollments"
-msgstr ""
+msgstr "Dokončené zápisy"
 
 msgid "Cancelled enrollments"
-msgstr ""
+msgstr "Zrušené zápisy"
 
 msgid "Working list could not be updated"
 msgstr "Pracovní seznam nelze aktualizovat"
 
 msgid "an error occurred loading the working lists"
-msgstr ""
+msgstr "došlo k chybě při načítání pracovních seznamů"
 
 msgid "an error occurred loading Tracked entity instance lists"
 msgstr "došlo k chybě při načítání seznamů instancí trasovaných entit"
@@ -1583,7 +1600,7 @@ msgid "Set area"
 msgstr "Nastavit oblast"
 
 msgid "Area on map saved"
-msgstr ""
+msgstr "Oblast na mapě byla uložena"
 
 msgid "Compatibility mode"
 msgstr "Režim kompatibility"
diff --git a/i18n/uz_UZ_Cyrl.po b/i18n/uz_UZ_Cyrl.po
index 5e07eebebb..620b5591f9 100644
--- a/i18n/uz_UZ_Cyrl.po
+++ b/i18n/uz_UZ_Cyrl.po
@@ -177,6 +177,7 @@ msgstr ""
 
 msgid "Saving a {{trackedEntityName}} in {{programName}} in {{orgUnitName}}."
 msgstr ""
+"Сақланмоқда {{trackedEntityName}} да {{programName}} да {{orgUnitName}}."
 
 msgid "Cancel"
 msgstr "Бекор қилиш"
@@ -212,7 +213,7 @@ msgid "Assignee"
 msgstr "Ваколат берилган шахс"
 
 msgid "Saving to {{programName}} in {{orgUnitName}}"
-msgstr ""
+msgstr "Сақланади {{programName}} да {{orgUnitName}}"
 
 msgid ""
 "This is not an event program or the metadata is corrupt. See log for "
@@ -250,7 +251,7 @@ msgid "Finish"
 msgstr "Тугатиш"
 
 msgid "Save without completing"
-msgstr ""
+msgstr "Тугалланмасдан сақлаш"
 
 msgid "Complete"
 msgstr "Тўлдириш"
@@ -512,7 +513,7 @@ msgid "Type to filter options"
 msgstr ""
 
 msgid "No match found"
-msgstr ""
+msgstr "Ҳеч нима топилмади"
 
 msgid "Search"
 msgstr "Излаш"
@@ -538,6 +539,9 @@ msgstr "қидириш учун ёзишни бошланг"
 msgid "suggestions could not be retrieved"
 msgstr "таклифлар қабул қилинмади"
 
+msgid "No results found"
+msgstr "Ҳеч қандай натижа топилмади"
+
 msgid "No items to display"
 msgstr "Кўрсатиладиган ахборот йўқ"
 
@@ -554,7 +558,7 @@ msgid "Update"
 msgstr "Янгилаш"
 
 msgid "Reset filter"
-msgstr ""
+msgstr "Фильтрни қайта созлаш"
 
 msgid "Remove filter"
 msgstr "Фильтрни олиб ташлаш"
@@ -670,36 +674,38 @@ msgid ""
 msgstr ""
 
 msgid "Enrollment Dashboard"
-msgstr ""
+msgstr "Қайд этиш панели"
 
 msgid "No indicator output for this enrollment yet"
-msgstr ""
+msgstr "Ушбу қайд этишда индикатор ахбороти мавжуд эмас"
 
 msgid "No feedback for this enrollment yet"
-msgstr ""
+msgstr "Ушбу қайд этишда қайта алоқа ахбороти мавжуд эмас"
 
 msgid "Quick actions"
-msgstr ""
+msgstr "Тезкор харакатлар"
 
 msgid "New Event"
-msgstr ""
+msgstr "Янги Ҳодиса/Ҳолат"
 
 msgid "Schedule an event"
-msgstr ""
+msgstr "Ҳодиса/Ҳолатни режалаш"
 
 msgid "Make referral"
 msgstr "Йўналиш яратинг"
 
 msgid "No available program stages"
-msgstr ""
+msgstr "Дастур босқичлари мавжуд эмас"
 
 msgid "Program stage not found"
-msgstr ""
+msgstr "Дастур босқичлари топилмади"
 
 msgid ""
 "Choose a program to add new or see existing enrollments for "
 "{{teiDisplayName}}"
 msgstr ""
+" {{teiDisplayName}} учун янги рўйхатга ёки мавжуд рўйхатга олишларини кўриш "
+"учун дастурни танланг."
 
 msgid ""
 "{{programName}} has categories. Choose all categories to view dashboard."
@@ -710,7 +716,7 @@ msgid "Invalid enrollment id {{enrollmentId}}."
 msgstr ""
 
 msgid "Choose an enrollment to view the dashboard."
-msgstr ""
+msgstr "бошқарув панелини кўриш учун рўйхатдан ўтишни танланг."
 
 msgid "There are no active enrollments."
 msgstr ""
@@ -748,19 +754,19 @@ msgid "View working list in this program."
 msgstr "Ушбу дастурдаги ишчи рўйхатни кўриб чиқиш"
 
 msgid "Page is missing required values from URL"
-msgstr ""
+msgstr "URL саҳифасида керакли қийматлар йўқ"
 
 msgid "Program is not valid"
-msgstr ""
+msgstr "Дастур яроқли эмас"
 
 msgid "Org unit is not valid with current program"
-msgstr ""
+msgstr "Жорий дастур учун ташкилий бирлик яроқли эмас"
 
 msgid "There was an error opening the Page"
-msgstr ""
+msgstr "Саҳифани очишда хатолик мавжуд"
 
 msgid "Enrollment{{escape}} New Event"
-msgstr ""
+msgstr "Рўйхатга олишда {{escape}} Янги Ҳодиса/Ҳолат"
 
 msgid "There was an error loading the page"
 msgstr ""
@@ -967,9 +973,6 @@ msgstr ""
 msgid "Possible duplicates found"
 msgstr "Бўлиши мумкин бўлган нусхалар топилди"
 
-msgid "No results found"
-msgstr "Ҳеч қандай натижа топилмади"
-
 msgid "An error occurred loading possible duplicates"
 msgstr "Эҳтимолий нусхаларни юклашда хатолик юз берди"
 
@@ -1174,6 +1177,33 @@ msgstr "Кузатув учун белгиланг"
 msgid "Existing dates for auto-generated events will not be updated."
 msgstr ""
 
+msgid "Latitude"
+msgstr "Кенглик"
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Edit"
+msgstr "Таҳрирлаш"
+
+msgid "Set coordinates"
+msgstr ""
+
+msgid "Coordinates"
+msgstr "Координаталар"
+
+msgid "Delete polygon"
+msgstr "Полигон (кўпбурчак) ни ўчириб ташлаш"
+
+msgid "Close without saving"
+msgstr ""
+
+msgid "Finish drawing before saving"
+msgstr ""
+
+msgid "Set area"
+msgstr "Ҳудудни белгиланг"
+
 msgid "Enrollment date"
 msgstr "Қайд этилган сана"
 
@@ -1199,6 +1229,12 @@ msgstr " {{date}}да охирги марта янгиланган"
 msgid "Cancelled"
 msgstr "Бекор қилинди"
 
+msgid "Add coordinates"
+msgstr ""
+
+msgid "Add area"
+msgstr ""
+
 msgid "Comments about this enrollment"
 msgstr ""
 
@@ -1322,9 +1358,6 @@ msgstr ""
 msgid "{{TETName}} profile"
 msgstr ""
 
-msgid "Edit"
-msgstr "Таҳрирлаш"
-
 msgid "tracked entity instance"
 msgstr "кузатилаётган объект намунаси"
 
@@ -1572,12 +1605,6 @@ msgstr "Шу вақтгача"
 msgid "Page {{currentPage}}"
 msgstr "{{currentPage}} саҳифаси"
 
-msgid "Delete polygon"
-msgstr "Полигон (кўпбурчак) ни ўчириб ташлаш"
-
-msgid "Set area"
-msgstr "Ҳудудни белгиланг"
-
 msgid "Area on map saved"
 msgstr ""
 
diff --git a/package.json b/package.json
index 894654968e..a3a3e55966 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.44.5",
+    "version": "100.45.2",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.44.5",
+        "@dhis2/rules-engine-javascript": "100.45.2",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 461ab1c1fa..360a957889 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.44.5",
+    "version": "100.45.2",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.types.js b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.types.js
index d58a42aff2..3e4ea25e82 100644
--- a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.types.js
+++ b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.types.js
@@ -8,11 +8,17 @@ import type { ExistingUniqueValueDialogActionsComponent } from '../withErrorMess
 import type { InputAttribute } from './hooks/useFormValues';
 import { RenderFoundation, ProgramStage } from '../../../metaData';
 
+type TrackedEntityAttributes = Array<{
+    attribute: string,
+    value: any,
+}>;
+
 export type EnrollmentPayload = {|
     trackedEntity: string,
     trackedEntityType: string,
     orgUnit: string,
     geometry: any,
+    attributes: TrackedEntityAttributes,
     enrollments: [
         {|
             occurredAt: string,
@@ -23,10 +29,7 @@ export type EnrollmentPayload = {|
             events: Array<{
                 orgUnit: string,
             }>,
-            attributes: Array<{
-                attribute: string,
-                value: any,
-            }>,
+            attributes: TrackedEntityAttributes,
         |}
     ]
 |}
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useBuildEnrollmentPayload.js b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useBuildEnrollmentPayload.js
index 95778162b0..d6ae0f8adf 100644
--- a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useBuildEnrollmentPayload.js
+++ b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useBuildEnrollmentPayload.js
@@ -156,13 +156,15 @@ export const useBuildEnrollmentPayload = ({
             ? [firstStageDuringRegistrationEvent, ...autoGenerateEvents]
             : autoGenerateEvents;
 
+        const attributes = deriveAttributesFromFormValues(formServerValues);
+
         const enrollment = {
             program: programId,
             status: 'ACTIVE',
             orgUnit: orgUnitId,
             occurredAt,
             enrolledAt,
-            attributes: deriveAttributesFromFormValues(formServerValues),
+            attributes,
             events: allEventsToBeCreated,
         };
 
@@ -177,6 +179,7 @@ export const useBuildEnrollmentPayload = ({
             trackedEntity: teiId || generateUID(),
             orgUnit: orgUnitId,
             trackedEntityType: trackedEntityTypeId,
+            attributes,
             geometry,
             enrollments: [enrollment],
         };
diff --git a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useLifecycle.js b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useLifecycle.js
index 4a84d7ccb7..a9b0eda796 100644
--- a/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useLifecycle.js
+++ b/src/core_modules/capture-core/components/DataEntries/EnrollmentRegistrationEntry/hooks/useLifecycle.js
@@ -45,7 +45,7 @@ export const useLifecycle = (
     });
     useEffect(() => {
         dataEntryReadyRef.current = false;
-    }, [teiId]);
+    }, [teiId, selectedScopeId]);
 
     useEffect(() => {
         if (