diff --git a/Admin Dashboard/src/components/Footers/AdminFooter.jsx b/Admin Dashboard/src/components/Footers/AdminFooter.jsx
index 17009df..63e9d18 100644
--- a/Admin Dashboard/src/components/Footers/AdminFooter.jsx	
+++ b/Admin Dashboard/src/components/Footers/AdminFooter.jsx	
@@ -35,7 +35,7 @@ function Footer(props) {
 
             <NavItem>
               <NavLink
-                href="https://ninjascode.com/pages/ourteam.html"
+                href="https://ninjascode.com/our-team"
                 rel="noopener noreferrer"
                 target="_blank">
                 {t('About Us')}
diff --git a/Admin Dashboard/src/components/Footers/AuthFooter.jsx b/Admin Dashboard/src/components/Footers/AuthFooter.jsx
index b02de50..3f9e292 100644
--- a/Admin Dashboard/src/components/Footers/AuthFooter.jsx	
+++ b/Admin Dashboard/src/components/Footers/AuthFooter.jsx	
@@ -27,7 +27,7 @@ function AuthFooter(props) {
                 </NavItem>
                 <NavItem>
                   <NavLink
-                    href="https://ninjascode.com/pages/ourteam.html"
+                    href="https://ninjascode.com/our-team"
                     target="_blank">
                     {t('About Us')}
                   </NavLink>
diff --git a/CustomerApp/app.json b/CustomerApp/app.json
index ea62831..3c71b3c 100644
--- a/CustomerApp/app.json
+++ b/CustomerApp/app.json
@@ -3,8 +3,11 @@
     "name": "Enatega",
     "version": "1.0.21",
     "scheme": "enategasinglevendor",
-    "description": "Enatega is a starter kit food ordering app built in React Native using Expo for IOS and Android. It's made keeping good aesthetics in mind as well keeping the best coding practices in mind. Its fully customisable to easily help you in your next food delivery project. https://market.nativebase.io/view/react-native-food-delivery-backend-app",
+    "description": "Enatega is a starter kit food ordering app built in React Native using Expo for IOS and Android. It's made keeping good aesthetics in mind as well keeping the best coding practices in mind. Its fully customisable to easily help you in your next food delivery project. https://enatega.com/enatega-single-vendor/",
     "slug": "enategasinglevendor",
+    "owner": "ninjas_code",
+    "currentFullName": "@ninjas_code/enategasinglevendor",
+    "originalFullName": "@ninjas_code/enategasinglevendor",
     "privacy": "public",
     "androidStatusBar": {
       "backgroundColor": "#000"
@@ -21,7 +24,8 @@
       "backgroundColor": "#febb2c"
     },
     "updates": {
-      "fallbackToCacheTimeout": 0
+      "fallbackToCacheTimeout": 0,
+      "url": "https://u.expo.dev/e7c3fd70-4054-4dc8-bbdb-a572a3cc6fb1"
     },
     "assetBundlePatterns": [
       "**/*"
@@ -76,8 +80,11 @@
     "facebookDisplayName": "Food delivery",
     "extra": {
       "eas": {
-        "projectId": "0b51ea6b-d9fd-48e2-9480-54149ca73a7a"
+        "projectId": "e7c3fd70-4054-4dc8-bbdb-a572a3cc6fb1"
       }
+    },
+    "runtimeVersion": {
+      "policy": "sdkVersion"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/CustomerApp/eas.json b/CustomerApp/eas.json
index 3277943..21a9442 100644
--- a/CustomerApp/eas.json
+++ b/CustomerApp/eas.json
@@ -8,21 +8,21 @@
       "distribution": "internal",
       "ios": {
         "resourceClass": "m-medium"
-      }
+      },
+      "channel": "development"
     },
     "preview": {
       "distribution": "internal",
       "ios": {
         "resourceClass": "m-medium"
-      }
+      },
+      "channel": "preview"
     },
     "production": {
-      "developmentClient": false,
-      "releaseChannel": "production",
-      "distribution": "store",
-      "ios": {
-        "resourceClass": "m-medium"
-       }
+      "channel": "production",
+      "android": {
+        "buildType": "apk"
+      }
     }
   },
   "submit": {
@@ -38,4 +38,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/CustomerApp/environment.js b/CustomerApp/environment.js
index 1eb2a37..2a3a8bd 100644
--- a/CustomerApp/environment.js
+++ b/CustomerApp/environment.js
@@ -11,7 +11,7 @@ const ENV = {
     WS_GRAPHQL_URL: "wss://enatega-singlevendor.up.railway.app/graphql",
     SERVER_URL: "https://enatega-singlevendor.up.railway.app/",
     Expo_CLIENT_ID_GOOGLE:
-      "630195385603-82e52jpb722a8l0huhkspq3tqh2d6r6f.apps.googleusercontent.com",
+      "967541328677-2lkpq6a9cj7bnokht7ich14igsi3brs5.apps.googleusercontent.com",
     IOS_CLIENT_ID_GOOGLE:
       "967541328677-uq7f7odvmeea2pb2sq0l7q320ds86536.apps.googleusercontent.com",
     ANDROID_CLIENT_ID_GOOGLE:
@@ -54,7 +54,7 @@ const ENV = {
   },
 };
 
-const getEnvVars = (env = Constants.manifest.releaseChannel) => {
+const getEnvVars = (env = Constants.manifest/*.releaseChannel*/) => {
   // What is __DEV__ ?
   // This variable is set to true when react-native is running in Dev mode.
   // __DEV__ is true when run locally, but false when published.
@@ -63,8 +63,8 @@ const getEnvVars = (env = Constants.manifest.releaseChannel) => {
     return ENV.development;
   } else if (env === "production") {
     return ENV.production;
-  } else if (env === "staging") {
-    return ENV.staging;
+  // } else if (env === "staging") {
+  //   return ENV.staging;
   } else {
     return ENV.production;
   }
diff --git a/CustomerApp/src/screens/AnimatedSplash/AnimatedSplash.js b/CustomerApp/src/screens/AnimatedSplash/AnimatedSplash.js
index d3d02bb..3f11a8f 100644
--- a/CustomerApp/src/screens/AnimatedSplash/AnimatedSplash.js
+++ b/CustomerApp/src/screens/AnimatedSplash/AnimatedSplash.js
@@ -39,13 +39,14 @@ function AnimatedSplashScreen({ children, image }) {
       {!animationCompleted && (
         <Animated.View
           pointerEvents="none"
-          style={[
-            StyleSheet.absoluteFill,
-            {
-              backgroundColor: Constants.manifest.splash.backgroundColor,
-              opacity: animation
-            }
-          ]}>
+          // style={[
+          //   StyleSheet.absoluteFill,
+          //   {
+          //     backgroundColor: Constants.manifest.splash.backgroundColor,
+          //     opacity: animation
+          //   }
+          // ]}
+          >
           <Animated.Image
             style={{
               width: '100%',
diff --git a/CustomerApp/src/screens/Help/Help.js b/CustomerApp/src/screens/Help/Help.js
index 521603e..1b6730c 100644
--- a/CustomerApp/src/screens/Help/Help.js
+++ b/CustomerApp/src/screens/Help/Help.js
@@ -10,14 +10,14 @@ import useStyle from './styles'
 const links = [
   {
     title: 'Product Page',
-    url: 'https://market.nativebase.io/view/react-native-food-delivery-backend-app'
+    url: 'https://enatega.com/enatega-single-vendor/'
   },
-  { title: 'Docs', url: 'https://enatega.gitbook.io/enatega-full-app/' },
+  { title: 'Docs', url: 'https://enatega.com/docs/enatega-singlevendor-introduction/' },
   {
     title: 'Blog',
-    url: 'https://blog.nativebase.io/enatega-full-food-delivery-app-is-finally-here-a6039de4a09d'
+    url: 'https://enatega.com/blog/'
   },
-  { title: 'About Us', url: 'https://ninjascode.com/pages/ourteam.html' }
+  { title: 'About Us', url: 'https://ninjascode.com/our-team' }
 ]
 function Help() {
   const styles = useStyle()
diff --git a/RiderApp/app.json b/RiderApp/app.json
index ca73e9f..d2ce69f 100644
--- a/RiderApp/app.json
+++ b/RiderApp/app.json
@@ -1,9 +1,12 @@
 {
   "expo": {
     "name": "Enatega Rider",
-    "description": "Enatega is a starter kit food ordering app built in React Native using Expo for IOS and Android. It's made keeping good aesthetics in mind as well keeping the best coding practices in mind. Its fully customisable to easily help you in your next food delivery project. https://market.nativebase.io/view/react-native-food-delivery-backend-app",
+    "description": "Enatega is a starter kit food ordering app built in React Native using Expo for IOS and Android. It's made keeping good aesthetics in mind as well keeping the best coding practices in mind. Its fully customisable to easily help you in your next food delivery project. https://enatega.com/enatega-single-vendor/",
     "version": "4.2.7",
-    "slug": "food-delivery-rider",
+    "slug": "food-delivery-rider-singlevendor",
+    "owner": "ninjas_code",
+    "currentFullName": "@ninjas_code/food-delivery-rider-singlevendor",
+    "originalFullName": "@ninjas_code/food-delivery-rider-singlevendor",
     "privacy": "public",
     "androidStatusBar": {
       "backgroundColor": "#000"
@@ -21,7 +24,7 @@
     },
     "updates": {
       "fallbackToCacheTimeout": 0,
-      "url": "https://u.expo.dev/e3fb49ee-7c4f-4e4a-91fe-8f4f93662dde"
+      "url": "https://u.expo.dev/311d86a0-30ce-4683-8b9f-85be18904561"
     },
     "assetBundlePatterns": [
       "**/*"
@@ -66,11 +69,11 @@
     },
     "extra": {
       "eas": {
-        "projectId": "e3fb49ee-7c4f-4e4a-91fe-8f4f93662dde"
+        "projectId": "311d86a0-30ce-4683-8b9f-85be18904561"
       }
     },
     "runtimeVersion": {
       "policy": "sdkVersion"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/RiderApp/eas.json b/RiderApp/eas.json
index 8301da1..21e4b85 100644
--- a/RiderApp/eas.json
+++ b/RiderApp/eas.json
@@ -8,17 +8,20 @@
       "distribution": "internal",
       "ios": {
         "resourceClass": "m-medium"
-      }
+      },
+      "channel": "development"
     },
     "preview": {
       "distribution": "internal",
       "ios": {
         "resourceClass": "m-medium"
-      }
+      },
+      "channel": "preview"
     },
     "production": {
-      "ios": {
-        "resourceClass": "m-medium"
+      "channel": "production",
+      "android": {
+        "buildType": "apk"
       }
     }
   },
diff --git a/RiderApp/i18n.js b/RiderApp/i18n.js
index c322464..3c19d4d 100644
--- a/RiderApp/i18n.js
+++ b/RiderApp/i18n.js
@@ -1,5 +1,6 @@
 import * as Localization from 'expo-localization'
-import { AsyncStorage, Platform } from 'react-native'
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { Platform } from 'react-native'
 import i18n from 'i18n-js'
 import { en } from './languages/en'
 import { fr } from './languages/fr'
diff --git a/RiderApp/package.json b/RiderApp/package.json
index f776d81..4c30ab2 100644
--- a/RiderApp/package.json
+++ b/RiderApp/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "@apollo/react-hooks": "^3.1.3",
     "@expo/vector-icons": "^13.0.0",
-    "@react-native-async-storage/async-storage": "~1.17.3",
+    "@react-native-async-storage/async-storage": "^1.17.12",
     "@react-native-community/masked-view": "0.1.10",
     "@react-navigation/bottom-tabs": "^5.11.11",
     "@react-navigation/drawer": "^5.12.5",
@@ -45,8 +45,11 @@
     "expo-font": "~11.0.1",
     "expo-localization": "~14.0.0",
     "expo-location": "~15.0.1",
+    "expo-modules-autolinking": "^1.5.1",
+    "expo-navigation-bar": "~2.0.1",
     "expo-notifications": "~0.17.0",
     "expo-splash-screen": "~0.17.5",
+    "expo-system-ui": "~2.0.1",
     "expo-task-manager": "~11.0.1",
     "expo-updates": "~0.15.6",
     "graphql": "^14.3.1",
@@ -55,7 +58,7 @@
     "patch-package": "^6.5.1",
     "react": "18.1.0",
     "react-apollo": "^2.5.8",
-    "react-native": "0.70.5",
+    "react-native": "0.70.8",
     "react-native-animatable": "^1.3.2",
     "react-native-flash-message": "^0.1.13",
     "react-native-gesture-handler": "~2.8.0",
@@ -69,9 +72,7 @@
     "react-native-screens": "~3.18.0",
     "react-native-svg": "13.4.0",
     "react-native-webview": "11.23.1",
-    "subscriptions-transport-ws": "^0.9.16",
-    "expo-system-ui": "~2.0.1",
-    "expo-navigation-bar": "~2.0.1"
+    "subscriptions-transport-ws": "^0.9.16"
   },
   "devDependencies": {
     "babel-preset-expo": "~9.2.1",
diff --git a/RiderApp/src/screens/Help/Help.js b/RiderApp/src/screens/Help/Help.js
index a0b1eaf..6aa646a 100644
--- a/RiderApp/src/screens/Help/Help.js
+++ b/RiderApp/src/screens/Help/Help.js
@@ -12,15 +12,15 @@ const links = [
   {
     title: 'Product Page',
     url:
-      'https://market.nativebase.io/view/react-native-food-delivery-backend-app'
+      'https://enatega.com/enatega-single-vendor/'
   },
-  { title: 'Docs', url: 'https://enatega.gitbook.io/enatega-full-app/' },
+  { title: 'Docs', url: 'https://enatega.com/docs/enatega-singlevendor-rider-app-introduction/' },
   {
     title: 'Blog',
     url:
-      'https://blog.nativebase.io/enatega-full-food-delivery-app-is-finally-here-a6039de4a09d'
+      'https://enatega.com/blog/'
   },
-  { title: 'About Us', url: 'https://ninjascode.com/pages/ourteam.html' }
+  { title: 'About Us', url: 'https://ninjascode.com/our-team/' }
 ]
 function Help() {
   const navigation = useNavigation()