diff --git a/android/app/src/main/java/com/avapp/DeviceUtilsModule.java b/android/app/src/main/java/com/avapp/DeviceUtilsModule.java
index 478e0dd0..dc3eefc1 100644
--- a/android/app/src/main/java/com/avapp/DeviceUtilsModule.java
+++ b/android/app/src/main/java/com/avapp/DeviceUtilsModule.java
@@ -148,8 +148,8 @@ public class DeviceUtilsModule extends ReactContextBaseJavaModule {
     public void setUserId(String userId) {
         if (isAlfredEnabledFromFirebase) {
             AlfredManager.INSTANCE.getConfig$navi_alfred_release().setUserId(userId);
-            PulseManager.INSTANCE.setUserId(userId);
         }
+        PulseManager.INSTANCE.setUserId(userId);
     }
 
     @ReactMethod
diff --git a/android/app/src/main/java/com/avapp/MainApplication.java b/android/app/src/main/java/com/avapp/MainApplication.java
index c19b7403..f51c2743 100644
--- a/android/app/src/main/java/com/avapp/MainApplication.java
+++ b/android/app/src/main/java/com/avapp/MainApplication.java
@@ -107,7 +107,7 @@ public class MainApplication extends Application implements ReactApplication {
 
         PulseSDKConfig.Configuration pulseConfig =
             new PulseSDKConfig.Configuration.Builder()
-                    .setAppName(BuildConfig.APP_NAME)
+                    .setAppName("collections-agent-app")
                     .setAppVersion(String.valueOf(BuildConfig.VERSION_CODE))
                     .setAppVersionName(BuildConfig.VERSION_NAME)
                     .setDestinationUrl(getDestinationUrl(BuildConfig.BUILD_FLAVOR))
@@ -177,7 +177,9 @@ public class MainApplication extends Application implements ReactApplication {
             if (isAlfredEnabledFromFirebase && AlfredManager.INSTANCE.isAlfredRecordingEnabled()
                     && alfredConfig.getAnrEnableStatus() && MainActivity.isAppInForeground()) {
                 anrEventProperties.put(STACK_TRACE, error.getCause().getStackTrace()[0].toString());
-                PulseManager.INSTANCE.trackEvent("COSMOS_ANR", anrEventProperties);
+                if("release".equals(BuildConfig.BUILD_TYPE)) {
+                    PulseManager.INSTANCE.trackEvent("COSMOS_ANR", anrEventProperties);
+                }
                 AlfredManager.INSTANCE.handleAnrEvent(anrEventProperties);
             }
         }).start();
@@ -205,7 +207,9 @@ public class MainApplication extends Application implements ReactApplication {
                     if (stackTraceElement != null) {
                         crashEventProperties.put(STACK_TRACE, stackTraceElement.toString());
                     }
-                    PulseManager.INSTANCE.trackEvent("COSMOS_CRASH", crashEventProperties);
+                    if("release".equals(BuildConfig.BUILD_TYPE)) {
+                        PulseManager.INSTANCE.trackEvent("COSMOS_CRASH", crashEventProperties);
+                    }
                     AlfredManager.INSTANCE.handleCrashEvent(crashEventProperties);
                 }
             } finally {