diff --git a/packages/ui/src/fields/Point/index.tsx b/packages/ui/src/fields/Point/index.tsx
index bd930763eb..67c1104ede 100644
--- a/packages/ui/src/fields/Point/index.tsx
+++ b/packages/ui/src/fields/Point/index.tsx
@@ -51,7 +51,7 @@ const PointField: React.FC<PointFieldProps> = (props) => {
     width,
   } = props
 
-  const { i18n } = useTranslation()
+  const { i18n, t } = useTranslation()
 
   const memoizedValidate: ClientValidate = useCallback(
     (value, options) => {
@@ -87,6 +87,15 @@ const PointField: React.FC<PointFieldProps> = (props) => {
     [setValue, value],
   )
 
+  const getCoordinateFieldLabel = (type: 'latitude' | 'longitude') => {
+    const suffix = type === 'longitude' ? t('fields:longitude') : t('fields:latitude')
+    const fieldLabel = labelProps && labelProps.label ? labelProps.label : ''
+    return {
+      ...labelProps,
+      label: `${fieldLabel}${fieldLabel ? ' - ' : ''}${suffix}`,
+    }
+  }
+
   return (
     <div
       className={[
@@ -106,7 +115,11 @@ const PointField: React.FC<PointFieldProps> = (props) => {
       <FieldError CustomError={CustomError} {...(errorProps || {})} />
       <ul className={`${baseClass}__wrap`}>
         <li>
-          <FieldLabel CustomLabel={CustomLabel} {...(labelProps || {})} />
+          {CustomLabel !== undefined ? (
+            CustomLabel
+          ) : (
+            <FieldLabel {...getCoordinateFieldLabel('longitude')} />
+          )}
           <div className="input-wrapper">
             {BeforeInput}
             <input
@@ -123,7 +136,11 @@ const PointField: React.FC<PointFieldProps> = (props) => {
           </div>
         </li>
         <li>
-          <FieldLabel CustomLabel={CustomLabel} {...(labelProps || {})} />
+          {CustomLabel !== undefined ? (
+            CustomLabel
+          ) : (
+            <FieldLabel {...getCoordinateFieldLabel('latitude')} />
+          )}
           <div className="input-wrapper">
             {BeforeInput}
             <input
diff --git a/test/fields/e2e.spec.ts b/test/fields/e2e.spec.ts
index 3fb60cbc57..7b51ee037e 100644
--- a/test/fields/e2e.spec.ts
+++ b/test/fields/e2e.spec.ts
@@ -419,6 +419,7 @@ describe('fields', () => {
 
     test('should update point', async () => {
       await page.goto(url.edit(emptyGroupPoint.id))
+      await page.waitForURL(`**/${emptyGroupPoint.id}`)
       const longField = page.locator('#field-longitude-point')
       await longField.fill('9')
 
@@ -449,6 +450,7 @@ describe('fields', () => {
 
     test('should be able to clear a value point', async () => {
       await page.goto(url.edit(filledGroupPoint.id))
+      await page.waitForURL(`**/${filledGroupPoint.id}`)
 
       const groupLongitude = page.locator('#field-longitude-group__point')
       await groupLongitude.fill('')
@@ -1402,7 +1404,7 @@ describe('fields', () => {
         })
         test('create EST day only date', async () => {
           await page.goto(url.create)
-          await wait(500)
+          await page.waitForURL(`**/${url.create}`)
           const dateField = page.locator('#field-default input')
 
           // enter date in default date field
@@ -1410,7 +1412,7 @@ describe('fields', () => {
           await page.locator('#action-save').click()
 
           // wait for navigation to update route
-          await wait(500)
+          await expect.poll(() => page.url(), { timeout: 1000 }).not.toContain('create')
 
           // get the ID of the doc
           const routeSegments = page.url().split('/')
@@ -1434,7 +1436,7 @@ describe('fields', () => {
 
         test('create PDT day only date', async () => {
           await page.goto(url.create)
-          await wait(500)
+          await page.waitForURL(`**/${url.create}`)
           const dateField = page.locator('#field-default input')
 
           // enter date in default date field
@@ -1442,7 +1444,7 @@ describe('fields', () => {
           await page.locator('#action-save').click()
 
           // wait for navigation to update route
-          await wait(500)
+          await expect.poll(() => page.url(), { timeout: 1000 }).not.toContain('create')
 
           // get the ID of the doc
           const routeSegments = page.url().split('/')
@@ -1466,7 +1468,7 @@ describe('fields', () => {
 
         test('create ST day only date', async () => {
           await page.goto(url.create)
-          await wait(500)
+          await page.waitForURL(`**/${url.create}`)
           const dateField = page.locator('#field-default input')
 
           // enter date in default date field
@@ -1474,7 +1476,7 @@ describe('fields', () => {
           await page.locator('#action-save').click()
 
           // wait for navigation to update route
-          await wait(500)
+          await expect.poll(() => page.url(), { timeout: 1000 }).not.toContain('create')
 
           // get the ID of the doc
           const routeSegments = page.url().split('/')