diff --git a/kura/org.eclipse.kura.linux.position/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.linux.position/META-INF/MANIFEST.MF
index d4ddcada66c..11e3ac69903 100644
--- a/kura/org.eclipse.kura.linux.position/META-INF/MANIFEST.MF
+++ b/kura/org.eclipse.kura.linux.position/META-INF/MANIFEST.MF
@@ -26,3 +26,5 @@ Import-Package: de.taimos.gpsd4java.api;version="[1.0,2.0)",
  org.osgi.util.measurement;version="1.0.1",
  org.osgi.util.position;version="1.0.1",
  org.slf4j;version="1.6.4"
+Export-Package: org.eclipse.kura.linux.position.options;version="1.0.0";x-internal:=true,
+ org.eclipse.kura.linux.position.provider;version="1.0.0";x-internal:=true
diff --git a/kura/org.eclipse.kura.linux.position/OSGI-INF/gpsTracker.xml b/kura/org.eclipse.kura.linux.position/OSGI-INF/gpsTracker.xml
index c8f573bc547..69f134658e5 100644
--- a/kura/org.eclipse.kura.linux.position/OSGI-INF/gpsTracker.xml
+++ b/kura/org.eclipse.kura.linux.position/OSGI-INF/gpsTracker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others
+   Copyright (c) 2018, 2024 Eurotech and/or its affiliates and others
 
    This program and the accompanying materials are made
    available under the terms of the Eclipse Public License 2.0
@@ -14,12 +14,12 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="false" name="GpsDeviceTracker">
-   <implementation class="org.eclipse.kura.linux.position.GpsDeviceTracker"/>
+   <implementation class="org.eclipse.kura.linux.position.serial.GpsDeviceTracker"/>
    <service>
       <provide interface="org.osgi.service.event.EventHandler"/>
-      <provide interface="org.eclipse.kura.linux.position.GpsDeviceTracker"/>
+      <provide interface="org.eclipse.kura.linux.position.serial.GpsDeviceTracker"/>
    </service>
-   <property name="service.pid" value="org.eclipse.kura.linux.position.GpsDeviceTracker"/>
+   <property name="service.pid" value="org.eclipse.kura.linux.position.serial.GpsDeviceTracker"/>
    <property name="event.topics" type="String">org/eclipse/kura/usb/NetworkEvent/device/ADDED
 org/eclipse/kura/usb/NetworkEvent/device/REMOVED
    </property>
diff --git a/kura/org.eclipse.kura.linux.position/OSGI-INF/gpsdPositionProvider.xml b/kura/org.eclipse.kura.linux.position/OSGI-INF/gpsdPositionProvider.xml
index 43b05ce506d..8bdabe80dbb 100644
--- a/kura/org.eclipse.kura.linux.position/OSGI-INF/gpsdPositionProvider.xml
+++ b/kura/org.eclipse.kura.linux.position/OSGI-INF/gpsdPositionProvider.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2022 Eurotech and/or its affiliates and others
+   Copyright (c) 2024 Eurotech and/or its affiliates and others
 
    This program and the accompanying materials are made
    available under the terms of the Eclipse Public License 2.0
@@ -14,11 +14,11 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="false" name="GpsdPositionProvider">
-   <implementation class="org.eclipse.kura.linux.position.GpsdPositionProvider"/>
+   <implementation class="org.eclipse.kura.linux.position.gpsd.GpsdPositionProvider"/>
    <service>
-      <provide interface="org.eclipse.kura.linux.position.PositionProvider"/>
-      <provide interface="org.eclipse.kura.linux.position.GpsdPositionProvider" />
+      <provide interface="org.eclipse.kura.linux.position.provider.PositionProvider"/>
+      <provide interface="org.eclipse.kura.linux.position.gpsd.GpsdPositionProvider" />
    </service>
    
-   <property name="service.pid" value="org.eclipse.kura.linux.position.GpsdPositionProvider"/>
+   <property name="service.pid" value="org.eclipse.kura.linux.position.gpsd.GpsdPositionProvider"/>
 </scr:component>
diff --git a/kura/org.eclipse.kura.linux.position/OSGI-INF/metatype/org.eclipse.kura.position.PositionService.xml b/kura/org.eclipse.kura.linux.position/OSGI-INF/metatype/org.eclipse.kura.position.PositionService.xml
index d40e1af3790..fe28efb7c8a 100644
--- a/kura/org.eclipse.kura.linux.position/OSGI-INF/metatype/org.eclipse.kura.position.PositionService.xml
+++ b/kura/org.eclipse.kura.linux.position/OSGI-INF/metatype/org.eclipse.kura.position.PositionService.xml
@@ -46,8 +46,20 @@
             
             <Option label="serial" value="serial" />
             <Option label="gpsd" value="gpsd" />
+            <Option label="modemManager" value="modemManager" />
             
         </AD>
+        
+        <AD id="modem.manager.refresh.rate.seconds"  
+            name="modem.manager.refresh.rate.seconds"
+            type="Integer"
+            cardinality="0" 
+            required="true"
+            default="30"
+            min="0"
+            description="Refresh time in seconds at which the position is updated when using the Modem Manager Position Provider">
+        </AD>
+        
         <AD id="gpsd.host" 
             name="gpsd.host" 
             type="String"
diff --git a/kura/org.eclipse.kura.linux.position/OSGI-INF/modemTracker.xml b/kura/org.eclipse.kura.linux.position/OSGI-INF/modemTracker.xml
index 4d24234ad64..f9e6253dc93 100644
--- a/kura/org.eclipse.kura.linux.position/OSGI-INF/modemTracker.xml
+++ b/kura/org.eclipse.kura.linux.position/OSGI-INF/modemTracker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others
+   Copyright (c) 2018, 2024 Eurotech and/or its affiliates and others
 
    This program and the accompanying materials are made
    available under the terms of the Eclipse Public License 2.0
@@ -14,12 +14,12 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="false" name="ModemGpsStatusTracker">
-   <implementation class="org.eclipse.kura.linux.position.ModemGpsStatusTracker"/>
+   <implementation class="org.eclipse.kura.linux.position.serial.ModemGpsStatusTracker"/>
    <service>
       <provide interface="org.osgi.service.event.EventHandler"/>
-      <provide interface="org.eclipse.kura.linux.position.ModemGpsStatusTracker"/>
+      <provide interface="org.eclipse.kura.linux.position.serial.ModemGpsStatusTracker"/>
    </service>
-   <property name="service.pid" value="org.eclipse.kura.linux.position.ModemGpsStatusTracker"/>
+   <property name="service.pid" value="org.eclipse.kura.linux.position.serial.ModemGpsStatusTracker"/>
    <property name="event.topics" type="String">org/eclipse/kura/net/modem/gps/ENABLED
 org/eclipse/kura/net/modem/gps/DISABLED
    </property>
diff --git a/kura/org.eclipse.kura.linux.position/OSGI-INF/position.xml b/kura/org.eclipse.kura.linux.position/OSGI-INF/position.xml
index 5ad51bc82a1..4427e1c8ee0 100644
--- a/kura/org.eclipse.kura.linux.position/OSGI-INF/position.xml
+++ b/kura/org.eclipse.kura.linux.position/OSGI-INF/position.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2011, 2020 Eurotech and/or its affiliates and others
+   Copyright (c) 2011, 2024 Eurotech and/or its affiliates and others
 
    This program and the accompanying materials are made
    available under the terms of the Eclipse Public License 2.0
@@ -13,14 +13,14 @@
 	 Eurotech
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" configuration-policy="require" deactivate="deactivate" enabled="true" immediate="true" modified="updated" name="org.eclipse.kura.position.PositionService">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" activate="activate" configuration-policy="require" deactivate="deactivate" enabled="true" immediate="true" modified="updated" name="org.eclipse.kura.position.PositionService">
    <implementation class="org.eclipse.kura.linux.position.PositionServiceImpl"/>
    <service>
       <provide interface="org.eclipse.kura.position.PositionService"/>
       <provide interface="org.eclipse.kura.configuration.ConfigurableComponent"/>
    </service>
    
-   <reference bind="setPositionProviders" cardinality="1..n" interface="org.eclipse.kura.linux.position.PositionProvider" name="PositionProviders" policy="static" unbind="unsetPositionProviders"/>
+   <reference bind="setPositionProviders" cardinality="1..n" interface="org.eclipse.kura.linux.position.provider.PositionProvider" name="PositionProviders" policy-option="greedy" policy="static" unbind="unsetPositionProviders"/>
    
    <property name="service.pid" value="org.eclipse.kura.position.PositionService"/>
    <reference bind="setEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static" unbind="unsetEventAdmin"/>
diff --git a/kura/org.eclipse.kura.linux.position/OSGI-INF/serialDevicePositionProvider.xml b/kura/org.eclipse.kura.linux.position/OSGI-INF/serialDevicePositionProvider.xml
index c354ea57810..360214ae682 100644
--- a/kura/org.eclipse.kura.linux.position/OSGI-INF/serialDevicePositionProvider.xml
+++ b/kura/org.eclipse.kura.linux.position/OSGI-INF/serialDevicePositionProvider.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-   Copyright (c) 2022 Eurotech and/or its affiliates and others
+   Copyright (c) 2024 Eurotech and/or its affiliates and others
 
    This program and the accompanying materials are made
    available under the terms of the Eclipse Public License 2.0
@@ -14,14 +14,14 @@
 
 -->
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="false" name="SerialDevicePositionProvider">
-   <implementation class="org.eclipse.kura.linux.position.SerialDevicePositionProvider"/>
+   <implementation class="org.eclipse.kura.linux.position.serial.SerialDevicePositionProvider"/>
    <service>
-      <provide interface="org.eclipse.kura.linux.position.PositionProvider"/>
-      <provide interface="org.eclipse.kura.linux.position.SerialDevicePositionProvider" />
+      <provide interface="org.eclipse.kura.linux.position.provider.PositionProvider"/>
+      <provide interface="org.eclipse.kura.linux.position.serial.SerialDevicePositionProvider" />
    </service>
-   <property name="service.pid" value="org.eclipse.kura.linux.position.SerialDevicePositionProvider"/>
-   <reference bind="setModemGpsStatusTracker" cardinality="1..1" interface="org.eclipse.kura.linux.position.ModemGpsStatusTracker" name="ModemGpsStatusTracker" policy="static" unbind="unsetModemGpsStatusTracker"/>
-   <reference bind="setGpsDeviceTracker" cardinality="1..1" interface="org.eclipse.kura.linux.position.GpsDeviceTracker" name="GpsDeviceTracker" policy="static" unbind="unsetGpsDeviceTracker"/>
+   <property name="service.pid" value="org.eclipse.kura.linux.position.serial.SerialDevicePositionProvider"/>
+   <reference bind="setModemGpsStatusTracker" cardinality="1..1" interface="org.eclipse.kura.linux.position.serial.ModemGpsStatusTracker" name="ModemGpsStatusTracker" policy="static" unbind="unsetModemGpsStatusTracker"/>
+   <reference bind="setGpsDeviceTracker" cardinality="1..1" interface="org.eclipse.kura.linux.position.serial.GpsDeviceTracker" name="GpsDeviceTracker" policy="static" unbind="unsetGpsDeviceTracker"/>
    <reference bind="setConnectionFactory" cardinality="1..1" interface="org.osgi.service.io.ConnectionFactory" name="ConnectionFactory" policy="static" unbind="unsetConnectionFactory"/>   
 </scr:component>
 
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java
index 9bc65c33a50..004116f4972 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceImpl.java
@@ -27,6 +27,10 @@
 import org.eclipse.kura.KuraErrorCode;
 import org.eclipse.kura.KuraException;
 import org.eclipse.kura.configuration.ConfigurableComponent;
+import org.eclipse.kura.linux.position.options.PositionServiceOptions;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
+import org.eclipse.kura.linux.position.provider.LockStatusListener;
+import org.eclipse.kura.linux.position.provider.PositionProvider;
 import org.eclipse.kura.position.GNSSType;
 import org.eclipse.kura.position.NmeaPosition;
 import org.eclipse.kura.position.PositionListener;
@@ -41,7 +45,7 @@
 import org.slf4j.LoggerFactory;
 
 public class PositionServiceImpl
-        implements PositionService, ConfigurableComponent, GpsDeviceAvailabilityListener, GpsDevice.Listener {
+        implements PositionService, ConfigurableComponent, GpsDeviceAvailabilityListener, LockStatusListener {
 
     private static final Logger logger = LoggerFactory.getLogger(PositionServiceImpl.class);
 
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/gpsd/GpsdPositionProvider.java
similarity index 96%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/gpsd/GpsdPositionProvider.java
index e4f06d5f5b7..2ff990edca5 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsdPositionProvider.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/gpsd/GpsdPositionProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.gpsd;
 
 import static java.lang.Math.toRadians;
 
@@ -29,7 +29,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.eclipse.kura.linux.position.GpsDevice.Listener;
+import org.eclipse.kura.linux.position.options.PositionServiceOptions;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
+import org.eclipse.kura.linux.position.provider.LockStatusListener;
+import org.eclipse.kura.linux.position.provider.PositionProvider;
+import org.eclipse.kura.linux.position.provider.PositionProviderType;
 import org.eclipse.kura.position.GNSSType;
 import org.eclipse.kura.position.NmeaPosition;
 import org.osgi.util.measurement.Measurement;
@@ -59,7 +63,7 @@ public class GpsdPositionProvider implements PositionProvider, IObjectListener {
     private GPSdEndpoint gpsEndpoint;
     private PositionServiceOptions configuration;
 
-    private Listener gpsDeviceListener;
+    private LockStatusListener gpsDeviceListener;
     private ScheduledExecutorService executor;
     private Future<?> checkFuture = CompletableFuture.completedFuture(null);
 
@@ -148,7 +152,7 @@ public String getLastSentence() {
     }
 
     @Override
-    public void init(PositionServiceOptions configuration, Listener gpsDeviceListener,
+    public void init(PositionServiceOptions configuration, LockStatusListener gpsDeviceListener,
             GpsDeviceAvailabilityListener gpsDeviceAvailabilityListener) {
         stop();
 
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceOptions.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/options/PositionServiceOptions.java
similarity index 92%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceOptions.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/options/PositionServiceOptions.java
index ee63adf0311..4902975e8cc 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionServiceOptions.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/options/PositionServiceOptions.java
@@ -11,13 +11,14 @@
  *  Eurotech
  *******************************************************************************/
 
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.options;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.OptionalInt;
 
 import org.eclipse.kura.comm.CommURI;
+import org.eclipse.kura.linux.position.provider.PositionProviderType;
 
 public class PositionServiceOptions {
 
@@ -38,6 +39,7 @@ public class PositionServiceOptions {
     private static final Property<Integer> GPSD_PORT = new Property<>("gpsd.port", 2947);
     private static final Property<Integer> GPSD_MAX_FIX_VALIDITY_INTERVAL = new Property<>(
             "gpsd.max.fix.validity.interval.seconds", 60);
+    private static final Property<Integer> MM_REFRESH_RATE = new Property<>("modem.manager.refresh.rate.seconds", 30);
 
     private final Map<String, Object> properties;
 
@@ -110,6 +112,10 @@ public OptionalInt getGpsdMaxValidityInterval() {
         }
     }
 
+    public int getModemManagerRefreshRate() {
+        return MM_REFRESH_RATE.get(this.properties);
+    }
+
     public CommURI getGpsDeviceUri() {
         if (getPort().isEmpty()) {
             return null;
@@ -140,7 +146,8 @@ && getPort().equals(other.getPort()) && getBaudRate() == other.getBaudRate()
                 && getBitsPerWord() == other.getBitsPerWord() && getStopBits() == other.getStopBits()
                 && getParity() == other.getParity() && getPositionProvider().equals(other.getPositionProvider())
                 && getGpsdHost().equals(other.getGpsdHost()) && getGpsdPort() == other.getGpsdPort()
-                && getGpsdMaxValidityInterval().equals(other.getGpsdMaxValidityInterval());
+                && getGpsdMaxValidityInterval().equals(other.getGpsdMaxValidityInterval())
+                && getModemManagerRefreshRate() == other.getModemManagerRefreshRate();
     }
 
     private static final class Property<T> {
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDeviceAvailabilityListener.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/GpsDeviceAvailabilityListener.java
similarity index 82%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDeviceAvailabilityListener.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/GpsDeviceAvailabilityListener.java
index 3eef14f07e7..f52feec022c 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDeviceAvailabilityListener.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/GpsDeviceAvailabilityListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2018, 2024 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -11,7 +11,7 @@
  *  Eurotech
  *******************************************************************************/
 
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.provider;
 
 public interface GpsDeviceAvailabilityListener {
 
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/LockStatusListener.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/LockStatusListener.java
new file mode 100644
index 00000000000..c9d7aab6556
--- /dev/null
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/LockStatusListener.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2018, 2024 Eurotech and/or its affiliates and others
+ * 
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ *  Eurotech
+ *******************************************************************************/
+
+package org.eclipse.kura.linux.position.provider;
+
+import org.eclipse.kura.position.PositionListener;
+
+public interface LockStatusListener extends PositionListener {
+
+    public void onLockStatusChanged(final boolean hasLock);
+}
\ No newline at end of file
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProvider.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/PositionProvider.java
similarity index 84%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProvider.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/PositionProvider.java
index cf263e58930..3baeb464e38 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProvider.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/PositionProvider.java
@@ -11,12 +11,12 @@
  *  Eurotech
  *******************************************************************************/
 
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.provider;
 
 import java.time.LocalDateTime;
 import java.util.Set;
 
-import org.eclipse.kura.linux.position.GpsDevice.Listener;
+import org.eclipse.kura.linux.position.options.PositionServiceOptions;
 import org.eclipse.kura.position.GNSSType;
 import org.eclipse.kura.position.NmeaPosition;
 import org.osgi.util.position.Position;
@@ -41,7 +41,7 @@ public interface PositionProvider {
 
     public String getLastSentence();
 
-    public void init(PositionServiceOptions configuration, Listener gpsDeviceListener,
+    public void init(PositionServiceOptions configuration, LockStatusListener gpsDeviceListener,
             GpsDeviceAvailabilityListener gpsDeviceAvailabilityListener);
 
     public PositionProviderType getType();
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProviderType.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/PositionProviderType.java
similarity index 86%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProviderType.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/PositionProviderType.java
index 1527276640b..72b226e67e1 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/PositionProviderType.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/provider/PositionProviderType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 Eurotech and/or its affiliates and others
+ * Copyright (c) 2024 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -11,7 +11,7 @@
  *  Eurotech
  *******************************************************************************/
 
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.provider;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,8 @@
 public enum PositionProviderType {
 
     SERIAL("serial"),
-    GPSD("gpsd");
+    GPSD("gpsd"),
+    MODEM_MANAGER("modemManager");
 
     private String value;
 
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDevice.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/GpsDevice.java
similarity index 95%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDevice.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/GpsDevice.java
index c8997bcb121..1a24c209e36 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDevice.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/GpsDevice.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.serial;
 
 import static java.util.Objects.requireNonNull;
 
@@ -20,12 +20,12 @@
 
 import org.eclipse.kura.comm.CommConnection;
 import org.eclipse.kura.comm.CommURI;
-import org.eclipse.kura.linux.position.NMEAParser.Code;
-import org.eclipse.kura.linux.position.NMEAParser.ParseException;
+import org.eclipse.kura.linux.position.provider.LockStatusListener;
+import org.eclipse.kura.linux.position.serial.NMEAParser.Code;
+import org.eclipse.kura.linux.position.serial.NMEAParser.ParseException;
 import org.eclipse.kura.position.GNSSType;
 import org.eclipse.kura.position.NmeaPosition;
 import org.eclipse.kura.position.PositionException;
-import org.eclipse.kura.position.PositionListener;
 import org.osgi.service.io.ConnectionFactory;
 import org.osgi.util.position.Position;
 import org.slf4j.Logger;
@@ -48,11 +48,11 @@ public class GpsDevice {
     private final SerialCommunicate commThread;
     private String lastSentence;
 
-    private Listener listener;
+    private LockStatusListener listener;
 
     private final NMEAParser nmeaParser = new NMEAParser();
 
-    public GpsDevice(final ConnectionFactory connFactory, final CommURI commURI, final Listener listener)
+    public GpsDevice(final ConnectionFactory connFactory, final CommURI commURI, final LockStatusListener listener)
             throws PositionException {
         this.uri = commURI;
         this.listener = listener;
@@ -275,9 +275,4 @@ public String toString() {
         sb.append(this.nmeaParser.getFixQuality());
         return sb.toString();
     }
-
-    interface Listener extends PositionListener {
-
-        public void onLockStatusChanged(final boolean hasLock);
-    }
 }
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDeviceTracker.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/GpsDeviceTracker.java
similarity index 95%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDeviceTracker.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/GpsDeviceTracker.java
index fdb9b910788..046a4cc6b6e 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/GpsDeviceTracker.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/GpsDeviceTracker.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2018, 2024 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -11,12 +11,13 @@
  *  Eurotech
  *******************************************************************************/
 
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.serial;
 
 import java.io.File;
 import java.util.Optional;
 
 import org.eclipse.kura.comm.CommURI;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
 import org.eclipse.kura.usb.UsbService;
 import org.eclipse.kura.usb.UsbTtyDevice;
 import org.osgi.service.event.Event;
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/ModemGpsStatusTracker.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/ModemGpsStatusTracker.java
similarity index 94%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/ModemGpsStatusTracker.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/ModemGpsStatusTracker.java
index ffa2659c9c1..a6ea109488f 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/ModemGpsStatusTracker.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/ModemGpsStatusTracker.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2018, 2024 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -11,12 +11,13 @@
  *  Eurotech
  *******************************************************************************/
 
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.serial;
 
 import static org.eclipse.kura.net.modem.ModemGpsDisabledEvent.MODEM_EVENT_GPS_DISABLED_TOPIC;
 import static org.eclipse.kura.net.modem.ModemGpsEnabledEvent.MODEM_EVENT_GPS_ENABLED_TOPIC;
 
 import org.eclipse.kura.comm.CommURI;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
 import org.eclipse.kura.net.modem.ModemGpsEnabledEvent;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventHandler;
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/NMEAParser.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/NMEAParser.java
similarity index 98%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/NMEAParser.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/NMEAParser.java
index b2e9535c1eb..c463fe6ffce 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/NMEAParser.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/NMEAParser.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.serial;
 
 import static java.lang.Math.toRadians;
 
@@ -318,11 +318,11 @@ private double convertPosition(String pos, String direction, int degChars) {
         return deg;
     }
 
-    double convertPositionlat(String pos, String direction) {
+    public double convertPositionlat(String pos, String direction) {
         return convertPosition(pos, direction, 2);
     }
 
-    double convertPositionlon(String pos, String direction) {
+    public double convertPositionlon(String pos, String direction) {
         return convertPosition(pos, direction, 3);
     }
 
diff --git a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/SerialDevicePositionProvider.java
similarity index 89%
rename from kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java
rename to kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/SerialDevicePositionProvider.java
index a358011ad30..89a06066540 100644
--- a/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/SerialDevicePositionProvider.java
+++ b/kura/org.eclipse.kura.linux.position/src/main/java/org/eclipse/kura/linux/position/serial/SerialDevicePositionProvider.java
@@ -10,14 +10,18 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
-package org.eclipse.kura.linux.position;
+package org.eclipse.kura.linux.position.serial;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Set;
 
 import org.eclipse.kura.comm.CommURI;
-import org.eclipse.kura.linux.position.GpsDevice.Listener;
+import org.eclipse.kura.linux.position.options.PositionServiceOptions;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
+import org.eclipse.kura.linux.position.provider.LockStatusListener;
+import org.eclipse.kura.linux.position.provider.PositionProvider;
+import org.eclipse.kura.linux.position.provider.PositionProviderType;
 import org.eclipse.kura.position.GNSSType;
 import org.eclipse.kura.position.NmeaPosition;
 import org.osgi.service.io.ConnectionFactory;
@@ -39,7 +43,7 @@ public class SerialDevicePositionProvider implements PositionProvider {
 
     private PositionServiceOptions configuration;
 
-    private Listener gpsDeviceListener;
+    private LockStatusListener lockStatusListener;
 
     private DateTimeFormatter nmeaDateTimePattern = DateTimeFormatter.ofPattern("ddMMyy hhmmss");
 
@@ -93,13 +97,13 @@ public void unsetModemGpsStatusTracker(final ModemGpsStatusTracker modemGpsDevic
     }
 
     @Override
-    public void init(PositionServiceOptions configuration, Listener gpsDeviceListener,
+    public void init(PositionServiceOptions configuration, LockStatusListener gpsDeviceListener,
             GpsDeviceAvailabilityListener gpsDeviceAvailabilityListener) {
 
         this.gpsDeviceTracker.setListener(gpsDeviceAvailabilityListener);
         this.modemGpsStatusTracker.setListener(gpsDeviceAvailabilityListener);
 
-        this.gpsDeviceListener = gpsDeviceListener;
+        this.lockStatusListener = gpsDeviceListener;
         this.configuration = configuration;
     }
 
@@ -151,7 +155,7 @@ private GpsDevice openGpsDevice(CommURI uri) {
         }
 
         try {
-            return new GpsDevice(this.connectionFactory, uri, this.gpsDeviceListener);
+            return new GpsDevice(this.connectionFactory, uri, this.lockStatusListener);
         } catch (Exception e) {
             logger.warn("Failed to open GPS device: {}", uri, e);
             return null;
@@ -234,19 +238,19 @@ public Set<GNSSType> getGnssTypes() {
         return this.gpsDevice.getGnssTypes();
     }
 
-    protected GpsDevice getGpsDevice() {
+    public GpsDevice getGpsDevice() {
         return this.gpsDevice;
     }
 
-    protected ConnectionFactory getConnectionFactory() {
+    public ConnectionFactory getConnectionFactory() {
         return this.connectionFactory;
     }
 
-    protected GpsDeviceTracker getGpsDeviceTracker() {
+    public GpsDeviceTracker getGpsDeviceTracker() {
         return this.gpsDeviceTracker;
     }
 
-    protected ModemGpsStatusTracker getModemGpsStatusTracker() {
+    public ModemGpsStatusTracker getModemGpsStatusTracker() {
         return this.modemGpsStatusTracker;
     }
 
diff --git a/kura/org.eclipse.kura.nm/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.nm/META-INF/MANIFEST.MF
index f7ad815fb1d..c9849f330de 100644
--- a/kura/org.eclipse.kura.nm/META-INF/MANIFEST.MF
+++ b/kura/org.eclipse.kura.nm/META-INF/MANIFEST.MF
@@ -30,6 +30,8 @@ Import-Package: javax.xml.bind;version="2.3.3",
  org.eclipse.kura.linux.net.dns;version="[1.1,2.0)",
  org.eclipse.kura.linux.net.iptables;version="[1.0,2.0)",
  org.eclipse.kura.linux.net.util;version="[1.0,2.0)",
+ org.eclipse.kura.linux.position.options;version="[1.0,2.0)",
+ org.eclipse.kura.linux.position.provider;version="[1.0,1.1)",
  org.eclipse.kura.net;version="[2.4,3.0)",
  org.eclipse.kura.net.configuration;version="[1.1,2.0)",
  org.eclipse.kura.net.dhcp;version="[1.2,2.0)",
@@ -42,6 +44,7 @@ Import-Package: javax.xml.bind;version="2.3.3",
  org.eclipse.kura.net.status.vlan;version="[1.0,2.0)",
  org.eclipse.kura.net.status.wifi;version="[1.0,2.0)",
  org.eclipse.kura.net.wifi;version="[2.4,3.0]",
+ org.eclipse.kura.position;version="[1.4,2.0)",
  org.eclipse.kura.security.keystore;version="[1.0,2.0)",
  org.eclipse.kura.usb;version="[1.0,2.0)",
  org.osgi.framework;version="1.5.0",
@@ -49,6 +52,8 @@ Import-Package: javax.xml.bind;version="2.3.3",
  org.osgi.service.event;version="1.3.0",
  org.osgi.service.io;version="1.0.0",
  org.osgi.service.useradmin;version="1.0.0",
+ org.osgi.util.measurement;version="[1.0,2.0)",
+ org.osgi.util.position;version="[1.0,2.0)",
  org.osgi.util.tracker;version="1.5.1",
  org.slf4j;version="1.7.25"
 Service-Component: OSGI-INF/*.xml
diff --git a/kura/org.eclipse.kura.nm/OSGI-INF/mmPositionProvider.xml b/kura/org.eclipse.kura.nm/OSGI-INF/mmPositionProvider.xml
new file mode 100644
index 00000000000..2713cecb0cf
--- /dev/null
+++ b/kura/org.eclipse.kura.nm/OSGI-INF/mmPositionProvider.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+   Copyright (c) 2024 Eurotech and/or its affiliates and others
+
+   This program and the accompanying materials are made
+   available under the terms of the Eclipse Public License 2.0
+   which is available at https://www.eclipse.org/legal/epl-2.0/
+ 
+    SPDX-License-Identifier: EPL-2.0
+    
+    Contributors:
+     Eurotech
+
+-->
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="false" name="ModemManagerPositionProvider">
+   <implementation class="org.eclipse.kura.nm.position.MMPositionProvider"/>
+   <service>
+      <provide interface="org.eclipse.kura.linux.position.provider.PositionProvider"/>
+   </service>
+   
+   <property name="service.pid" value="org.eclipse.kura.nm.position.MMPositionProvider"/>
+</scr:component>
diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/ModemManagerDbusWrapper.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/ModemManagerDbusWrapper.java
index 715bed37f3a..2be54275204 100644
--- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/ModemManagerDbusWrapper.java
+++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/ModemManagerDbusWrapper.java
@@ -43,14 +43,14 @@ public class ModemManagerDbusWrapper {
     private static final String MM_BUS_NAME = "org.freedesktop.ModemManager1";
     private static final String MM_MODEM_NAME = "org.freedesktop.ModemManager1.Modem";
     private static final String MM_SIM_NAME = "org.freedesktop.ModemManager1.Sim";
-    private static final String MM_MODEM_PROPERTY_STATE = "State";
     private static final String MM_LOCATION_BUS_NAME = "org.freedesktop.ModemManager1.Modem.Location";
+    private static final String MM_MODEM_PROPERTY_STATE = "State";
 
     private final DBusConnection dbusConnection;
 
     private final Map<String, NMModemResetHandler> modemHandlers = new HashMap<>();
 
-    protected ModemManagerDbusWrapper(DBusConnection dbusConnection) {
+    public ModemManagerDbusWrapper(DBusConnection dbusConnection) {
         this.dbusConnection = dbusConnection;
     }
 
@@ -126,7 +126,23 @@ protected void enableModem(String modemDevicePath) throws DBusException {
         }
     }
 
-    protected Optional<Properties> getModemProperties(String modemPath) throws DBusException {
+    public Modem getModem(String modemPath) throws DBusException {
+        return dbusConnection.getRemoteObject(MM_BUS_NAME, modemPath, Modem.class);
+    }
+
+    public Location getModemManagerLocation(String modemPath) throws DBusException {
+        return dbusConnection.getRemoteObject(MM_BUS_NAME, modemPath, Location.class);
+    }
+
+    public Properties getLocationProperties(Location location) throws DBusException {
+        return dbusConnection.getRemoteObject(MM_BUS_NAME, location.getObjectPath(), Properties.class);
+    }
+
+    public MMModemState getMMModemState(Properties modemProperties) {
+        return MMModemState.toMMModemState(modemProperties.Get(MM_MODEM_NAME, MM_MODEM_PROPERTY_STATE));
+    }
+
+    public Optional<Properties> getModemProperties(String modemPath) throws DBusException {
         Optional<Properties> modemProperties = Optional.empty();
         Properties properties = this.dbusConnection.getRemoteObject(MM_BUS_NAME, modemPath, Properties.class);
         if (Objects.nonNull(properties)) {
diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java
index 30d0f0f3cd7..8709612ca3c 100644
--- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java
+++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java
@@ -32,6 +32,8 @@
 import org.eclipse.kura.net.status.NetworkInterfaceStatus;
 import org.eclipse.kura.net.wifi.WifiChannel;
 import org.eclipse.kura.nm.configuration.NMSettingsConverter;
+import org.eclipse.kura.nm.enums.MMModemLocationSource;
+import org.eclipse.kura.nm.enums.MMModemState;
 import org.eclipse.kura.nm.enums.NMDeviceState;
 import org.eclipse.kura.nm.enums.NMDeviceType;
 import org.eclipse.kura.nm.signal.handlers.DeviceCreationLock;
@@ -50,6 +52,7 @@
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.interfaces.Properties;
 import org.freedesktop.dbus.types.Variant;
+import org.freedesktop.modemmanager1.modem.Location;
 import org.freedesktop.networkmanager.Device;
 import org.freedesktop.networkmanager.Settings;
 import org.freedesktop.networkmanager.device.Vlan;
@@ -76,8 +79,8 @@ public class NMDbusConnector {
     private static final List<NMDeviceType> CONFIGURATION_SUPPORTED_DEVICE_TYPES = Arrays.asList(
             NMDeviceType.NM_DEVICE_TYPE_ETHERNET, NMDeviceType.NM_DEVICE_TYPE_WIFI, NMDeviceType.NM_DEVICE_TYPE_MODEM,
             NMDeviceType.NM_DEVICE_TYPE_VLAN);
-    private static final List<NMDeviceType> CONFIGURATION_SUPPORTED_VIRTUAL_DEVICE_TYPES = Arrays.asList(
-            NMDeviceType.NM_DEVICE_TYPE_VLAN);
+    private static final List<NMDeviceType> CONFIGURATION_SUPPORTED_VIRTUAL_DEVICE_TYPES = Arrays
+            .asList(NMDeviceType.NM_DEVICE_TYPE_VLAN);
     private static final List<KuraIpStatus> CONFIGURATION_SUPPORTED_STATUSES = Arrays.asList(KuraIpStatus.DISABLED,
             KuraIpStatus.ENABLEDLAN, KuraIpStatus.ENABLEDWAN, KuraIpStatus.UNMANAGED);
 
@@ -252,15 +255,15 @@ public synchronized NetworkInterfaceStatus getInterfaceStatus(String interfaceId
                         Vlan.class);
                 Properties vlanDeviceProperties = this.dbusConnection.getRemoteObject(NM_BUS_NAME,
                         vlanDevice.getObjectPath(), Properties.class);
-                
+
                 DBusPath parent = (DBusPath) vlanDeviceProperties.Get(NM_DEVICE_VLAN_BUS_NAME, "Parent");
                 Properties parentProperties = this.dbusConnection.getRemoteObject(NM_BUS_NAME, parent.getPath(),
                         Properties.class);
-                
+
                 DevicePropertiesWrapper vlanPropertiesWrapper = new DevicePropertiesWrapper(deviceProperties,
                         Optional.of(vlanDeviceProperties), NMDeviceType.NM_DEVICE_TYPE_VLAN);
-                networkInterfaceStatus = NMStatusConverter.buildVlanStatus(interfaceId, vlanPropertiesWrapper, 
-                            ip4configProperties, ip6configProperties, parentProperties);
+                networkInterfaceStatus = NMStatusConverter.buildVlanStatus(interfaceId, vlanPropertiesWrapper,
+                        ip4configProperties, ip6configProperties, parentProperties);
                 break;
             case NM_DEVICE_TYPE_LOOPBACK:
                 DevicePropertiesWrapper loopbackPropertiesWrapper = new DevicePropertiesWrapper(deviceProperties,
@@ -339,7 +342,7 @@ ip4configProperties, ip6configProperties, new AccessPointsProperties(activeAcces
                 new SupportedChannelsProperties(countryCode, supportedChannels));
         return networkInterfaceStatus;
     }
-    
+
     public synchronized void apply(Map<String, Object> networkConfiguration) throws DBusException {
         try {
             configurationEnforcementDisable();
@@ -423,14 +426,15 @@ private synchronized void doApply(String deviceIdToBeConfigured, Map<String, Obj
             }
         }
     }
-        
-    private synchronized void manageConfiguredInterface(Optional<Device> device, String deviceId, NetworkProperties properties) throws DBusException {
+
+    private synchronized void manageConfiguredInterface(Optional<Device> device, String deviceId,
+            NetworkProperties properties) throws DBusException {
         NMDeviceType deviceType;
         if (device.isPresent()) {
             deviceType = this.networkManager.getDeviceType(device.get().getObjectPath());
         } else {
-            deviceType = NMDeviceType.fromPropertiesString(
-                    properties.get(String.class, "net.interface.%s.type", deviceId));
+            deviceType = NMDeviceType
+                    .fromPropertiesString(properties.get(String.class, "net.interface.%s.type", deviceId));
         }
 
         KuraIpStatus ip4Status = KuraIpStatus
@@ -478,15 +482,15 @@ private synchronized void manageConfiguredInterface(Optional<Device> device, Str
 
     }
 
-    private void enableInterface(String deviceId, NetworkProperties properties, Optional<Device> device, NMDeviceType deviceType)
-            throws DBusException {
+    private void enableInterface(String deviceId, NetworkProperties properties, Optional<Device> device,
+            NMDeviceType deviceType) throws DBusException {
         if (device.isPresent()) {
             enableInterface(deviceId, properties, device.get(), deviceType);
         } else {
             createVirtualInterface(deviceId, properties, deviceType);
         }
     }
-    
+
     private void enableInterface(String deviceId, NetworkProperties properties, Device device, NMDeviceType deviceType)
             throws DBusException {
         if (Boolean.FALSE.equals(this.networkManager.isDeviceManaged(device))) {
@@ -536,16 +540,16 @@ private void enableInterface(String deviceId, NetworkProperties properties, Devi
         }
 
     }
-    
+
     private void createVirtualInterface(String deviceId, NetworkProperties properties, NMDeviceType deviceType)
-        throws DBusException {
+            throws DBusException {
         Map<String, Map<String, Variant<?>>> newConnectionSettings = NMSettingsConverter.buildSettings(properties,
                 Optional.empty(), deviceId, deviceId, deviceType, this.networkManager.getVersion());
         DeviceCreationLock dcLock = new DeviceCreationLock(this, deviceId);
         Settings settings = this.dbusConnection.getRemoteObject(NM_BUS_NAME, NM_SETTINGS_BUS_PATH, Settings.class);
         DBusPath createdConnectionPath = settings.AddConnection(newConnectionSettings);
-        Connection createdConnection = this.dbusConnection.getRemoteObject(NM_BUS_NAME,
-                createdConnectionPath.getPath(), Connection.class);
+        Connection createdConnection = this.dbusConnection.getRemoteObject(NM_BUS_NAME, createdConnectionPath.getPath(),
+                Connection.class);
         try {
             Optional<Device> returnedDevice = dcLock.waitForDeviceCreation(1L);
             if (!returnedDevice.isPresent()) {
@@ -571,7 +575,7 @@ private void manageNonConfiguredInterface(Optional<Device> optDevice, String dev
             return;
         }
         Device device = optDevice.get();
-        
+
         NMDeviceType deviceType = this.networkManager.getDeviceType(device.getObjectPath());
 
         if (!CONFIGURATION_SUPPORTED_DEVICE_TYPES.contains(deviceType)) {
@@ -600,7 +604,7 @@ private void disable(Optional<Device> optDevice, String deviceId) throws DBusExc
         }
         Device device = optDevice.get();
         Optional<Connection> appliedConnection = this.networkManager.getAppliedConnection(device);
-        
+
         NMDeviceState deviceState = this.networkManager.getDeviceState(device);
         if (Boolean.TRUE.equals(NMDeviceState.isConnected(deviceState))) {
             DeviceStateLock dsLock = new DeviceStateLock(this.dbusConnection, device.getObjectPath(),
@@ -608,7 +612,7 @@ private void disable(Optional<Device> optDevice, String deviceId) throws DBusExc
             device.Disconnect();
             dsLock.waitForSignal();
         }
-        
+
         // Housekeeping
         if (appliedConnection.isPresent()) {
             appliedConnection.get().Delete();
@@ -642,4 +646,55 @@ private void configurationEnforcementDisable() throws DBusException {
         logger.debug("Network configuration enforcement set to {} (Expected: false)",
                 this.configurationEnforcementHandlerIsArmed);
     }
+
+    public List<Location> getAvailableMMLocations() {
+        List<Location> availableLocations = new ArrayList<>();
+
+        this.getEnabledModemsPaths().forEach(modemPath -> {
+            try {
+                Properties locationProperties = this.modemManager
+                        .getLocationProperties(this.modemManager.getModemManagerLocation(modemPath));
+
+                Set<MMModemLocationSource> locationSources = MMModemLocationSource.toMMModemLocationSourceFromBitMask(
+                        locationProperties.Get("org.freedesktop.ModemManager1.Modem.Location", "Enabled"));
+
+                if (locationSources.contains(MMModemLocationSource.MM_MODEM_LOCATION_SOURCE_GPS_NMEA)
+                        && locationSources.contains(MMModemLocationSource.MM_MODEM_LOCATION_SOURCE_GPS_RAW)) {
+                    availableLocations.add(this.modemManager.getModemManagerLocation(modemPath));
+                }
+            } catch (DBusException ex) {
+                logger.debug("Impossible to retrieve information regarding modem: {}", modemPath);
+            }
+        });
+
+        return availableLocations;
+
+    }
+
+    private List<String> getEnabledModemsPaths() {
+        List<String> enabledModemsPath = new ArrayList<>();
+
+        try {
+
+            for (Device device : this.networkManager.getAllDevices()) {
+                if (networkManager.getDeviceType(device.getObjectPath()).equals(NMDeviceType.NM_DEVICE_TYPE_MODEM)) {
+                    Optional<String> modemPath = this.networkManager.getModemManagerDbusPath(device.getObjectPath());
+                    if (modemPath.isPresent()) {
+                        Optional<Properties> modemProps = this.modemManager.getModemProperties(modemPath.get());
+                        modemProps.ifPresent(props -> {
+                            MMModemState modemState = this.modemManager.getMMModemState(props);
+                            if (modemState.equals(MMModemState.MM_MODEM_STATE_CONNECTED)
+                                    || modemState.equals(MMModemState.MM_MODEM_STATE_REGISTERED)) {
+                                enabledModemsPath.add(modemPath.get());
+                            }
+                        });
+                    }
+                }
+            }
+        } catch (DBusException ex) {
+            logger.debug("Impossible to retrieve information regarding available modems");
+        }
+
+        return enabledModemsPath;
+    }
 }
diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/position/MMLocationParser.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/position/MMLocationParser.java
new file mode 100644
index 00000000000..867bca37f3d
--- /dev/null
+++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/position/MMLocationParser.java
@@ -0,0 +1,293 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Eurotech
+ *******************************************************************************/
+
+package org.eclipse.kura.nm.position;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.kura.position.GNSSType;
+import org.eclipse.kura.position.NmeaPosition;
+import org.freedesktop.dbus.types.Variant;
+import org.osgi.util.measurement.Measurement;
+import org.osgi.util.measurement.Unit;
+import org.osgi.util.position.Position;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MMLocationParser {
+
+    private static final Logger logger = LoggerFactory.getLogger(MMLocationParser.class);
+
+    private static final double KNOTS_TO_M_S = 1 / 1.94384449;
+    private int gnssTypeUpdateCounter = 0;
+    private static final int GNSSTYPE_RESET_COUNTER = 50;
+
+    private Double lat = 0.0;
+    private Double lon = 0.0;
+    private Double alt = 0.0;
+    private Double speed = 0.0;
+    private Double track = 0.0;
+
+    private int fixQuality;
+    private int nrSatellites;
+    private double mDOP;
+    private double mPDOP;
+    private double mHDOP;
+    private double mVDOP;
+    private int m3Dfix;
+    private char latitudeHemisphere = 0;
+    private char longitudeHemisphere = 0;
+    private char validFix = 0;
+
+    private LocalTime time;
+    private LocalDate date;
+    private Set<GNSSType> gnssTypes = new HashSet<>();
+    private Boolean isFix = false;
+
+    public LocalDateTime getLocalDateTime() {
+        return Objects.requireNonNull(LocalDateTime.of(date, time));
+    }
+
+    public Position getPosition() {
+        return Objects.requireNonNull(new Position(new Measurement(this.lat, Unit.rad),
+                new Measurement(this.lon, Unit.rad), new Measurement(this.alt, Unit.m),
+                new Measurement(this.speed, Unit.m_s), new Measurement(this.track, Unit.rad)));
+    }
+
+    public Set<GNSSType> getGnssTypes() {
+        return Objects.requireNonNull(this.gnssTypes);
+    }
+
+    public boolean isFixed() {
+        return this.isFix;
+    }
+
+    public NmeaPosition getNmeaPosition() {
+        return new NmeaPosition(this.lat, this.lon, this.alt, this.speed, this.track, this.fixQuality,
+                this.nrSatellites, this.mDOP, this.mPDOP, this.mHDOP, this.mVDOP, this.m3Dfix, this.validFix,
+                this.latitudeHemisphere, this.longitudeHemisphere);
+    }
+
+    public String getNmeaTime() {
+        return this.time.toString();
+    }
+
+    public String getNmeaDate() {
+        return this.date.toString();
+    }
+
+    public void parseRawLocation(Variant<?> rawLocationVariant) {
+        Map<String, Variant<?>> locationData = (Map<String, Variant<?>>) rawLocationVariant.getValue();
+        for (Map.Entry<String, Variant<?>> rawEntry : locationData.entrySet()) {
+
+            switch (rawEntry.getKey()) {
+            case "latitude":
+                this.lat = Math.toRadians((Double) rawEntry.getValue().getValue());
+                break;
+
+            case "longitude":
+                this.lon = Math.toRadians((Double) rawEntry.getValue().getValue());
+                break;
+
+            case "altitude":
+                this.alt = (Double) rawEntry.getValue().getValue();
+                break;
+
+            // time comes in format HHmmss.SS, so we cut the string after the dot to extract only the util information
+            case "utc-time":
+                String utcTime = ((String) rawEntry.getValue().getValue());
+                this.time = LocalTime.parse(utcTime.split("\\.")[0], DateTimeFormatter.ofPattern("HHmmss"));
+                break;
+
+            default:
+                // DO NOTHING
+            }
+        }
+    }
+
+    public void parseNmeaLocation(Variant<?> nmeaLocationVariant) {
+        try {
+            String locationString = ((CharSequence) nmeaLocationVariant.getValue()).toString();
+
+            List<String> nmeaSentences = Arrays.asList(locationString.split("\\r?\\n|\\r")).stream()
+                    .filter(sentence -> !sentence.isEmpty()).collect(Collectors.toList());
+
+            for (String sentence : nmeaSentences) {
+
+                int starpos = sentence.indexOf('*');
+                final List<String> tokens = Arrays.asList(sentence.substring(0, starpos).split(","));
+
+                String sentenceGnss = sentence.substring(1, 3);
+
+                this.gnssTypes.add(getGnssTypeFromSentenceId(sentenceGnss));
+
+                String sentenceType = sentence.substring(3, 6);
+
+                switch (sentenceType) {
+
+                case "GSA":
+                    parseGsaSentence(tokens);
+                    break;
+
+                case "RMC":
+                    parseRmcSentence(tokens);
+                    break;
+
+                case "GGA":
+                    parseGgaSentence(tokens);
+                    break;
+
+                default:
+                    // Do Nothing
+
+                }
+            }
+
+        } catch (Exception ex) {
+            logger.error("Failed to parse NMEA sentence: ", ex);
+            this.isFix = false;
+        }
+    }
+
+    private void parseGgaSentence(List<String> gsaTokens) {
+        if (!gsaTokens.get(7).isEmpty()) {
+            this.nrSatellites = Integer.parseInt(gsaTokens.get(7));
+        }
+        if (!gsaTokens.get(8).isEmpty()) {
+            this.mDOP = Double.parseDouble(gsaTokens.get(8));
+        }
+    }
+
+    private void parseGsaSentence(List<String> gsaTokens) {
+
+        if (!gsaTokens.get(2).isEmpty()) {
+
+            int fixType = Integer.parseInt(gsaTokens.get(2));
+            this.fixQuality = fixType;
+            if (fixType == 2 || fixType == 3) {
+                this.isFix = true;
+            } else {
+                this.isFix = false;
+            }
+        }
+
+        if (!gsaTokens.get(15).isEmpty()) {
+            this.mPDOP = Double.parseDouble(gsaTokens.get(15));
+        }
+        if (!gsaTokens.get(16).isEmpty()) {
+            this.mHDOP = Double.parseDouble(gsaTokens.get(16));
+        }
+        if (!gsaTokens.get(17).isEmpty()) {
+            this.mVDOP = Double.parseDouble(gsaTokens.get(17));
+        }
+    }
+
+    /*
+     * Date is received in format dd-M-yy, so we convert it to yy-M-dd
+     */
+    private void parseRmcSentence(List<String> rmcTokens) {
+        if (!rmcTokens.get(9).isEmpty()) {
+            this.date = LocalDate.parse(rmcTokens.get(9), DateTimeFormatter.ofPattern("ddMyy"));
+        }
+        if (!rmcTokens.get(7).isEmpty()) {
+            this.speed = Double.parseDouble(rmcTokens.get(7)) * KNOTS_TO_M_S;
+        }
+        if (!rmcTokens.get(8).isEmpty()) {
+            this.track = Math.toRadians(Double.parseDouble(rmcTokens.get(8)));
+        }
+        if (!rmcTokens.get(4).isEmpty()) {
+            this.latitudeHemisphere = rmcTokens.get(4).charAt(0);
+        }
+        if (!rmcTokens.get(6).isEmpty()) {
+            this.longitudeHemisphere = rmcTokens.get(6).charAt(0);
+        }
+        if (!rmcTokens.get(2).isEmpty()) { // check validity
+            this.validFix = rmcTokens.get(2).charAt(0);
+            if (!"A".equals(rmcTokens.get(2))) {
+                this.isFix = false;
+            } else {
+                this.isFix = true;
+            }
+        } else {
+            this.validFix = 'V';
+            this.isFix = false;
+        }
+    }
+
+    private GNSSType getGnssTypeFromSentenceId(String type) {
+
+        if (this.gnssTypeUpdateCounter > GNSSTYPE_RESET_COUNTER) {
+            this.gnssTypes.clear();
+            this.gnssTypeUpdateCounter = 0;
+        }
+
+        return sentenceIdToGnssType(type);
+    }
+
+    /*
+     * Also 'GN' is a possible GNSSType, representing the Mixed GNSS System (GPS+GALILEO or GPS+GLONASS for example).
+     * 
+     * But, if the device is capable to emit GN sentences, it must emit also the single-id ones. So we are still able to
+     * extract the specific GNSS System. See {@link
+     * https://receiverhelp.trimble.com/alloy-gnss/en-us/NMEA-0183messages_GNS.html}
+     * 
+     * As example, if the device emits GN messages due to a GP/GA combination, it will emit three sentences: GN, GP, GA.
+     * 
+     * Info about the correlation GNSS System / NMEA Sentence at
+     * {@link https://en.wikipedia.org/wiki/NMEA_0183#NMEA_sentence_format}
+     * 
+     */
+    private GNSSType sentenceIdToGnssType(String type) {
+
+        switch (type) {
+
+        case "GP":
+            return GNSSType.GPS;
+
+        case "BD":
+        case "GB":
+            return GNSSType.BEIDOU;
+
+        case "GA":
+            return GNSSType.GALILEO;
+
+        case "GL":
+            return GNSSType.GLONASS;
+
+        case "GI":
+            return GNSSType.IRNSS;
+
+        case "GQ":
+            return GNSSType.QZSS;
+
+        default:
+            return GNSSType.UNKNOWN;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ModemManagerProvider [latitude=" + lat + ", longitude=" + lon + ", altitude=" + alt + ", speed=" + speed
+                + ", timestamp=" + time + ", date=" + date + ", gnssType=" + gnssTypes + "]";
+    }
+}
diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/position/MMPositionProvider.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/position/MMPositionProvider.java
new file mode 100644
index 00000000000..667493ab3d4
--- /dev/null
+++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/position/MMPositionProvider.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Eurotech
+ *******************************************************************************/
+
+package org.eclipse.kura.nm.position;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.kura.linux.position.options.PositionServiceOptions;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
+import org.eclipse.kura.linux.position.provider.LockStatusListener;
+import org.eclipse.kura.linux.position.provider.PositionProvider;
+import org.eclipse.kura.linux.position.provider.PositionProviderType;
+import org.eclipse.kura.nm.NMDbusConnector;
+import org.eclipse.kura.nm.enums.MMModemLocationSource;
+import org.eclipse.kura.position.GNSSType;
+import org.eclipse.kura.position.NmeaPosition;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.types.UInt32;
+import org.freedesktop.dbus.types.Variant;
+import org.freedesktop.modemmanager1.modem.Location;
+import org.osgi.util.position.Position;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MMPositionProvider implements PositionProvider {
+
+    private static final Logger logger = LoggerFactory.getLogger(MMPositionProvider.class);
+
+    private static final UInt32 NMEA_LOCATION_SOURCE = new UInt32(
+            MMModemLocationSource.MM_MODEM_LOCATION_SOURCE_GPS_NMEA.getValue());
+    private static final UInt32 RAW_LOCATION_SOURCE = new UInt32(
+            MMModemLocationSource.MM_MODEM_LOCATION_SOURCE_GPS_RAW.getValue());
+
+    private final NMDbusConnector nmDbusConnector;
+
+    LockStatusListener gpsDeviceListener;
+
+    ScheduledExecutorService positionRefreshTask;
+    private int refreshRate;
+
+    private final MMLocationParser mmLocationParser = new MMLocationParser();
+
+    public MMPositionProvider() throws DBusException {
+        this.nmDbusConnector = NMDbusConnector.getInstance();
+    }
+
+    public MMPositionProvider(NMDbusConnector connector) {
+        this.nmDbusConnector = connector;
+    }
+
+    @Override
+    public void start() {
+
+        if (this.refreshRate <= 0) {
+            logger.warn("Refresh rate not valid, only positive value are accepted");
+            return;
+        }
+
+        this.positionRefreshTask = Executors.newSingleThreadScheduledExecutor();
+        this.positionRefreshTask.scheduleAtFixedRate(this::getModemManagerLocation, 0, this.refreshRate,
+                TimeUnit.SECONDS);
+    }
+
+    @Override
+    public void stop() {
+        this.positionRefreshTask.shutdownNow();
+        try {
+            this.positionRefreshTask.awaitTermination(30, TimeUnit.SECONDS);
+        } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
+            this.positionRefreshTask = null;
+        }
+
+    }
+
+    @Override
+    public Position getPosition() {
+        return this.mmLocationParser.getPosition();
+    }
+
+    @Override
+    public NmeaPosition getNmeaPosition() {
+        return this.mmLocationParser.getNmeaPosition();
+    }
+
+    @Override
+    public String getNmeaTime() {
+        return this.mmLocationParser.getNmeaTime();
+    }
+
+    @Override
+    public String getNmeaDate() {
+        return this.mmLocationParser.getNmeaDate();
+    }
+
+    @Override
+    public LocalDateTime getDateTime() {
+        return this.mmLocationParser.getLocalDateTime();
+    }
+
+    @Override
+    public boolean isLocked() {
+        return this.mmLocationParser.isFixed();
+    }
+
+    @Override
+    public String getLastSentence() {
+        throw new UnsupportedOperationException("LastSentence not available on ModemManagaer provider");
+    }
+
+    @Override
+    public void init(PositionServiceOptions configuration, LockStatusListener gpsDeviceListener,
+            GpsDeviceAvailabilityListener gpsDeviceAvailabilityListener) {
+
+        this.gpsDeviceListener = gpsDeviceListener;
+        this.refreshRate = configuration.getModemManagerRefreshRate();
+
+    }
+
+    @Override
+    public PositionProviderType getType() {
+        return PositionProviderType.MODEM_MANAGER;
+    }
+
+    @Override
+    public Set<GNSSType> getGnssTypes() {
+        return this.mmLocationParser.getGnssTypes();
+    }
+
+    private void getModemManagerLocation() {
+
+        List<Location> availableLocations = this.nmDbusConnector.getAvailableMMLocations();
+
+        boolean isLastPositionValid = this.mmLocationParser.isFixed();
+
+        for (Location location : availableLocations) {
+            Map<UInt32, Variant<?>> locationMap = location.GetLocation();
+            if (locationMap.containsKey(NMEA_LOCATION_SOURCE) && locationMap.containsKey(RAW_LOCATION_SOURCE)) {
+                Variant<?> nmeaData = locationMap.get(NMEA_LOCATION_SOURCE);
+                this.mmLocationParser.parseNmeaLocation(nmeaData);
+
+                Variant<?> rawData = locationMap.get(RAW_LOCATION_SOURCE);
+                this.mmLocationParser.parseRawLocation(rawData);
+            }
+        }
+
+        boolean isNewPositionValid = this.mmLocationParser.isFixed();
+
+        if (this.gpsDeviceListener != null && isNewPositionValid != isLastPositionValid) {
+            this.gpsDeviceListener.onLockStatusChanged(isNewPositionValid);
+            logger.info("Lock Status changed: {}", this.mmLocationParser);
+        }
+    }
+
+}
diff --git a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/GpsDeviceTest.java b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/GpsDeviceTest.java
index 80514ac8b2f..fb949af9123 100644
--- a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/GpsDeviceTest.java
+++ b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/GpsDeviceTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 2024 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -15,8 +15,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -34,12 +34,14 @@
 
 import org.eclipse.kura.comm.CommConnection;
 import org.eclipse.kura.comm.CommURI;
+import org.eclipse.kura.linux.position.provider.LockStatusListener;
+import org.eclipse.kura.linux.position.serial.GpsDevice;
 import org.eclipse.kura.position.NmeaPosition;
 import org.eclipse.kura.position.PositionException;
 import org.junit.Test;
 import org.osgi.service.io.ConnectionFactory;
 
-public class GpsDeviceTest implements GpsDevice.Listener {
+public class GpsDeviceTest implements LockStatusListener {
 
     private static final double EPS = 0.000001;
     private static final int NUM = 7;
diff --git a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/GpsDeviceTrackerTest.java b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/GpsDeviceTrackerTest.java
index ad9fe31e9c8..6c145f7e397 100644
--- a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/GpsDeviceTrackerTest.java
+++ b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/GpsDeviceTrackerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2018, 2024 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -24,6 +24,8 @@
 import java.util.List;
 
 import org.eclipse.kura.comm.CommURI;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
+import org.eclipse.kura.linux.position.serial.GpsDeviceTracker;
 import org.eclipse.kura.usb.UsbDeviceAddedEvent;
 import org.eclipse.kura.usb.UsbDeviceRemovedEvent;
 import org.eclipse.kura.usb.UsbService;
diff --git a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/ModemGpsStatusTrackerTest.java b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/ModemGpsStatusTrackerTest.java
index ddfcbc14be5..87b0c569dc6 100644
--- a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/ModemGpsStatusTrackerTest.java
+++ b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/ModemGpsStatusTrackerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2018, 2024 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -24,6 +24,8 @@
 
 import org.eclipse.kura.KuraException;
 import org.eclipse.kura.comm.CommURI;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
+import org.eclipse.kura.linux.position.serial.ModemGpsStatusTracker;
 import org.eclipse.kura.net.modem.ModemGpsDisabledEvent;
 import org.eclipse.kura.net.modem.ModemGpsEnabledEvent;
 import org.junit.Test;
diff --git a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/NMEAParserTest.java b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/NMEAParserTest.java
index 74239842db7..a7f9fc6da9c 100644
--- a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/NMEAParserTest.java
+++ b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/NMEAParserTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Eurotech and/or its affiliates and others
+ * Copyright (c) 2017, 2024 Eurotech and/or its affiliates and others
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -17,7 +17,8 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.eclipse.kura.linux.position.NMEAParser.ParseException;
+import org.eclipse.kura.linux.position.serial.NMEAParser;
+import org.eclipse.kura.linux.position.serial.NMEAParser.ParseException;
 import org.junit.Test;
 
 public class NMEAParserTest {
diff --git a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java
index 6747919bc58..7a6e9c39713 100644
--- a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java
+++ b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/PositionServiceTest.java
@@ -40,6 +40,10 @@
 import org.eclipse.kura.KuraException;
 import org.eclipse.kura.comm.CommConnection;
 import org.eclipse.kura.comm.CommURI;
+import org.eclipse.kura.linux.position.serial.GpsDevice;
+import org.eclipse.kura.linux.position.serial.GpsDeviceTracker;
+import org.eclipse.kura.linux.position.serial.ModemGpsStatusTracker;
+import org.eclipse.kura.linux.position.serial.SerialDevicePositionProvider;
 import org.eclipse.kura.position.GNSSType;
 import org.eclipse.kura.position.NmeaPosition;
 import org.eclipse.kura.position.PositionListener;
diff --git a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java
index bfc2abd30c5..446d3c4f8ca 100644
--- a/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java
+++ b/kura/test/org.eclipse.kura.linux.position.test/src/test/java/org/eclipse/kura/linux/position/UseGpsdPositionProviderTest.java
@@ -29,6 +29,9 @@
 import java.util.Set;
 
 import org.eclipse.kura.core.testutil.TestUtil;
+import org.eclipse.kura.linux.position.gpsd.GpsdPositionProvider;
+import org.eclipse.kura.linux.position.options.PositionServiceOptions;
+import org.eclipse.kura.linux.position.provider.PositionProviderType;
 import org.eclipse.kura.position.GNSSType;
 import org.junit.Test;
 import org.osgi.util.measurement.Measurement;
diff --git a/kura/test/org.eclipse.kura.nm.test/META-INF/MANIFEST.MF b/kura/test/org.eclipse.kura.nm.test/META-INF/MANIFEST.MF
index e0f24da0b3e..39893b109e5 100644
--- a/kura/test/org.eclipse.kura.nm.test/META-INF/MANIFEST.MF
+++ b/kura/test/org.eclipse.kura.nm.test/META-INF/MANIFEST.MF
@@ -25,5 +25,6 @@ Import-Package: org.bouncycastle.jce.provider;version="1.78.1",
  org.mockito;version="[4.0,5.0)",
  org.mockito.invocation;version="[4.0,5.0)",
  org.mockito.stubbing;version="[4.0,5.0)",
+ org.osgi.util.measurement;version="[1.0,2.0)",
  org.slf4j;version="1.6.4"
 Fragment-Host: org.eclipse.kura.nm
diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/position/MMPositionProviderTest.java b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/position/MMPositionProviderTest.java
new file mode 100644
index 00000000000..906baeac6b4
--- /dev/null
+++ b/kura/test/org.eclipse.kura.nm.test/src/test/java/org/eclipse/kura/nm/position/MMPositionProviderTest.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Eurotech
+ *******************************************************************************/
+
+package org.eclipse.kura.nm.position;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
+
+import org.eclipse.kura.linux.position.options.PositionServiceOptions;
+import org.eclipse.kura.linux.position.provider.GpsDeviceAvailabilityListener;
+import org.eclipse.kura.linux.position.provider.LockStatusListener;
+import org.eclipse.kura.nm.NMDbusConnector;
+import org.eclipse.kura.nm.enums.MMModemLocationSource;
+import org.freedesktop.dbus.types.UInt32;
+import org.freedesktop.dbus.types.Variant;
+import org.freedesktop.modemmanager1.modem.Location;
+import org.junit.Test;
+import org.osgi.util.measurement.Measurement;
+import org.osgi.util.measurement.Unit;
+import org.osgi.util.position.Position;
+
+public class MMPositionProviderTest {
+
+    MMPositionProvider provider;
+    NMDbusConnector mockNmDbusConnector;
+    Position retrievedPosition;
+    LocalDateTime retrieveDateTime;
+
+    @Test
+    public void shouldRetrieveCorrectPosition() throws InterruptedException {
+
+        givenModemManagerFakeLocation(39.5, 9.7, 4.5);
+        givenPositionProviderWithMockDbusConnector();
+        givenProviderInitAndStart();
+
+        whenServiceAskForPosition();
+
+        thenPositionIsCorrect(39.5, 9.7, 4.5, 0, 10.2);
+        thenDateTimeIsCorrect("2024-10-29T10:33:55");
+    }
+
+    /*
+     * The return location is a gps point in Rome retrieved with {@link https://nmeagen.org/}
+     */
+    private void givenModemManagerFakeLocation(double lat, double lon, double alt) {
+
+        Scanner scanner = new Scanner(MMPositionProviderTest.class.getResourceAsStream("/fakeNmeaSentences.txt"),
+                "UTF-8");
+        CharSequence locationString = scanner.useDelimiter("\\A").next().replace(" ", "");
+        scanner.close();
+
+        Location mockLocation = mock(Location.class);
+        Map<UInt32, Variant<?>> variantMap = new HashMap<>();
+        variantMap.put(new UInt32(MMModemLocationSource.MM_MODEM_LOCATION_SOURCE_GPS_NMEA.getValue()),
+                new Variant<>(locationString));
+
+        Map<String, Variant<?>> rawLocationMap = new HashMap<>();
+        rawLocationMap.put("latitude", new Variant<>(lat, Double.class));
+        rawLocationMap.put("longitude", new Variant<>(lon, Double.class));
+        rawLocationMap.put("altitude", new Variant<>(alt, Double.class));
+        rawLocationMap.put("utc-time", new Variant<>("103355", String.class));
+
+        variantMap.put(new UInt32(MMModemLocationSource.MM_MODEM_LOCATION_SOURCE_GPS_RAW.getValue()),
+                new Variant<>(rawLocationMap, "a{sv}"));
+
+        when(mockLocation.GetLocation()).thenReturn(variantMap);
+
+        NMDbusConnector dbusConnector = mock(NMDbusConnector.class);
+        when(dbusConnector.getAvailableMMLocations()).thenReturn(Arrays.asList(mockLocation));
+
+        this.mockNmDbusConnector = dbusConnector;
+    }
+
+    private void givenPositionProviderWithMockDbusConnector() {
+        this.provider = new MMPositionProvider(this.mockNmDbusConnector);
+    }
+
+    private void givenProviderInitAndStart() {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("modem.manager.refresh.rate.seconds", 1);
+        PositionServiceOptions options = new PositionServiceOptions(properties);
+
+        this.provider.init(options, mock(LockStatusListener.class), mock(GpsDeviceAvailabilityListener.class));
+        this.provider.start();
+    }
+
+    private void whenServiceAskForPosition() throws InterruptedException {
+        Thread.sleep(3000);
+        this.retrievedPosition = this.provider.getPosition();
+        this.retrieveDateTime = this.provider.getDateTime();
+    }
+
+    private void thenPositionIsCorrect(double lat, double lon, double alt, double speed, double track) {
+        assertEquals(new Measurement(Math.toRadians(lat), Unit.rad), this.retrievedPosition.getLatitude());
+        assertEquals(new Measurement(Math.toRadians(lon), Unit.rad), this.retrievedPosition.getLongitude());
+        assertEquals(new Measurement(alt, Unit.m), this.retrievedPosition.getAltitude());
+        assertEquals(new Measurement(speed, Unit.m_s), this.retrievedPosition.getSpeed());
+        assertEquals(new Measurement(Math.toRadians(track), Unit.rad), this.retrievedPosition.getTrack());
+    }
+
+    private void thenDateTimeIsCorrect(String expectedDateTime) {
+        assertEquals(expectedDateTime, this.retrieveDateTime.toString());
+    }
+
+}
diff --git a/kura/test/org.eclipse.kura.nm.test/src/test/resources/fakeNmeaSentences.txt b/kura/test/org.eclipse.kura.nm.test/src/test/resources/fakeNmeaSentences.txt
new file mode 100644
index 00000000000..778539852de
--- /dev/null
+++ b/kura/test/org.eclipse.kura.nm.test/src/test/resources/fakeNmeaSentences.txt
@@ -0,0 +1,13 @@
+$GPGSA,A,3,12,13,15,19,,,,,,,,,3.2,3.0,1.0,1*21
+
+$GPRMC,151524.00,A,4606.900133,N,01314.287428,E,0.0,10.2,291024,0.9,E,A,V*77
+
+$GPGSV,3,1,12,10,14,314,24,12,36,230,37,13,33,153,42,15,50,196,36,1*6B
+
+$GPGSV,3,2,12,19,42,108,30,22,36,053,25,23,19,274,28,02,00,019,,1*6E
+
+$GPGSV,3,3,12,14,14,054,,17,36,067,,24,63,302,,49,,,43,1*5C
+
+$GPVTG,10.2,T,9.3,M,0.0,N,0.0,K,A*1A
+
+$GPGGA,151524.00,4606.900133,N,01314.287428,E,1,04,3.0,157.8,M,45.0,M,,*6F
\ No newline at end of file