diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 7de895d..81c1dae 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <!-- Required for scheduling local notifications -->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 2cd1632..0fc165b 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -198,6 +198,53 @@ PODS:
     - nanopb/encode (= 2.30910.0)
   - nanopb/decode (2.30910.0)
   - nanopb/encode (2.30910.0)
+  - NitroGeolocation (1.4.3):
+    - hermes-engine
+    - NitroModules
+    - RCTRequired
+    - RCTTypeSafety
+    - React-callinvoker
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - Yoga
+  - NitroModules (0.36.1):
+    - hermes-engine
+    - RCTRequired
+    - RCTTypeSafety
+    - React-callinvoker
+    - React-Core
+    - React-Core-prebuilt
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - ReactNativeDependencies
+    - Yoga
   - op-sqlite (15.2.5):
     - hermes-engine
     - OpenSSL-Universal
@@ -221,7 +268,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
     - Yoga
-  - OpenSSL-Universal (3.3.3001)
+  - OpenSSL-Universal (3.6.2000)
   - PromisesObjC (2.4.0)
   - PromisesSwift (2.4.0):
     - PromisesObjC (= 2.4.0)
@@ -1714,28 +1761,6 @@ PODS:
     - Yoga
   - react-native-geocoder (0.5.0):
     - React
-  - react-native-geolocation (3.4.0):
-    - hermes-engine
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-Core-prebuilt
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-jsi
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-renderercss
-    - React-rendererdebug
-    - React-utils
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - ReactNativeDependencies
-    - Yoga
   - react-native-google-maps (1.20.1):
     - Google-Maps-iOS-Utils (= 5.0.0)
     - GoogleMaps (= 8.4.0)
@@ -2963,6 +2988,8 @@ DEPENDENCIES:
   - IQKeyboardManager
   - MendixNative (from `../node_modules/mendix-native`)
   - nanopb
+  - NitroGeolocation (from `../node_modules/react-native-nitro-geolocation`)
+  - NitroModules (from `../node_modules/react-native-nitro-modules`)
   - "op-sqlite (from `../node_modules/@op-engineering/op-sqlite`)"
   - QRCodeReader.swift (~> 10.1.0)
   - RCTDeprecation (from `../node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)
@@ -3007,7 +3034,6 @@ DEPENDENCIES:
   - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
   - react-native-file-viewer-turbo (from `../node_modules/react-native-file-viewer-turbo`)
   - react-native-geocoder (from `../node_modules/react-native-geocoder`)
-  - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
   - react-native-google-maps (from `../node_modules/react-native-maps`)
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-maps (from `../node_modules/react-native-maps`)
@@ -3122,6 +3148,10 @@ EXTERNAL SOURCES:
     :tag: hermes-v0.15.1
   MendixNative:
     :path: "../node_modules/mendix-native"
+  NitroGeolocation:
+    :path: "../node_modules/react-native-nitro-geolocation"
+  NitroModules:
+    :path: "../node_modules/react-native-nitro-modules"
   op-sqlite:
     :path: "../node_modules/@op-engineering/op-sqlite"
   RCTDeprecation:
@@ -3206,8 +3236,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-file-viewer-turbo"
   react-native-geocoder:
     :path: "../node_modules/react-native-geocoder"
-  react-native-geolocation:
-    :path: "../node_modules/@react-native-community/geolocation"
   react-native-google-maps:
     :path: "../node_modules/react-native-maps"
   react-native-image-picker:
@@ -3371,14 +3399,16 @@ SPEC CHECKSUMS:
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
   GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
   GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
-  hermes-engine: 2ece5229b4460076597f50050f4fb14074f8f714
+  hermes-engine: dd25b752a961795fcef9d248218ede66437847d4
   IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   MendixNative: 7e5ed081dfc0cbe76d8d81b76efafba9f3dd6a4e
   MultiplatformBleAdapter: b1fddd0d499b96b607e00f0faa8e60648343dc1d
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
+  NitroGeolocation: 688a2b889656060dafe9d83dc62fc0513b954a97
+  NitroModules: 4d19ff59969b2c67a19175fb17b66917af6708e0
   op-sqlite: e9ef65bcf95a97863874cee87841425bb71c8396
-  OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
+  OpenSSL-Universal: ecee7b138fa75a74ecf00d7ffd248fb584739b9e
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   QRCodeReader.swift: 373a389fe9a22d513c879a32a6f647c58f4ef572
@@ -3390,7 +3420,7 @@ SPEC CHECKSUMS:
   React: 1ba7d364ade7d883a1ec055bfc3606f35fdee17b
   React-callinvoker: bc2a26f8d84fb01f003fc6de6c9337b64715f95b
   React-Core: 7840d3a80b43a95c5e80ef75146bd70925ebab0f
-  React-Core-prebuilt: a54db89db007bc34115efc5abe10e05c699797da
+  React-Core-prebuilt: 2439654d53489a5609231fe950d7f4e4c641ad52
   React-CoreModules: 2eb010400b63b89e53a324ffb3c112e4c7c3ce42
   React-cxxreact: a558e92199d26f145afa9e62c4233cf8e7950efe
   React-debug: 755200a6e7f5e6e0a40ff8d215493d43cce285fc
@@ -3423,7 +3453,6 @@ SPEC CHECKSUMS:
   react-native-cameraroll: bd1a177463acbba89365d09e81057294eba1e2f6
   react-native-file-viewer-turbo: 0da5fe2575b1c2e43ce8246fcd0fa9c3b097a72d
   react-native-geocoder: bc977303c9c53cce36bcdb3c6f17e6832f86beb6
-  react-native-geolocation: cfc39041210bd9f591ec2beb7d417291251da8e5
   react-native-google-maps: c4f5c5b2dda17e7cb2cb2b37a81f140b039b3e7e
   react-native-image-picker: 168d6972e50ea848defe4ac4c222faa9bc52aea0
   react-native-maps: 9febd31278b35cd21e4fad2cf6fa708993be5dab
@@ -3470,7 +3499,7 @@ SPEC CHECKSUMS:
   ReactCodegen: 797de5178718324c6eba3327b07f9a423fbd5787
   ReactCommon: 07572bf9e687c8a52fbe4a3641e9e3a1a477c78e
   ReactNativeBiometrics: 9ead8d633833fd13e5a79564af8ba7064c2a58c6
-  ReactNativeDependencies: e709c771664b1e4e11acf00936c61a975577bf9c
+  ReactNativeDependencies: 14132e559d3008cd261e3c00859a58fd4f7fa42c
   RNBootSplash: 13b7612788960d0c5446e68489ac2509e506cfcd
   RNCalendarEvents: f90f73666b6bcbb3cc8a491ffbb5e48c0db3de37
   RNCAsyncStorage: 3a4f5e2777dae1688b781a487923a08569e27fe4
diff --git a/package-lock.json b/package-lock.json
index 978bd7e..2be9bdd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,6 @@
         "@react-native-community/cli-platform-android": "20.1.3",
         "@react-native-community/cli-platform-ios": "20.1.3",
         "@react-native-community/datetimepicker": "8.6.0",
-        "@react-native-community/geolocation": "3.4.0",
         "@react-native-community/netinfo": "11.5.2",
         "@react-native-firebase/analytics": "20.1.0",
         "@react-native-firebase/app": "20.1.0",
@@ -50,6 +49,8 @@
         "react-native-linear-gradient": "2.8.3",
         "react-native-localize": "3.7.0",
         "react-native-maps": "1.20.1",
+        "react-native-nitro-geolocation": "1.4.3",
+        "react-native-nitro-modules": "0.36.1",
         "react-native-notify-kit": "10.4.7",
         "react-native-pager-view": "6.9.1",
         "react-native-permissions": "5.5.1",
@@ -2264,19 +2265,6 @@
         }
       }
     },
-    "node_modules/@react-native-community/geolocation": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@react-native-community/geolocation/-/geolocation-3.4.0.tgz",
-      "integrity": "sha512-bzZH89/cwmpkPMKKveoC72C4JH0yF4St5Ceg/ZM9pA1SqX9MlRIrIrrOGZ/+yi++xAvFDiYfihtn9TvXWU9/rA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
-      }
-    },
     "node_modules/@react-native-community/netinfo": {
       "version": "11.5.2",
       "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-11.5.2.tgz",
@@ -8020,6 +8008,27 @@
         }
       }
     },
+    "node_modules/react-native-nitro-geolocation": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/react-native-nitro-geolocation/-/react-native-nitro-geolocation-1.4.3.tgz",
+      "integrity": "sha512-8r09M6fjf7krCXRuF3RskuJpcxE8dvwQtRJnlrk+U3tO4v+ltyXhRRGmAMlO2Y/PEv1II8sgnIgil58RaLPI4A==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=18.0.0",
+        "react-native": ">=0.75.0",
+        "react-native-nitro-modules": "*"
+      }
+    },
+    "node_modules/react-native-nitro-modules": {
+      "version": "0.36.1",
+      "resolved": "https://registry.npmjs.org/react-native-nitro-modules/-/react-native-nitro-modules-0.36.1.tgz",
+      "integrity": "sha512-kBv/VvKqAmkXAvP1DxJMC9b/fRhh7JdSO4EUnPP46hJjrIFeFR8AwKm8mYaKZEuF014M/TVdv2vomVUW0umsQQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/react-native-notify-kit": {
       "version": "10.4.7",
       "resolved": "https://registry.npmjs.org/react-native-notify-kit/-/react-native-notify-kit-10.4.7.tgz",
diff --git a/package.json b/package.json
index 82d7e59..90a12b5 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
     "@react-native-community/cli-platform-android": "20.1.3",
     "@react-native-community/cli-platform-ios": "20.1.3",
     "@react-native-community/datetimepicker": "8.6.0",
-    "@react-native-community/geolocation": "3.4.0",
     "@react-native-community/netinfo": "11.5.2",
     "@react-native-firebase/analytics": "20.1.0",
     "@react-native-firebase/app": "20.1.0",
@@ -49,6 +48,8 @@
     "react-native-fast-image": "8.6.3",
     "react-native-file-viewer-turbo": "0.7.4",
     "react-native-geocoder": "0.5.0",
+    "react-native-nitro-geolocation": "1.4.3",
+    "react-native-nitro-modules": "0.36.1",
     "react-native-gesture-handler": "2.31.2",
     "react-native-image-picker": "7.2.3",
     "react-native-inappbrowser-reborn": "3.7.0",