diff --git a/app/Mobile/Drawer.js b/app/Mobile/Drawer.js
index 94224d7..1eb81c4 100644
--- a/app/Mobile/Drawer.js
+++ b/app/Mobile/Drawer.js
@@ -61,7 +61,7 @@ function Drawer({ drawer, action }) {
                                 <div className="offcanvas-social">
                                     <ul className="text-center">
                                         <li>
-                                            <a href={process.env.REACT_APP_FACEBOOK_LINK} >
+                                            <a href={process.env.NEXT_PUBLIC_FACEBOOK_LINK} >
                                                 <i className="fab fa-facebook-f"></i>
                                             </a>
                                         </li>
@@ -78,12 +78,12 @@ function Drawer({ drawer, action }) {
                                         <li>
                                             <a href="#">
                                                 <i className="fal fa-envelope"></i>{' '}
-                                               {process.env.REACT_APP_SUPPORT_EMAIL}
+                                               {process.env.NEXT_PUBLIC_SUPPORT_EMAIL}
                                             </a>
                                         </li>
                                         <li>
                                             <a href="#">
-                                                <i className="fal fa-phone"></i> {process.env.REACT_APP_SUPPORT_PHONE}
+                                                <i className="fal fa-phone"></i> {process.env.NEXT_PUBLIC_SUPPORT_PHONE}
                                             </a>
                                         </li>
                                         <li>
diff --git a/app/components/navigation/Services.js b/app/components/navigation/Services.js
index ab1604f..a9d2a65 100644
--- a/app/components/navigation/Services.js
+++ b/app/components/navigation/Services.js
@@ -26,10 +26,10 @@ function Services({ action }) {
                             </div>
                             <div className="col-lg-4  col-md-7 col-sm-6 col-6 order-2 order-sm-3">
                                 <div className="appie-btn-box text-right">
-                                    <a className="login-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
+                                    <a className="login-btn" href={process.env.NEXT_PUBLIC_DASH_URL_LOGIN}>
                                         <i className="fal fa-user"></i> Login
                                     </a>
-                                    <a className="main-btn ml-30" href={process.env.REACT_APP_DASH_URL_SIGNUP}>
+                                    <a className="main-btn ml-30" href={process.env.NEXT_PUBLIC_DASH_URL_SIGNUP}>
                                         Get Started
                                     </a>
                                     <div