diff --git a/app/build.gradle b/app/build.gradle
index 76a3bdddc5..3cde562d1e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ plugins {
     id 'maven-publish'
 }
 
-def VERSION_CODE = 386
-def VERSION_NAME = "5.3.4"
+def VERSION_CODE = 388
+def VERSION_NAME = "5.4.1"
 
 android {
     namespace 'com.naviapp'
diff --git a/app/src/main/java/com/naviapp/registration/viewmodel/ConfigVM.kt b/app/src/main/java/com/naviapp/registration/viewmodel/ConfigVM.kt
index 084d6e955c..65103d1a0b 100644
--- a/app/src/main/java/com/naviapp/registration/viewmodel/ConfigVM.kt
+++ b/app/src/main/java/com/naviapp/registration/viewmodel/ConfigVM.kt
@@ -220,25 +220,30 @@ constructor(
     }
 
     fun initGuardDogSDK() {
-        if (FirebaseRemoteConfigHelper.getBoolean(FirebaseRemoteConfigHelper.GUARD_DOG_FEATURE_FLAG)) {
+        if (
+            FirebaseRemoteConfigHelper.getBoolean(FirebaseRemoteConfigHelper.GUARD_DOG_FEATURE_FLAG)
+        ) {
             viewModelScope.launch(Dispatchers.IO) {
                 GuardDogSdkManager.init(
                     context = NaviApplication.instance.applicationContext,
                     sdkInitParams =
-                    SdkInitParams(
-                        externalId = PreferenceManager.getStringPreference(CommonPrefConstants.USER_EXTERNAL_ID),
-                        flavor = BuildConfig.FLAVOR,
-                        appVersionCode = BuildConfig.VERSION_CODE.toString(),
-                        networkConfigData =
-                        NetworkConfigData(
-                            encryptedNetworkInterceptor =
-                            EncryptionHashInterceptor(
-                                NaviApplication.instance.applicationContext,
-                                enableSignatureKeyByDefault = true
-                            )
-                        ),
-                        isMockLocation = isLastLocationMocked()
-                    )
+                        SdkInitParams(
+                            externalId =
+                                PreferenceManager.getStringPreference(
+                                    CommonPrefConstants.USER_EXTERNAL_ID
+                                ),
+                            flavor = BuildConfig.FLAVOR,
+                            appVersionCode = BuildConfig.VERSION_CODE.toString(),
+                            networkConfigData =
+                                NetworkConfigData(
+                                    encryptedNetworkInterceptor =
+                                        EncryptionHashInterceptor(
+                                            NaviApplication.instance.applicationContext,
+                                            enableSignatureKeyByDefault = true
+                                        )
+                                ),
+                            isMockLocation = isLastLocationMocked()
+                        )
                 )
             }
         }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 226526e302..c98a6ee1d0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -90,7 +90,7 @@ moengage-inapp = "6.5.0"
 moengage-push-amp-plus = "6.2.1"
 moengage-rich-notification = "4.3.2"
 navi-alfred = "1.1.4"
-navi-guarddog = "1.4.0"
+navi-guarddog = "1.4.1"
 navi-pulse = "1.0.1"
 navi-uitron = "1.3.1"
 navigation = "2.5.3"
diff --git a/navi-common/src/main/java/com/navi/common/managers/NaviLocationManager.kt b/navi-common/src/main/java/com/navi/common/managers/NaviLocationManager.kt
index 48fd787147..413ec86798 100644
--- a/navi-common/src/main/java/com/navi/common/managers/NaviLocationManager.kt
+++ b/navi-common/src/main/java/com/navi/common/managers/NaviLocationManager.kt
@@ -211,10 +211,6 @@ class NaviLocationManager(val applicationContext: Context? = CommonLibManager.ap
         return CommonUtils.getUserLocation()
     }
 
-    fun isLastLocationMocked(): Boolean {
-        return PreferenceManager.getBooleanPreference(IS_MOCK_LOCATION, false).orFalse()
-    }
-
     fun isUserLocationSentToServer(): Boolean {
         return PreferenceManager.getBooleanPreference(IS_LOCATION_DATA_POST).orFalse()
     }
diff --git a/navi-common/src/main/java/com/navi/common/utils/CommonDeviceUtil.kt b/navi-common/src/main/java/com/navi/common/utils/CommonDeviceUtil.kt
index 9792288063..1ec8573fb5 100644
--- a/navi-common/src/main/java/com/navi/common/utils/CommonDeviceUtil.kt
+++ b/navi-common/src/main/java/com/navi/common/utils/CommonDeviceUtil.kt
@@ -22,10 +22,10 @@ import android.provider.Settings
 import android.telephony.TelephonyManager
 import android.text.format.Formatter
 import android.view.WindowManager
+import com.navi.base.sharedpref.CommonPrefConstants.IS_MOCK_LOCATION
 import com.navi.base.sharedpref.PreferenceManager
 import com.navi.base.utils.orFalse
 import com.navi.common.CommonLibManager
-import com.navi.common.managers.NaviLocationManager
 import com.navi.common.model.HardwareDetail
 import com.navi.common.utils.Constants.ANDROID_SMALL_CASE
 import com.navi.common.utils.Constants.DIMEN
@@ -247,7 +247,7 @@ fun fetchInstallerName(context: Context): String? {
 }
 
 fun isLastLocationMocked(): Boolean {
-    return NaviLocationManager().isLastLocationMocked()
+    return PreferenceManager.getBooleanPreference(IS_MOCK_LOCATION, false).orFalse()
 }
 
 fun getTotalRamMemory(context: Context): String? =