diff --git a/src/pages/EventExport/EventExport.js b/src/pages/EventExport/EventExport.js
index e88f1fef5..8deb3c229 100644
--- a/src/pages/EventExport/EventExport.js
+++ b/src/pages/EventExport/EventExport.js
@@ -14,7 +14,6 @@ import {
     OrgUnitTree,
     ProgramPicker,
     Format,
-    formatOptions,
     defaultFormatOption,
     Compression,
     defaultCompressionOption,
@@ -32,6 +31,7 @@ import {
     defaultOrgUnitIdSchemeOption,
     IdScheme,
     defaultIdSchemeOption,
+    formatNoXmlOptions,
 } from '../../components/Inputs/index.js'
 import { jsDateToISO8601 } from '../../utils/helper.js'
 import { onExport, validate } from './form-helper.js'
@@ -103,7 +103,7 @@ const EventExport = () => {
                                 <StartDate />
                                 <EndDate />
                             </Dates>
-                            <Format availableFormats={formatOptions} />
+                            <Format availableFormats={formatNoXmlOptions} />
                             <Compression />
                         </BasicOptions>
                         <MoreOptions>
diff --git a/src/pages/EventExport/form-helper.js b/src/pages/EventExport/form-helper.js
index 9bdacba82..82c200e55 100644
--- a/src/pages/EventExport/form-helper.js
+++ b/src/pages/EventExport/form-helper.js
@@ -24,7 +24,7 @@ const onExport = (baseUrl, setExportEnabled) => (values) => {
     } = values
 
     // generate URL and redirect
-    const apiBaseUrl = `${baseUrl}/api/`
+    const apiBaseUrl = `${baseUrl}/api/tracker/`
     const endpoint = `events`
     const endpointExtension = compression ? `${format}.${compression}` : format
     const filename = `${endpoint}.${endpointExtension}`
diff --git a/src/pages/TEIExport/TEIExport.js b/src/pages/TEIExport/TEIExport.js
index c870c13b9..ce56a2929 100644
--- a/src/pages/TEIExport/TEIExport.js
+++ b/src/pages/TEIExport/TEIExport.js
@@ -12,7 +12,6 @@ import {
 } from '../../components/index.js'
 import {
     Format,
-    formatOptions,
     defaultFormatOption,
     OrgUnitMode,
     defaultOrgUnitSelectionModeOption,
@@ -36,7 +35,6 @@ import {
     AssignedUserMode,
     defaultAssignedUserModeOption,
     IncludeDeleted,
-    IncludeAllAttributes,
     DataElementIdScheme,
     defaultDataElementIdSchemeOption,
     EventIdScheme,
@@ -47,6 +45,7 @@ import {
     defaultOrgUnitIdSchemeOption,
     ExportButton,
     FormAlerts,
+    formatNoXmlOptions,
 } from '../../components/Inputs/index.js'
 import { onExport, validate } from './form-helper.js'
 
@@ -80,7 +79,6 @@ const initialValues = {
     assignedUserModeFilter: false,
     assignedUserMode: defaultAssignedUserModeOption,
     includeDeleted: false,
-    includeAllAttributes: false,
     dataElementIdScheme: defaultDataElementIdSchemeOption,
     eventIdScheme: defaultEventIdSchemeOption,
     orgUnitIdScheme: defaultOrgUnitIdSchemeOption,
@@ -136,7 +134,7 @@ const TEIExport = () => {
                                     <ProgramEndDate show={showProgramFilters} />
                                 </Dates>
                                 <TETypePicker show={showTEFilters} />
-                                <Format availableFormats={formatOptions} />
+                                <Format availableFormats={formatNoXmlOptions} />
                             </BasicOptions>
                             <MoreOptions>
                                 <LastUpdatedFilter />
@@ -147,7 +145,6 @@ const TEIExport = () => {
                                 <LastUpdatedDuration show={showLUDuration} />
                                 <AssignedUserMode />
                                 <IncludeDeleted />
-                                <IncludeAllAttributes />
                                 <SchemeContainer>
                                     <DataElementIdScheme />
                                     <EventIdScheme />
diff --git a/src/pages/TEIExport/form-helper.js b/src/pages/TEIExport/form-helper.js
index bebe7f652..a3390a605 100644
--- a/src/pages/TEIExport/form-helper.js
+++ b/src/pages/TEIExport/form-helper.js
@@ -17,7 +17,6 @@ const valuesToParams = (
         inclusion,
         format,
         includeDeleted,
-        includeAllAttributes,
         dataElementIdScheme,
         eventIdScheme,
         orgUnitIdScheme,
@@ -40,7 +39,6 @@ const valuesToParams = (
         ouMode: ouMode,
         format: format,
         includeDeleted: includeDeleted.toString(),
-        includeAllAttributes: includeAllAttributes.toString(),
         dataElementIdScheme: dataElementIdScheme,
         eventIdScheme: eventIdScheme,
         orgUnitIdScheme: orgUnitIdScheme,
@@ -51,7 +49,7 @@ const valuesToParams = (
     // include selected org.units only when manual selection is selected
     // ouMode is then stored in the `inclusion` field
     if (ouMode === OU_MODE_MANUAL_VALUE) {
-        minParams.ou = selectedOrgUnits.map((o) => pathToId(o)).join(';')
+        minParams.orgUnit = selectedOrgUnits.map((o) => pathToId(o)).join(';')
         minParams.ouMode = inclusion
     }
 
@@ -111,8 +109,8 @@ const onExport = (baseUrl, setExportEnabled) => async (values) => {
     const { format } = values
 
     // generate URL and redirect
-    const apiBaseUrl = `${baseUrl}/api/`
-    const endpoint = `trackedEntityInstances`
+    const apiBaseUrl = `${baseUrl}/api/tracker/`
+    const endpoint = `trackedEntities`
     const filename = `${endpoint}.${format}`
     const downloadUrlParams = valuesToParams(values, filename)
     const url = `${apiBaseUrl}${endpoint}.${format}?${downloadUrlParams}`