diff --git a/README.md b/README.md
index e027d4cb6..8d1a5ee96 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # RTMIS
 
-[![Build Status](https://akvo.semaphoreci.com/badges/rtmis/branches/main.svg?style=shields)](https://akvo.semaphoreci.com/projects/rtmis) [![Repo Size](https://img.shields.io/github/repo-size/akvo/rtmis)](https://img.shields.io/github/repo-size/akvo/rtmis) [![Languages](https://img.shields.io/github/languages/count/akvo/rtmis)](https://img.shields.io/github/languages/count/akvo/rtmis) [![Issues](https://img.shields.io/github/issues/akvo/rtmis)](https://img.shields.io/github/issues/akvo/rtmis) [![Last Commit](https://img.shields.io/github/last-commit/akvo/rtmis/main)](https://img.shields.io/github/last-commit/akvo/rtmis/main) [![Coverage Status](https://coveralls.io/repos/github/akvo/rtmis/badge.svg)](https://coveralls.io/github/akvo/rtmis) [![Coverage Status](https://img.shields.io/readthedocs/rtmis?label=read%20the%20docs)](https://rtmis.readthedocs.io/en/latest)
+[![Build Status](https://github.com/akvo/rtmis/actions/workflows/main.yml/badge.svg)](https://github.com/akvo/rtmis/actions/workflows/main.yml?query=branch%3Amain) [![Build Status](https://github.com/akvo/rtmis/actions/workflows/apk-release.yml/badge.svg)](https://github.com/akvo/rtmis/actions/workflows/apk-release.yml?query=branch%3Amain) [![Repo Size](https://img.shields.io/github/repo-size/akvo/rtmis)](https://img.shields.io/github/repo-size/akvo/rtmis) [![Languages](https://img.shields.io/github/languages/count/akvo/rtmis)](https://img.shields.io/github/languages/count/akvo/rtmis) [![Issues](https://img.shields.io/github/issues/akvo/rtmis)](https://img.shields.io/github/issues/akvo/rtmis) [![Last Commit](https://img.shields.io/github/last-commit/akvo/rtmis/main)](https://img.shields.io/github/last-commit/akvo/rtmis/main) [![Coverage Status](https://coveralls.io/repos/github/akvo/rtmis/badge.svg)](https://coveralls.io/github/akvo/rtmis) [![Coverage Status](https://img.shields.io/readthedocs/rtmis?label=read%20the%20docs)](https://rtmis.readthedocs.io/en/latest)
 
 Real Time Monitoring Information Systems
 
diff --git a/app/App.js b/app/App.js
index 54c88b264..194275b3b 100644
--- a/app/App.js
+++ b/app/App.js
@@ -18,6 +18,7 @@ import backgroundTask, {
 } from './src/lib/background-task';
 import crudJobs, { jobStatus, MAX_ATTEMPT } from './src/database/crud/crud-jobs';
 import { ToastAndroid } from 'react-native';
+import * as Location from 'expo-location';
 
 export const setNotificationHandler = () =>
   Notifications.setNotificationHandler({
@@ -85,6 +86,10 @@ TaskManager.defineTask(SYNC_FORM_SUBMISSION_TASK_NAME, async () => {
 const App = () => {
   const serverURLState = BuildParamsState.useState((s) => s.serverURL);
   const syncValue = BuildParamsState.useState((s) => s.dataSyncInterval);
+  const gpsThreshold = BuildParamsState.useState((s) => s.gpsThreshold);
+  const gpsAccuracyLevel = BuildParamsState.useState((s) => s.gpsAccuracyLevel);
+  const geoLocationTimeout = BuildParamsState.useState((s) => s.geoLocationTimeout);
+  const locationIsGranted = UserState.useState((s) => s.locationIsGranted);
 
   const handleCheckSession = () => {
     // check users exist
@@ -118,11 +123,12 @@ const App = () => {
     const serverURL = configExist?.serverURL || serverURLState;
     const syncInterval = configExist?.syncInterval || syncValue;
     if (!configExist) {
-      await crudConfig.addConfig({ serverURL });
-    }
-    if (syncInterval) {
-      BuildParamsState.update((s) => {
-        s.dataSyncInterval = syncInterval;
+      await crudConfig.addConfig({
+        serverURL,
+        syncInterval,
+        gpsThreshold,
+        gpsAccuracyLevel,
+        geoLocationTimeout,
       });
     }
     if (serverURL) {
@@ -130,14 +136,28 @@ const App = () => {
         s.serverURL = serverURL;
       });
       api.setServerURL(serverURL);
-      await crudConfig.updateConfig({ serverURL });
+    }
+    if (configExist) {
+      /**
+       * Update settings values from database
+       */
+      BuildParamsState.update((s) => {
+        s.dataSyncInterval = configExist.syncInterval;
+        s.gpsThreshold = configExist.gpsThreshold;
+        s.gpsAccuracyLevel = configExist.gpsAccuracyLevel;
+        s.geoLocationTimeout = configExist.geoLocationTimeout;
+      });
     }
     console.info('[CONFIG] Server URL', serverURL);
   };
 
   const handleInitDB = useCallback(async () => {
+    /**
+     * Exclude the reset in the try-catch block
+     * to prevent other queries from being skipped after this process.
+     */
+    await conn.reset();
     try {
-      await conn.reset();
       const db = conn.init;
       const queries = tables.map((t) => {
         const queryString = query.initialQuery(t.name, t.fields);
@@ -187,6 +207,22 @@ const App = () => {
     handleOnRegisterTask();
   }, [handleOnRegisterTask]);
 
+  const requestAccessLocation = useCallback(async () => {
+    if (locationIsGranted) {
+      return;
+    }
+    const { status } = await Location.requestForegroundPermissionsAsync();
+    if (status === 'granted') {
+      UserState.update((s) => {
+        s.locationIsGranted = true;
+      });
+    }
+  }, [locationIsGranted]);
+
+  useEffect(() => {
+    requestAccessLocation();
+  }, [requestAccessLocation]);
+
   return (
     <SafeAreaProvider>
       <Navigation testID="navigation-element" />
diff --git a/app/src/database/crud/crud-jobs.js b/app/src/database/crud/crud-jobs.js
index e7e781c0e..a24e18187 100644
--- a/app/src/database/crud/crud-jobs.js
+++ b/app/src/database/crud/crud-jobs.js
@@ -44,7 +44,7 @@ const jobsQuery = () => {
         const insertQuery = query.insert(tableName, {
           ...data,
           createdAt,
-          uuid: Crypto.randomUUID(),
+          uuid: Crypto.randomUUID(), // TODO: Remove if not needed
         });
         return await conn.tx(db, insertQuery, []);
       } catch (error) {
diff --git a/app/src/database/tables.js b/app/src/database/tables.js
index 24c116e81..b1450c91b 100644
--- a/app/src/database/tables.js
+++ b/app/src/database/tables.js
@@ -7,7 +7,7 @@ export const tables = [
       password: 'TEXT',
       active: 'TINYINT',
       token: 'TEXT',
-      administrationList: 'TEXT',
+      administrationList: 'TEXT', // TODO: Remove
     },
   },
   {
@@ -20,6 +20,9 @@ export const tables = [
       syncInterval: 'REAL',
       syncWifiOnly: 'TINYINT',
       lang: 'VARCHAR(255) DEFAULT "en" NOT NULL',
+      gpsThreshold: 'INTEGER NULL',
+      gpsAccuracyLevel: 'INTEGER NULL',
+      geoLocationTimeout: 'INTEGER NULL',
     },
   },
   {
@@ -59,7 +62,7 @@ export const tables = [
       formId: 'INTEGER NOT NULL',
       uuid: 'TEXT type UNIQUE',
       name: 'VARCHAR(255)',
-      administration: 'VARCHAR(255)',
+      administration: 'VARCHAR(255)', // TODO: Remove
       syncedAt: 'DATETIME',
       json: 'TEXT',
     },
@@ -76,7 +79,7 @@ export const tables = [
     name: 'jobs',
     fields: {
       id: 'INTEGER PRIMARY KEY NOT NULL',
-      uuid: 'TEXT type UNIQUE',
+      uuid: 'TEXT type UNIQUE', // TODO: Remove if not used
       user: 'INTEGER NOT NULL',
       type: 'VARCHAR(191)',
       status: 'INTEGER NOT NULL',
diff --git a/app/src/form/components/Question.js b/app/src/form/components/Question.js
index 961fbbaa9..7de4caadd 100644
--- a/app/src/form/components/Question.js
+++ b/app/src/form/components/Question.js
@@ -78,7 +78,17 @@ const Question = memo(({ group, activeQuestions = [], index }) => {
         });
         FormState.update((s) => {
           const preValues = preFilled?.fill?.reduce((prev, current) => {
-            return { [current['id']]: current['answer'], ...prev };
+            /**
+             * Make sure the answer criteria are not replaced by previous values
+             * eg:
+             * Previous value = "Update"
+             * Answer criteria = "New"
+             */
+            const answer =
+              id === current['id']
+                ? current['answer']
+                : values?.[current['id']] || current['answer'];
+            return { [current['id']]: answer, ...prev };
           }, {});
           s.prefilled = preValues;
         });
diff --git a/app/src/form/fields/TypeGeo.js b/app/src/form/fields/TypeGeo.js
index a07a74886..93f9cb6cc 100644
--- a/app/src/form/fields/TypeGeo.js
+++ b/app/src/form/fields/TypeGeo.js
@@ -1,8 +1,8 @@
-import React, { useState, useEffect, useMemo, useCallback } from 'react';
+import React, { useState } from 'react';
 import { View } from 'react-native';
 import { Text, Button } from '@rneui/themed';
 
-import { UIState, FormState, BuildParamsState } from '../../store';
+import { FormState, BuildParamsState, UserState } from '../../store';
 import { FieldLabel } from '../support';
 import { styles } from '../styles';
 import { loc, i18n } from '../../lib';
@@ -10,20 +10,20 @@ import { loc, i18n } from '../../lib';
 const TypeGeo = ({ keyform, id, name, value, tooltip, required, requiredSign }) => {
   const [errorMsg, setErrorMsg] = useState(null);
   const [gpsAccuracy, setGpsAccuracy] = useState(null);
-  const [currLocation, setCurrLocation] = useState({ lat: null, lng: null });
   const [loading, setLoading] = useState(false);
   const [latitude, longitude] = value || [];
 
+  const gpsAccuracyLevel = BuildParamsState.useState((s) => s.gpsAccuracyLevel);
+  const geoLocationTimeout = BuildParamsState.useState((s) => s.geoLocationTimeout);
   const gpsThreshold = BuildParamsState.useState((s) => s.gpsThreshold);
-  const isOnline = UIState.useState((s) => s.online);
   const activeLang = FormState.useState((s) => s.lang);
+  const savedLocation = UserState.useState((s) => s.currentLocation);
 
   const trans = i18n.text(activeLang);
 
   const requiredValue = required ? requiredSign : null;
 
-  const handleGetCurrLocation = useCallback(async () => {
-    setLoading(true);
+  const getCurrentLocation = async () => {
     await loc.getCurrentLocation(
       ({ coords }) => {
         const { latitude: lat, longitude: lng, accuracy } = coords;
@@ -32,10 +32,6 @@ const TypeGeo = ({ keyform, id, name, value, tooltip, required, requiredSign })
          */
         setGpsAccuracy(Math.floor(accuracy));
         // console.info('GPS accuracy:', accuracy, 'GPS Threshold:', gpsThreshold);
-        setCurrLocation({
-          lat,
-          lng,
-        });
         FormState.update((s) => {
           s.currentValues = { ...s.currentValues, [id]: [lat, lng] };
         });
@@ -45,13 +41,35 @@ const TypeGeo = ({ keyform, id, name, value, tooltip, required, requiredSign })
         setLoading(false);
         setErrorMsg(message);
         setGpsAccuracy(-1);
-        setCurrLocation({ lat: -1.3855559, lng: 37.9938594 });
+
         FormState.update((s) => {
           s.currentValues = { ...s.currentValues, [id]: [-1.3855559, 37.9938594] };
         });
       },
+      gpsAccuracyLevel,
     );
-  }, [gpsThreshold, id]);
+  };
+
+  const handleGetCurrLocation = async () => {
+    const geoTimeout = geoLocationTimeout * 1000;
+    setLoading(true);
+    setTimeout(() => {
+      if (!value?.length && savedLocation?.coords) {
+        /**
+         * Insert a saved location when a GEO question has no answer after timeout
+         */
+        const { latitude: lat, longitude: lng, accuracy } = savedLocation.coords;
+        setGpsAccuracy(Math.floor(accuracy));
+        FormState.update((s) => {
+          s.currentValues = { ...s.currentValues, [id]: [lat, lng] };
+        });
+      }
+      if (loading) {
+        setLoading(false);
+      }
+    }, geoTimeout);
+    await getCurrentLocation();
+  };
 
   return (
     <View>
@@ -85,11 +103,7 @@ const TypeGeo = ({ keyform, id, name, value, tooltip, required, requiredSign })
           </Text>
         )}
         <View style={styles.geoButtonGroup}>
-          <Button
-            onPress={() => handleGetCurrLocation()}
-            testID="button-curr-location"
-            disabled={loading}
-          >
+          <Button onPress={() => handleGetCurrLocation()} testID="button-curr-location">
             {loading
               ? trans.fetchingLocation
               : gpsAccuracy !== null
diff --git a/app/src/lib/loc.js b/app/src/lib/loc.js
index dd45ed767..093ecb369 100644
--- a/app/src/lib/loc.js
+++ b/app/src/lib/loc.js
@@ -1,10 +1,12 @@
 import * as Location from 'expo-location';
 
-const getCurrentLocation = async (success, error) => {
+const getCurrentLocation = async (success, error, level = null) => {
   const { status } = await Location.requestForegroundPermissionsAsync();
   if (status === 'granted') {
+    const findLevel = accuracyLevels.find((l) => l.value === level);
+    const accuracy = findLevel?.value || Location.Accuracy.Highest;
     const result = await Location.getCurrentPositionAsync({
-      accuracy: Location.Accuracy.Highest,
+      accuracy,
     });
     success(result);
   } else {
@@ -19,3 +21,26 @@ const loc = {
 };
 
 export default loc;
+
+export const accuracyLevels = [
+  {
+    label: 'Lowest',
+    value: 1,
+  },
+  {
+    label: 'Low',
+    value: 2,
+  },
+  {
+    label: 'Balanced',
+    value: 3,
+  },
+  {
+    label: 'High',
+    value: 4,
+  },
+  {
+    label: 'Highest',
+    value: 5,
+  },
+];
diff --git a/app/src/pages/Home.js b/app/src/pages/Home.js
index 4e22afc41..493150ac5 100644
--- a/app/src/pages/Home.js
+++ b/app/src/pages/Home.js
@@ -3,10 +3,11 @@ import { Button } from '@rneui/themed';
 import Icon from 'react-native-vector-icons/Ionicons';
 import { Platform, ToastAndroid } from 'react-native';
 import { BaseLayout } from '../components';
-import { FormState, UserState, UIState } from '../store';
+import { FormState, UserState, UIState, BuildParamsState } from '../store';
 import { crudForms } from '../database/crud';
 import { i18n } from '../lib';
 import * as Notifications from 'expo-notifications';
+import * as Location from 'expo-location';
 
 const Home = ({ navigation, route }) => {
   const params = route?.params || null;
@@ -15,6 +16,9 @@ const Home = ({ navigation, route }) => {
   const [appLang, setAppLang] = useState('en');
   const [loading, setloading] = useState(true);
 
+  const locationIsGranted = UserState.useState((s) => s.locationIsGranted);
+  const gpsAccuracyLevel = BuildParamsState.useState((s) => s.gpsAccuracyLevel);
+  const gpsInterval = BuildParamsState.useState((s) => s.gpsInterval);
   const isManualSynced = UIState.useState((s) => s.isManualSynced);
   const activeLang = UIState.useState((s) => s.lang);
   const trans = i18n.text(activeLang);
@@ -101,6 +105,43 @@ const Home = ({ navigation, route }) => {
     return () => subscription.remove();
   }, []);
 
+  const watchCurrentPosition = useCallback(
+    async (unsubscribe = false) => {
+      if (!locationIsGranted) {
+        return;
+      }
+      const timeInterval = gpsInterval * 1000; // miliseconds
+      /**
+       * Subscribe to the user's current location
+       * @tutorial https://docs.expo.dev/versions/latest/sdk/location/#locationwatchpositionasyncoptions-callback
+       */
+      const watch = await Location.watchPositionAsync(
+        {
+          accuracy: gpsAccuracyLevel,
+          timeInterval,
+        },
+        (res) => {
+          console.info('[CURRENT LOC]', res?.coords);
+          UserState.update((s) => {
+            s.currentLocation = res;
+          });
+        },
+      );
+
+      if (unsubscribe) {
+        watch.remove();
+      }
+    },
+    [gpsAccuracyLevel, gpsInterval, locationIsGranted],
+  );
+
+  useEffect(() => {
+    watchCurrentPosition();
+    return () => {
+      watchCurrentPosition(true);
+    };
+  }, [watchCurrentPosition]);
+
   return (
     <BaseLayout
       title={trans.homePageTitle}
diff --git a/app/src/pages/Settings/DialogForm.js b/app/src/pages/Settings/DialogForm.js
index 89683665d..a8379f5fd 100644
--- a/app/src/pages/Settings/DialogForm.js
+++ b/app/src/pages/Settings/DialogForm.js
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Dialog, Input, Slider } from '@rneui/themed';
+import { Dialog, Input, Slider, Text } from '@rneui/themed';
 import { Dropdown } from 'react-native-element-dropdown';
 import Icon from 'react-native-vector-icons/Ionicons';
 import { UIState } from '../../store';
@@ -10,7 +10,7 @@ const DialogForm = ({ onOk, onCancel, showDialog, edit, initValue = 0 }) => {
   const activeLang = UIState.useState((s) => s.lang);
   const trans = i18n.text(activeLang);
 
-  const { type, label, slider, value: defaultValue, options } = edit || {};
+  const { type, label, slider, value: defaultValue, options, description } = edit || {};
   const isPassword = type === 'password' || false;
 
   return (
@@ -35,6 +35,7 @@ const DialogForm = ({ onOk, onCancel, showDialog, edit, initValue = 0 }) => {
           onChangeText={setValue}
           defaultValue={defaultValue?.toString()}
           testID="settings-form-input"
+          keyboardType={type === 'number' ? 'number-pad' : 'default'}
         />
       )}
       {type === 'dropdown' && (
@@ -51,6 +52,7 @@ const DialogForm = ({ onOk, onCancel, showDialog, edit, initValue = 0 }) => {
           testID="settings-form-dropdown"
         />
       )}
+      {description?.name && <Text>{i18n.transform(activeLang, description)?.name}</Text>}
       <Dialog.Actions>
         <Dialog.Button onPress={() => onOk(value)} testID="settings-form-dialog-ok">
           {trans.buttonOk}
diff --git a/app/src/pages/Settings/SettingsForm.js b/app/src/pages/Settings/SettingsForm.js
index ec0228260..b575304b5 100644
--- a/app/src/pages/Settings/SettingsForm.js
+++ b/app/src/pages/Settings/SettingsForm.js
@@ -1,13 +1,15 @@
-import React, { useState, useMemo, useEffect } from 'react';
+import React, { useState, useMemo, useEffect, useCallback } from 'react';
 import { View } from 'react-native';
 import { ListItem, Switch } from '@rneui/themed';
 import * as Crypto from 'expo-crypto';
+
 import { BaseLayout } from '../../components';
 import { config } from './config';
 import { BuildParamsState, UIState, AuthState, UserState } from '../../store';
 import { conn, query } from '../../database';
 import DialogForm from './DialogForm';
 import { backgroundTask, i18n } from '../../lib';
+import { accuracyLevels } from '../../lib/loc';
 
 const db = conn.init;
 
@@ -16,11 +18,8 @@ const SettingsForm = ({ route }) => {
   const [list, setList] = useState([]);
   const [showDialog, setShowDialog] = useState(false);
 
-  const {
-    serverURL,
-    appVersion,
-    dataSyncInterval: syncInterval,
-  } = BuildParamsState.useState((s) => s);
+  const { serverURL, dataSyncInterval, gpsThreshold, gpsAccuracyLevel, geoLocationTimeout } =
+    BuildParamsState.useState((s) => s);
   const { password, authenticationCode, useAuthenticationCode } = AuthState.useState((s) => s);
   const { lang, isDarkMode, fontSize } = UIState.useState((s) => s);
   const { name, syncWifiOnly } = UserState.useState((s) => s);
@@ -39,8 +38,11 @@ const SettingsForm = ({ route }) => {
     lang,
     isDarkMode,
     fontSize,
-    syncInterval,
+    dataSyncInterval,
     syncWifiOnly,
+    gpsThreshold,
+    gpsAccuracyLevel,
+    geoLocationTimeout,
   });
 
   const nonEnglish = lang !== 'en';
@@ -74,23 +76,15 @@ const SettingsForm = ({ route }) => {
       'syncInterval',
       'syncWifiOnly',
       'lang',
+      'gpsThreshold',
+      'gpsAccuracyLevel',
+      'geoLocationTimeout',
     ];
     const id = 1;
     if (configFields.includes(field)) {
       const updateQuery = query.update('config', { id }, { [field]: value });
       await conn.tx(db, updateQuery, [id]);
     }
-    if (configFields.includes('syncInterval')) {
-      try {
-        await backgroundTask.unregisterBackgroundTask('sync-form-submission');
-        await backgroundTask.registerBackgroundTask('sync-form-submission', parseInt(value));
-      } catch (error) {
-        console.error('[ERROR RESTART TASK]', error);
-      }
-      BuildParamsState.update((s) => {
-        s.dataSyncInterval = value;
-      });
-    }
     if (field === 'name') {
       const updateQuery = query.update('users', { id }, { name: value });
       await conn.tx(db, updateQuery, [id]);
@@ -102,7 +96,16 @@ const SettingsForm = ({ route }) => {
     }
   };
 
-  const handleOKPress = (inputValue) => {
+  const handleOnRestarTask = async () => {
+    try {
+      await backgroundTask.unregisterBackgroundTask('sync-form-submission');
+      await backgroundTask.registerBackgroundTask('sync-form-submission', parseInt(value));
+    } catch (error) {
+      console.error('[ERROR RESTART TASK]', error);
+    }
+  };
+
+  const handleOKPress = async (inputValue) => {
     setShowDialog(false);
     if (edit && inputValue) {
       const [stateData, stateKey] = editState;
@@ -113,7 +116,12 @@ const SettingsForm = ({ route }) => {
         ...settingsState,
         [stateKey]: inputValue,
       });
-      handleUpdateOnDB(stateKey, inputValue);
+      if (stateKey === 'dataSyncInterval') {
+        await handleUpdateOnDB('syncInterval', inputValue);
+        await handleOnRestarTask();
+      } else {
+        await handleUpdateOnDB(stateKey, inputValue);
+      }
       setEdit(null);
     }
   };
@@ -135,44 +143,46 @@ const SettingsForm = ({ route }) => {
     handleUpdateOnDB(stateKey, tinyIntVal);
   };
 
-  const handleCreateNewConfig = () => {
-    const insertQuery = query.insert('config', {
-      id: 1,
-      appVersion,
-      authenticationCode: 'testing',
-      serverURL,
-      syncInterval,
-      syncWifiOnly,
-      lang,
-    });
-    conn.tx(db, insertQuery, []);
+  const renderSubtitle = ({ type: inputType, name, description }) => {
+    const itemDesc = nonEnglish ? i18n.transform(lang, description)?.name : description?.name;
+    if (inputType === 'switch' || inputType === 'password') {
+      return itemDesc;
+    }
+    if (name === 'gpsAccuracyLevel' && settingsState?.[name]) {
+      const findLevel = accuracyLevels.find((l) => l.value === settingsState[name]);
+      return findLevel?.label || itemDesc;
+    }
+    return settingsState?.[name];
   };
 
-  const settingsID = useMemo(() => {
-    return route?.params?.id;
-  }, [route]);
+  const loadSettings = useCallback(async () => {
+    const selectQuery = query.read('config', { id: 1 });
+    const { rows } = await conn.tx(db, selectQuery, [1]);
+
+    const configRows = rows._array[0];
+    setSettingsState({
+      ...settingsState,
+      ...configRows,
+      dataSyncInterval: configRows?.syncInterval || dataSyncInterval,
+    });
+  }, []);
+
+  const loadSettingsItems = useCallback(() => {
+    if (route.params?.id) {
+      const findConfig = config.find((c) => c?.id === route.params.id);
+      const fields = findConfig ? findConfig.fields : [];
+      setList(fields);
+    }
+  }, [route.params?.id]);
 
   useEffect(() => {
-    const findConfig = config.find((c) => c?.id === settingsID);
-    const fields = findConfig ? findConfig.fields : [];
-    setList(fields);
-  }, [settingsID]);
+    loadSettingsItems();
+  }, [loadSettingsItems]);
 
   useEffect(() => {
-    const selectQuery = query.read('config', { id: 1 });
-    conn.tx(db, selectQuery, [1]).then(({ rows }) => {
-      if (rows.length) {
-        const configRows = rows._array[0];
-        setSettingsState({
-          ...settingsState,
-          ...configRows,
-          syncInterval,
-        });
-      } else {
-        handleCreateNewConfig();
-      }
-    });
-  }, []);
+    loadSettings();
+  }, [loadSettings]);
+
   return (
     <BaseLayout title={pageTitle} rightComponent={false}>
       <BaseLayout.Content>
@@ -184,18 +194,11 @@ const SettingsForm = ({ route }) => {
               l.editable && l.type !== 'switch' ? { onPress: () => handleEditPress(l.id) } : {};
 
             const itemTitle = nonEnglish ? i18n.transform(lang, l)?.label : l.label;
-            const itemDesc = nonEnglish
-              ? i18n.transform(lang, l?.description)?.name
-              : l?.description?.name;
-            const subtitle =
-              l.type === 'switch' || l.type === 'password'
-                ? itemDesc
-                : settingsState[l.name] || itemDesc;
             return (
               <ListItem key={i} {...listProps} testID={`settings-form-item-${i}`} bottomDivider>
                 <ListItem.Content>
                   <ListItem.Title>{itemTitle}</ListItem.Title>
-                  <ListItem.Subtitle>{subtitle}</ListItem.Subtitle>
+                  <ListItem.Subtitle>{renderSubtitle(l)}</ListItem.Subtitle>
                 </ListItem.Content>
                 {l.type === 'switch' && (
                   <Switch
@@ -213,6 +216,7 @@ const SettingsForm = ({ route }) => {
           onCancel={handleCancelPress}
           showDialog={showDialog}
           edit={edit}
+          initValue={edit?.value}
         />
       </BaseLayout.Content>
     </BaseLayout>
diff --git a/app/src/pages/Settings/config.js b/app/src/pages/Settings/config.js
index 45854054e..636e27298 100644
--- a/app/src/pages/Settings/config.js
+++ b/app/src/pages/Settings/config.js
@@ -1,3 +1,5 @@
+import { accuracyLevels } from '../../lib/loc';
+
 export const config = [
   {
     id: 1,
@@ -51,7 +53,7 @@ export const config = [
       {
         id: 31,
         type: 'number',
-        name: 'syncInterval',
+        name: 'dataSyncInterval',
         label: 'Sync interval',
         description: {
           name: 'Sync interval in seconds',
@@ -62,7 +64,7 @@ export const config = [
             },
           ],
         },
-        key: 'UserState.syncInterval',
+        key: 'BuildParamsState.dataSyncInterval',
         editable: true,
         translations: [
           {
@@ -96,6 +98,97 @@ export const config = [
       },
     ],
   },
+  {
+    id: 2,
+    name: 'Geolocation',
+    translations: [
+      {
+        language: 'fr',
+        name: 'Géolocalisation',
+      },
+    ],
+    description: {
+      name: 'GPS threshold, Accuracy Level, Geolocation timeout',
+      translations: [
+        {
+          language: 'fr',
+          name: "Seuil GPS, Niveau de précision, Délai d'expiration de géolocalisation",
+        },
+      ],
+    },
+    fields: [
+      {
+        id: 41,
+        type: 'number',
+        name: 'gpsThreshold',
+        label: 'GPS threshold',
+        description: {
+          name: 'GPS threshold in meters',
+          translations: [
+            {
+              language: 'fr',
+              name: 'Seuil GPS en mètres',
+            },
+          ],
+        },
+        key: 'BuildParamsState.gpsThreshold',
+        editable: true,
+        translations: [
+          {
+            language: 'fr',
+            name: 'Seuil GPS',
+          },
+        ],
+      },
+      {
+        id: 42,
+        type: 'dropdown',
+        name: 'gpsAccuracyLevel',
+        label: 'Accuracy level',
+        description: {
+          name: 'The level of location manager accuracy',
+          translations: [
+            {
+              language: 'fr',
+              name: 'Le niveau de précision du gestionnaire de localisation.',
+            },
+          ],
+        },
+        key: 'BuildParamsState.gpsAccuracyLevel',
+        editable: true,
+        translations: [
+          {
+            language: 'fr',
+            name: 'Niveau de précision',
+          },
+        ],
+        options: accuracyLevels,
+      },
+      {
+        id: 43,
+        type: 'number',
+        name: 'geoLocationTimeout',
+        label: 'Geolocation Timeout',
+        description: {
+          name: 'Timeout for taking points on geolocation questions in seconds',
+          translations: [
+            {
+              language: 'fr',
+              name: "Délai d'expiration pour prendre des points sur les questions de géolocalisation en secondes",
+            },
+          ],
+        },
+        key: 'BuildParamsState.geoLocationTimeout',
+        editable: true,
+        translations: [
+          {
+            language: 'fr',
+            name: "Délai d'expiration de la géolocalisation",
+          },
+        ],
+      },
+    ],
+  },
 ];
 
 export const langConfig = {
diff --git a/app/src/store/buildParams.js b/app/src/store/buildParams.js
index 7449289cf..45c112f8a 100644
--- a/app/src/store/buildParams.js
+++ b/app/src/store/buildParams.js
@@ -13,7 +13,10 @@ const BuildParamsState = new Store({
   errorHandling: defaultBuildParams?.errorHandling || true,
   loggingLevel: defaultBuildParams?.loggingLevel || 'verbose',
   appVersion: defaultBuildParams?.appVersion || '1.0.0',
-  gpsThreshold: defaultBuildParams?.gpsThreshold || 20,
+  gpsThreshold: defaultBuildParams?.gpsThreshold || 20, // meters
+  gpsInterval: 60, // seconds
+  gpsAccuracyLevel: 4, // High
+  geoLocationTimeout: 60, // seconds
 });
 
 export default BuildParamsState;
diff --git a/app/src/store/users.js b/app/src/store/users.js
index 9139c2d89..2cf5867fd 100644
--- a/app/src/store/users.js
+++ b/app/src/store/users.js
@@ -8,6 +8,8 @@ const UserState = new Store({
   syncWifiOnly: false,
   // syncInterval: 300,
   forms: [],
+  currentLocation: null,
+  locationIsGranted: false,
 });
 
 export default UserState;
diff --git a/backend/api/v1/v1_mobile/serializers.py b/backend/api/v1/v1_mobile/serializers.py
index 40f3acf04..e017bac0b 100644
--- a/backend/api/v1/v1_mobile/serializers.py
+++ b/backend/api/v1/v1_mobile/serializers.py
@@ -5,7 +5,7 @@
 from api.v1.v1_forms.models import Forms
 from drf_spectacular.types import OpenApiTypes
 from api.v1.v1_mobile.authentication import MobileAssignmentToken
-from api.v1.v1_profile.models import Administration, Levels, Entity
+from api.v1.v1_profile.models import Administration, Entity
 from utils.custom_serializer_fields import CustomCharField
 from api.v1.v1_mobile.models import MobileAssignment, MobileApk
 from utils.custom_helper import CustomPasscode, generate_random_string
@@ -24,18 +24,6 @@ class Meta:
         fields = ["id", "name", "url"]
 
 
-class MobileAssignmentAdministrationSerializer(serializers.ModelSerializer):
-    id = serializers.IntegerField()
-    name = serializers.SerializerMethodField()
-
-    def get_name(self, obj):
-        return obj.full_path_name
-
-    class Meta:
-        model = Administration
-        fields = ["id", "name"]
-
-
 class MobileFormSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField()
     version = serializers.CharField()
@@ -55,29 +43,11 @@ class MobileAssignmentFormsSerializer(serializers.Serializer):
     name = serializers.CharField(read_only=True)
     syncToken = serializers.SerializerMethodField()
     formsUrl = serializers.SerializerMethodField()
-    administrations = serializers.SerializerMethodField()
 
     @extend_schema_field(MobileFormSerializer(many=True))
     def get_formsUrl(self, obj):
         return MobileFormSerializer(obj.forms.all(), many=True).data
 
-    @extend_schema_field(MobileAssignmentAdministrationSerializer(many=True))
-    def get_administrations(self, obj):
-        lowest_level = Levels.objects.order_by("-level").first()
-        all_lowest_levels = []
-        for adm in obj.administrations.all():
-            if adm.level == lowest_level:
-                all_lowest_levels.append(adm)
-                continue
-            administration = Administration.objects.filter(
-                path__startswith=adm.path,
-                level=lowest_level,
-            ).all()
-            all_lowest_levels.extend(administration)
-        return MobileAssignmentAdministrationSerializer(
-            all_lowest_levels, many=True
-        ).data
-
     def get_syncToken(self, obj):
         return str(MobileAssignmentToken.for_assignment(obj))
 
@@ -88,7 +58,7 @@ def validate_code(self, value):
         return value
 
     class Meta:
-        fields = ["name", "syncToken", "formsUrl", "code", "administrations"]
+        fields = ["name", "syncToken", "formsUrl", "code"]
 
 
 class IdAndNameRelatedField(serializers.PrimaryKeyRelatedField):
diff --git a/backend/api/v1/v1_mobile/tests/tests_api.py b/backend/api/v1/v1_mobile/tests/tests_api.py
index 9b4fa3f91..634d1101d 100644
--- a/backend/api/v1/v1_mobile/tests/tests_api.py
+++ b/backend/api/v1/v1_mobile/tests/tests_api.py
@@ -73,14 +73,6 @@ def test_mobile_assignment_form_api(self):
         token = MobileAssignmentToken(syncToken)
 
         self.assertEqual(token.assignment.id, self.mobile_assignment.id)
-        paths = [
-            f'{adm.path}{adm.id}.' for adm in self.administration_children
-        ]
-        # administration should only shows the lowest level
-        self.assertEqual(
-            len(response.data['administrations']),
-            Administration.objects.filter(path__in=paths).count(),
-        )
 
         self.assertEqual(
             dict(response.data['formsUrl'][0]),