diff --git a/android/app/build.gradle b/android/app/build.gradle
index b62e69cc..473a23cc 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -80,6 +80,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 project.ext.react = [
     enableHermes: true,  // clean and rebuild if changing
+    enableNewArchitecture: true
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
diff --git a/android/app/google-services.json b/android/app/google-services.json
index 629b987b..f48fcb67 100644
--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@@ -1,33 +1,33 @@
 {
   "project_info": {
-    "project_number": "136591056725",
-    "project_id": "field-verification-app",
-    "storage_bucket": "field-verification-app.appspot.com"
+    "project_number": "60755663443",
+    "project_id": "address-verification-app",
+    "storage_bucket": "address-verification-app.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:136591056725:android:c454085ec6505cc01519dc",
+        "mobilesdk_app_id": "1:60755663443:android:988149d3da3c00d38584a6",
         "android_client_info": {
           "package_name": "com.avapp"
         }
       },
       "oauth_client": [
         {
-          "client_id": "136591056725-ev8db4hrlud2m23n0o03or3cmmp3a3cq.apps.googleusercontent.com",
+          "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBL32d7WRJTcJawKjT1XCEcFbGGQ8wA6j8"
+          "current_key": "AIzaSyA70_d2M2ke-Mu0OHGZ6iZilBbD6A-_z0c"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "136591056725-ev8db4hrlud2m23n0o03or3cmmp3a3cq.apps.googleusercontent.com",
+              "client_id": "60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com",
               "client_type": 3
             }
           ]
@@ -36,4 +36,4 @@
     }
   ],
   "configuration_version": "1"
-}
\ No newline at end of file
+}
diff --git a/src/common/Constants.ts b/src/common/Constants.ts
index 239d623f..2c420372 100644
--- a/src/common/Constants.ts
+++ b/src/common/Constants.ts
@@ -575,7 +575,7 @@ export const BLOCKER_SCREEN_DATA = {
   },
 };
 
-export const SCREEN_ANIMATION_DURATION = 300;
+export const SCREEN_ANIMATION_DURATION = 10;
 
 export const DISABLE_API_EVENTS_URL = [ApiKeys.JANUS, ApiKeys.NEW_ADDRESS];
 
diff --git a/src/constants/config.js b/src/constants/config.js
index 8ef9052b..6fa05aeb 100644
--- a/src/constants/config.js
+++ b/src/constants/config.js
@@ -1,14 +1,14 @@
 import { MILLISECONDS_IN_A_MINUTE, MINUTES_IN_AN_HOUR } from '../../RN-UI-LIB/src/utlis/common';
 
-export const BASE_AV_APP_URL = 'https://longhorn.navi.com/field-app';
+export const BASE_AV_APP_URL = 'https://qa-longhorn-portal.np.navi-tech.in/field-app';
 export const SENTRY_DSN =
-  'https://5daa4832fade44b389b265de9b26c2fd@longhorn.navi.com/glitchtip-events/172';
-export const JANUS_SERVICE_URL = 'https://longhorn.navi.com/api/events/json';
-export const ENV = 'prod';
+  'https://acef93c884c1424cacc4ec899562e203@qa-longhorn-portal.np.navi-tech.in/glitchtip-events/173';
+export const JANUS_SERVICE_URL = 'https://qa-longhorn-portal.np.navi-tech.in/api/events/json';
+export const ENV = 'qa';
 export const IS_SSO_ENABLED = true;
 export const APM_APP_NAME = 'cosmos-app';
-export const APM_BASE_URL = 'https://longhorn.navi.com/apm-events';
+export const APM_BASE_URL = 'https://qa-longhorn-portal.np.navi-tech.in/apm-events';
 export const IS_DATA_SYNC_REQUIRED = true;
 export const DATA_SYNC_TIME_INTERVAL = 2 * MINUTES_IN_AN_HOUR * MILLISECONDS_IN_A_MINUTE; // 2hr
 export const GOOGLE_SSO_CLIENT_ID =
-  '136591056725-ev8db4hrlud2m23n0o03or3cmmp3a3cq.apps.googleusercontent.com';
+  '60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com';
diff --git a/src/screens/auth/ProtectedRouter.tsx b/src/screens/auth/ProtectedRouter.tsx
index 037a30a0..9cb946b2 100644
--- a/src/screens/auth/ProtectedRouter.tsx
+++ b/src/screens/auth/ProtectedRouter.tsx
@@ -105,195 +105,195 @@ const ProtectedRouter = () => {
   useFirestoreUpdates();
 
   return (
-    <Stack.Navigator screenOptions={{ freezeOnBlur: true }}>
-      <>
+    <Stack.Navigator
+      screenOptions={{ freezeOnBlur: true, animation: 'none', animationDuration: 0 }}
+    >
+      <Stack.Screen
+        name="Home"
+        component={AllCasesMain}
+        options={{
+          header: () => null,
+          animation: 'none',
+          animationDuration: SCREEN_ANIMATION_DURATION,
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name="Profile"
+        component={Profile}
+        options={{
+          header: () => null,
+          animation: 'none',
+          animationDuration: SCREEN_ANIMATION_DURATION,
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name="caseDetail"
+        component={CaseDetails}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: 'none',
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name={PageRouteEnum.COLLECTION_CASE_DETAIL}
+        component={CollectionCaseDetails}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: 'none',
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name={'customerProfile'}
+        component={CustomerProfile}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: 'none',
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name={'vkycFull'}
+        component={VKYCFullScreen}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: 'none',
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name={PageRouteEnum.PAYMENTS}
+        component={RegisterPayments}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: 'none',
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name={PageRouteEnum.ADDRESS_GEO}
+        component={AddressGeolocation}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: 'none',
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name={PageRouteEnum.NEW_ADDRESS}
+        component={NewAddressContainer}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: 'none',
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name={PageRouteEnum.PAST_FEEDBACK_DETAIL}
+        component={FeedbackDetailContainer}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: 'none',
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      {_map(avTemplate?.widget, (key) => (
         <Stack.Screen
-          name="Home"
-          component={AllCasesMain}
+          key={getTemplateRoute(key, CaseAllocationType.ADDRESS_VERIFICATION_CASE)}
+          name={getTemplateRoute(key, CaseAllocationType.ADDRESS_VERIFICATION_CASE)}
+          component={Widget}
           options={{
             header: () => null,
-            animation: 'slide_from_right',
-            animationDuration: SCREEN_ANIMATION_DURATION,
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name="Profile"
-          component={Profile}
-          options={{
-            header: () => null,
-            animation: 'slide_from_right',
-            animationDuration: SCREEN_ANIMATION_DURATION,
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name="caseDetail"
-          component={CaseDetails}
-          options={{
-            header: () => null,
-            animationDuration: SCREEN_ANIMATION_DURATION,
             animation: 'none',
+            animationDuration: SCREEN_ANIMATION_DURATION,
           }}
           listeners={getScreenFocusListenerObj}
         />
+      ))}
+      {_map(collectionTemplate?.widget, (key) => (
         <Stack.Screen
-          name={PageRouteEnum.COLLECTION_CASE_DETAIL}
-          component={CollectionCaseDetails}
+          key={getTemplateRoute(key, CaseAllocationType.COLLECTION_CASE)}
+          name={getTemplateRoute(key, CaseAllocationType.COLLECTION_CASE)}
+          component={Widget}
           options={{
             header: () => null,
-            animationDuration: SCREEN_ANIMATION_DURATION,
             animation: 'none',
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name={'customerProfile'}
-          component={CustomerProfile}
-          options={{
-            header: () => null,
-            animationDuration: SCREEN_ANIMATION_DURATION,
-            animation: 'none',
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name={'vkycFull'}
-          component={VKYCFullScreen}
-          options={{
-            header: () => null,
-            animationDuration: SCREEN_ANIMATION_DURATION,
-            animation: 'none',
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name={PageRouteEnum.PAYMENTS}
-          component={RegisterPayments}
-          options={{
-            header: () => null,
-            animationDuration: SCREEN_ANIMATION_DURATION,
-            animation: 'none',
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name={PageRouteEnum.ADDRESS_GEO}
-          component={AddressGeolocation}
-          options={{
-            header: () => null,
-            animationDuration: SCREEN_ANIMATION_DURATION,
-            animation: 'none',
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name={PageRouteEnum.NEW_ADDRESS}
-          component={NewAddressContainer}
-          options={{
-            header: () => null,
-            animationDuration: SCREEN_ANIMATION_DURATION,
-            animation: 'none',
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name={PageRouteEnum.PAST_FEEDBACK_DETAIL}
-          component={FeedbackDetailContainer}
-          options={{
-            header: () => null,
-            animationDuration: SCREEN_ANIMATION_DURATION,
-            animation: 'none',
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        {_map(avTemplate?.widget, (key) => (
-          <Stack.Screen
-            key={getTemplateRoute(key, CaseAllocationType.ADDRESS_VERIFICATION_CASE)}
-            name={getTemplateRoute(key, CaseAllocationType.ADDRESS_VERIFICATION_CASE)}
-            component={Widget}
-            options={{
-              header: () => null,
-              animation: 'slide_from_right',
-              animationDuration: SCREEN_ANIMATION_DURATION,
-            }}
-            listeners={getScreenFocusListenerObj}
-          />
-        ))}
-        {_map(collectionTemplate?.widget, (key) => (
-          <Stack.Screen
-            key={getTemplateRoute(key, CaseAllocationType.COLLECTION_CASE)}
-            name={getTemplateRoute(key, CaseAllocationType.COLLECTION_CASE)}
-            component={Widget}
-            options={{
-              header: () => null,
-              animation: 'slide_from_right',
-              animationDuration: SCREEN_ANIMATION_DURATION,
-            }}
-            listeners={getScreenFocusListenerObj}
-          />
-        ))}
-        <Stack.Screen
-          name="TodoList"
-          component={TodoList}
-          options={{
-            header: () => null,
-            animation: 'slide_from_bottom',
             animationDuration: SCREEN_ANIMATION_DURATION,
           }}
           listeners={getScreenFocusListenerObj}
         />
-        <Stack.Screen
-          name="CompletedCases"
-          component={CompletedCase}
-          options={{
-            header: () => null,
-            animation: 'slide_from_right',
-            animationDuration: SCREEN_ANIMATION_DURATION,
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name="EmiSchedule"
-          component={EmiSchedule}
-          options={{
-            header: () => null,
-            animation: 'slide_from_right',
-            animationDuration: SCREEN_ANIMATION_DURATION,
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name="AddNewNumber"
-          component={AddNewNumber}
-          options={{
-            header: () => null,
-            animation: 'slide_from_right',
-            animationDuration: SCREEN_ANIMATION_DURATION,
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name="Notifications"
-          component={Notifications}
-          options={{
-            header: () => null,
-            animation: 'slide_from_right',
-            animationDuration: SCREEN_ANIMATION_DURATION,
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-        <Stack.Screen
-          name="ImpersonatedUserLogin"
-          component={ImpersonatedUser}
-          options={{
-            header: () => null,
-            animation: 'slide_from_right',
-            animationDuration: SCREEN_ANIMATION_DURATION,
-          }}
-          listeners={getScreenFocusListenerObj}
-        />
-      </>
+      ))}
+      <Stack.Screen
+        name="TodoList"
+        component={TodoList}
+        options={{
+          header: () => null,
+          animation: 'none',
+          animationDuration: SCREEN_ANIMATION_DURATION,
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name="CompletedCases"
+        component={CompletedCase}
+        options={{
+          header: () => null,
+          animation: 'none',
+          animationDuration: SCREEN_ANIMATION_DURATION,
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name="EmiSchedule"
+        component={EmiSchedule}
+        options={{
+          header: () => null,
+          animation: 'none',
+          animationDuration: SCREEN_ANIMATION_DURATION,
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name="AddNewNumber"
+        component={AddNewNumber}
+        options={{
+          header: () => null,
+          animation: 'none',
+          animationDuration: SCREEN_ANIMATION_DURATION,
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name="Notifications"
+        component={Notifications}
+        options={{
+          header: () => null,
+          animation: 'none',
+          animationDuration: SCREEN_ANIMATION_DURATION,
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
+      <Stack.Screen
+        name="ImpersonatedUserLogin"
+        component={ImpersonatedUser}
+        options={{
+          header: () => null,
+          animation: 'none',
+          animationDuration: SCREEN_ANIMATION_DURATION,
+        }}
+        listeners={getScreenFocusListenerObj}
+      />
     </Stack.Navigator>
   );
 };
diff --git a/src/screens/auth/UnProtectedRouter.tsx b/src/screens/auth/UnProtectedRouter.tsx
index b0f5711d..2037ba5f 100644
--- a/src/screens/auth/UnProtectedRouter.tsx
+++ b/src/screens/auth/UnProtectedRouter.tsx
@@ -15,7 +15,7 @@ const UnProtectedRouter = () => {
         component={Login}
         options={{
           header: () => null,
-          animation: 'slide_from_right',
+          animation: 'none',
           animationDuration: SCREEN_ANIMATION_DURATION,
         }}
         listeners={getScreenFocusListenerObj}
@@ -25,7 +25,7 @@ const UnProtectedRouter = () => {
         component={OtpInput}
         options={{
           header: () => null,
-          animation: 'slide_from_right',
+          animation: 'none',
           animationDuration: SCREEN_ANIMATION_DURATION,
         }}
         listeners={getScreenFocusListenerObj}