diff --git a/.env b/.env
index 08e064a..ef9aebf 100644
--- a/.env
+++ b/.env
@@ -2,3 +2,18 @@ ESLINT_NO_DEV_ERRORS=true
 
 REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
 REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+
+REACT_APP_SITE_NAME='WrenchBoard'
+REACT_APP_DASH_URL='https://dev-users.wrenchboard.com'
+REACT_APP_DASH_URL_LOGIN="https://dev-users.wrenchboard.com/login"
+REACT_APP_DASH_URL_SIGNUP="https://dev-users.wrenchboard.com/signup"
+REACT_APP_ANDROID_APP='https://play.google.com/store/apps/details?id=com.wrenchboard.users'
+REACT_APP_APPLE_APP='https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8'
+REACT_APP_FACEBOOK_LINK='https://www.facebook.com/wrenchboard'
+REACT_APP_TWITTER_LINK='https://twitter.com/wrenchboard/'
+REACT_APP_LINKEDIN_LINK="https://www.linkedin.com/company/wrenchboard/"
+REACT_APP_SUPPORT_EMAIL='support@wrenchboard.com'
+REACT_APP_SUPPORT_PHONE='404 855-7966'
+REACT_APP_SUPPORT_PHONE_NG='(+420) 336 476 328'
+REACT_APP_SUPPORT_US_ADDRESS='Cumberland Pkwy, Atlanta GA 30339'
+REACT_APP_SUPPORT_NG_ADDRESS='Saka Tinubu Street, Victoria Island Lagos, Nigeria'
diff --git a/.env.development b/.env.development
index 7b89cab..0844084 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,19 @@
 ESLINT_NO_DEV_ERRORS=true
 
 REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
-REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
\ No newline at end of file
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+
+REACT_APP_SITE_NAME='WrenchBoard'
+REACT_APP_DASH_URL='https://dev-users.wrenchboard.com'
+REACT_APP_DASH_URL_LOGIN="https://dev-users.wrenchboard.com/login"
+REACT_APP_DASH_URL_SIGNUP="https://dev-users.wrenchboard.com/signup"
+REACT_APP_ANDROID_APP='https://play.google.com/store/apps/details?id=com.wrenchboard.users'
+REACT_APP_APPLE_APP='https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8'
+REACT_APP_FACEBOOK_LINK='https://www.facebook.com/wrenchboard'
+REACT_APP_TWITTER_LINK='https://twitter.com/wrenchboard/'
+REACT_APP_LINKEDIN_LINK="https://www.linkedin.com/company/wrenchboard/"
+REACT_APP_SUPPORT_EMAIL='support@wrenchboard.com'
+REACT_APP_SUPPORT_PHONE='404 855-7966'
+REACT_APP_SUPPORT_PHONE_NG='(+420) 336 476 328'
+REACT_APP_SUPPORT_US_ADDRESS='Cumberland Pkwy, Atlanta GA 30339'
+REACT_APP_SUPPORT_NG_ADDRESS='Saka Tinubu Street, Victoria Island Lagos, Nigeria'
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 7b89cab..f537d78 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,19 @@
 ESLINT_NO_DEV_ERRORS=true
 
 REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
-REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
\ No newline at end of file
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+
+REACT_APP_SITE_NAME='WrenchBoard'
+REACT_APP_DASH_URL='https://users.wrenchboard.com'
+REACT_APP_DASH_URL_LOGIN="https://users.wrenchboard.com/login"
+REACT_APP_DASH_URL_SIGNUP="https://users.wrenchboard.com/signup"
+REACT_APP_ANDROID_APP='https://play.google.com/store/apps/details?id=com.wrenchboard.users'
+REACT_APP_APPLE_APP='https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8'
+REACT_APP_FACEBOOK_LINK='https://www.facebook.com/wrenchboard'
+REACT_APP_TWITTER_LINK='https://twitter.com/wrenchboard/'
+REACT_APP_LINKEDIN_LINK="https://www.linkedin.com/company/wrenchboard/"
+REACT_APP_SUPPORT_EMAIL='support@wrenchboard.com'
+REACT_APP_SUPPORT_PHONE='404 855-7966'
+REACT_APP_SUPPORT_PHONE_NG='(+420) 336 476 328'
+REACT_APP_SUPPORT_US_ADDRESS='Cumberland Pkwy, Atlanta GA 30339'
+REACT_APP_SUPPORT_NG_ADDRESS='Saka Tinubu Street, Victoria Island Lagos, Nigeria'
\ No newline at end of file
diff --git a/src/Services/ContactData.js b/src/Services/ContactData.js
index 877a677..383b922 100644
--- a/src/Services/ContactData.js
+++ b/src/Services/ContactData.js
@@ -4,7 +4,7 @@ import getConfig from './../Config/config'
 async function ContactData(callData) {
     // debugger;
     var site = getConfig()[0];
-    let response = await Axios.post(`${site.user_service_endpoint}/sitecontact`, callData);
+    let response = await Axios.post(`${process.env.REACT_APP_AUX_ENDPOINT}/sitecontact`, callData);
     return response.data.result;
 }
 
diff --git a/src/Services/FaqData.js b/src/Services/FaqData.js
index 62fd161..42cb2c6 100644
--- a/src/Services/FaqData.js
+++ b/src/Services/FaqData.js
@@ -4,7 +4,7 @@ import getConfig from './../Config/config'
 async function FaqData() {
     // debugger;
     var site = getConfig()[0];
-    let response = await Axios.post(`${site.user_service_endpoint}/faq`);
+    let response = await Axios.post(`${process.env.REACT_APP_AUX_ENDPOINT}/faq`);
     return await response;
 }
 
diff --git a/src/Services/JobsData.js b/src/Services/JobsData.js
index 91ad4e5..1949192 100644
--- a/src/Services/JobsData.js
+++ b/src/Services/JobsData.js
@@ -16,7 +16,7 @@ async function JobsData() {
         });
     }
 */
-    let response = await Axios.post(site.user_service_endpoint + "/startjoblist", callData);
+    let response = await Axios.post(process.env.REACT_APP_AUX_ENDPOINT + "/startjoblist", callData);
     return response.data.result_list;
 }
 
diff --git a/src/components/AboutUs/HeaderAbout.js b/src/components/AboutUs/HeaderAbout.js
index 5362ad9..128883b 100644
--- a/src/components/AboutUs/HeaderAbout.js
+++ b/src/components/AboutUs/HeaderAbout.js
@@ -30,10 +30,10 @@ function HeaderAbout({ 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={site.dash_url_login}>
+                                    <a className="login-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
                                         <i className="fal fa-user"></i> Login
                                     </a>
-                                    <a className="main-btn ml-30" href={site.dash_url_signup}>
+                                    <a className="main-btn ml-30" href={process.env.REACT_APP_DASH_URL_SIGNUP}>
                                         Get Started
                                     </a>
                                     <div
diff --git a/src/components/Contact/Forms.js b/src/components/Contact/Forms.js
index 328a965..0aff5e7 100644
--- a/src/components/Contact/Forms.js
+++ b/src/components/Contact/Forms.js
@@ -50,12 +50,12 @@ function Forms() {
                                     <h5>Headquaters</h5>
                                     <p>
                                         <i className="fal fa-home"></i>
-                                        {site.support_us_address}
+                                        {process.env.REACT_APP_SUPPORT_US_ADDRESS}
                                     </p>
 
                                     <p>
                                         <i className="fal fa-home"></i>
-                                        {site.support_ng_address}
+                                        {process.env.REACT_APP_SUPPORT_NG_ADDRESS}
                                     </p>
 
                                 </div>
@@ -63,31 +63,31 @@ function Forms() {
                                     <h5>Phone</h5>
                                     <p>
                                         <i className="fal fa-phone"></i>
-                                        {site.support_phone}
+                                        {process.env.REACT_APP_SUPPORT_PHONE}
                                         <br />
-                                       {site.support_phone_ng}
+                                       {process.env.REACT_APP_SUPPORT_PHONE_NG}
                                     </p>
                                 </div>
                                 <div className="single-info">
                                     <h5>Support</h5>
                                     <p>
                                         <i className="fal fa-envelope"></i>
-                                        {site.support_email}
+                                        {process.env.REACT_APP_SUPPORT_EMAIL}
                                        
                                     </p>
                                 </div>
                                 <div className="ab-social">
                                     <h5>Follow Us</h5>
-                                    <a className="fac" href={site.facebook_link}>
+                                    <a className="fac" href={process.env.REACT_APP_FACEBOOK_LINK}>
                                         <i className="fab fa-facebook-f"></i>
                                     </a>
-                                    <a className="twi" href={site.twitter_link}>
+                                    <a className="twi" href={process.env.REACT_APP_TWITTER_LINK}>
                                         <i className="fab fa-twitter"></i>
                                     </a>
                                     <a className="you" href="#">
                                         <i className="fab fa-youtube"></i>
                                     </a>
-                                    <a className="lin" href={site.linked_link}>
+                                    <a className="lin" href={process.env.REACT_APP_LINKEDIN_LINK}>
                                         <i className="fab fa-linkedin-in"></i>
                                     </a>
                                 </div>
diff --git a/src/components/HomeOne/FeaturesHomeOne.js b/src/components/HomeOne/FeaturesHomeOne.js
index 7d117aa..ffe3431 100755
--- a/src/components/HomeOne/FeaturesHomeOne.js
+++ b/src/components/HomeOne/FeaturesHomeOne.js
@@ -68,7 +68,7 @@ function FeaturesHomeOne({ className }) {
         //                     <p>
         //                     WrenchBoard platform connects you with quality service that need articles writing, blog management, photography, product testing research and surveys and more to deliver your project with ease.
         //                     </p>
-        //                     <a className="main-btn" href={site.dash_url_login}>
+        //                     <a className="main-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
         //                         Learn More
         //                     </a>
         //                 </div>
@@ -89,7 +89,7 @@ function FeaturesHomeOne({ className }) {
         //                     <p>
         //                         Cash in the Pocket with WrenchBoard as a reliable partner to connect you with new opportunities.Track, Organize your Portfolio and Manage your Skills, preferred workgroup and teams efficiently.
         //                     </p>
-        //                     <a className="main-btn" href={site.dash_url_login}>
+        //                     <a className="main-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
         //                         Learn More
         //                     </a>
         //                 </div>
@@ -110,7 +110,7 @@ function FeaturesHomeOne({ className }) {
         //                     <p>
         //                         Get paid Instantly for completed task using WrenchBoard. Achieve your short-term goals or long-term income by Connecting with WrenchBoard. Complete access to your earnings.
         //                     </p>
-        //                     <a className="main-btn" href={site.dash_url_login}>
+        //                     <a className="main-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
         //                         Learn More
         //                     </a>
         //                 </div>
diff --git a/src/components/HomeOne/FooterHomeOne.js b/src/components/HomeOne/FooterHomeOne.js
index 3b3b4da..f74af3f 100644
--- a/src/components/HomeOne/FooterHomeOne.js
+++ b/src/components/HomeOne/FooterHomeOne.js
@@ -33,7 +33,7 @@ function FooterHomeOne({ className }) {
                                             </a>
                                         </li>
                                         <li>
-                                            <a href={site.twitter_link}>
+                                            <a href={process.env.REACT_APP_TWITTER_LINK}>
                                                 <i className="fab fa-twitter" />
                                             </a>
                                         </li>
@@ -112,12 +112,12 @@ function FooterHomeOne({ className }) {
                                 <div className="apps-download-btn">
                                     <ul>
                                         <li>
-                                            <a href={site.apple_app}>
+                                            <a href={process.env.APPLE_APP}>
                                                 <i className="fab fa-apple" /> Download for iOS
                                             </a>
                                         </li>
                                         <li>
-                                            <a className="item-2" href={site.android_app}>
+                                            <a className="item-2" href={process.env.REACT_APP_ANDROID_APP}>
                                                 <i className="fab fa-google-play" /> Download for
                                                 Android
                                             </a>
diff --git a/src/components/HomeOne/HeroHomeOne.js b/src/components/HomeOne/HeroHomeOne.js
index 4338c3a..cb406bc 100644
--- a/src/components/HomeOne/HeroHomeOne.js
+++ b/src/components/HomeOne/HeroHomeOne.js
@@ -25,12 +25,12 @@ function HeroHomeOne() {
                                 </p>
                                 <ul>
                                     <li>
-                                        <a href={site.apple_app}>
+                                        <a href={process.env.APPLE_APP}>
                                             <i className="fab fa-apple" /> Download for iOS
                                         </a>
                                     </li>
                                     <li>
-                                        <a className="item-2" href={site.android_app}>
+                                        <a className="item-2" href={process.env.REACT_APP_ANDROID_APP}>
                                             <i className="fab fa-google-play" /> Download for
                                             Android
                                         </a>
diff --git a/src/components/HomeOne/HomeOneHeader.js b/src/components/HomeOne/HomeOneHeader.js
index 6b08f8c..afa8e13 100644
--- a/src/components/HomeOne/HomeOneHeader.js
+++ b/src/components/HomeOne/HomeOneHeader.js
@@ -28,10 +28,10 @@ function HomeOneHeader({ 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={site.dash_url_login}>
+                                <a className="login-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
                                     <i className="fal fa-user" /> Login
                                 </a>
-                                <a className="main-btn ml-30" href={site.dash_url_signup}>
+                                <a className="main-btn ml-30" href={process.env.REACT_APP_DASH_URL_SIGNUP}>
                                     Get Started
                                 </a>
                                 <div
diff --git a/src/components/HomeOne/RecentJobsOne.js b/src/components/HomeOne/RecentJobsOne.js
index 0f1257f..94bc5a0 100644
--- a/src/components/HomeOne/RecentJobsOne.js
+++ b/src/components/HomeOne/RecentJobsOne.js
@@ -36,7 +36,7 @@ titleLen(title){
        if ( this.state.jobsDataResults== undefined ){
            return null;
        }
-        var dashUrl = site.dash_url;
+        var dashUrl = process.env.REACT_APP_DASH_URL;
 
         if (this.state.jobsDataResults.length == 0){
             return <></>;
diff --git a/src/components/HomeOne/TrafficHomeTwo.js b/src/components/HomeOne/TrafficHomeTwo.js
index 5bec492..29db60c 100644
--- a/src/components/HomeOne/TrafficHomeTwo.js
+++ b/src/components/HomeOne/TrafficHomeTwo.js
@@ -54,7 +54,7 @@ function TrafficHomeOne() {
                             </div>
                             {/* <div className="col-lg-12">
                                 <div className="traffic-btn mt-50">
-                                    <a className="main-btn" href={site.dash_url_login}>
+                                    <a className="main-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
                                         Login <i className="fal fa-arrow-right" />
                                     </a>
                                 </div>
diff --git a/src/components/Mobile/Drawer.js b/src/components/Mobile/Drawer.js
index 54bb4c8..1a03d24 100644
--- a/src/components/Mobile/Drawer.js
+++ b/src/components/Mobile/Drawer.js
@@ -72,7 +72,7 @@ function Drawer({ drawer, action }) {
                                 <div className="offcanvas-social">
                                     <ul className="text-center">
                                         <li>
-                                            <a href={site.facebook_link} >
+                                            <a href={process.env.REACT_APP_FACEBOOK_LINK} >
                                                 <i className="fab fa-facebook-f"></i>
                                             </a>
                                         </li>
@@ -89,12 +89,12 @@ function Drawer({ drawer, action }) {
                                         <li>
                                             <a href="#">
                                                 <i className="fal fa-envelope"></i>{' '}
-                                               {site.support_email}
+                                               {process.env.REACT_APP_SUPPORT_EMAIL}
                                             </a>
                                         </li>
                                         <li>
                                             <a href="#">
-                                                <i className="fal fa-phone"></i> {site.support_phone}
+                                                <i className="fal fa-phone"></i> {process.env.REACT_APP_SUPPORT_PHONE}
                                             </a>
                                         </li>
                                         <li>
diff --git a/src/components/News/HeaderNews.js b/src/components/News/HeaderNews.js
index 1ab2400..809173f 100644
--- a/src/components/News/HeaderNews.js
+++ b/src/components/News/HeaderNews.js
@@ -29,10 +29,10 @@ function HeaderNews({ 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={site.dash_url_login}>
+                                    <a className="login-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
                                         <i className="fal fa-user"></i> Login
                                     </a>
-                                    <a className="main-btn ml-30" href={site.dash_url_signup}>
+                                    <a className="main-btn ml-30" href={process.env.REACT_APP_DASH_URL_SIGNUP}>
                                         Get Started
                                     </a>
                                     <div
diff --git a/src/components/Service/DetailsService.js b/src/components/Service/DetailsService.js
index d1c2b5c..e7263fd 100644
--- a/src/components/Service/DetailsService.js
+++ b/src/components/Service/DetailsService.js
@@ -38,7 +38,7 @@ function DetailsService() {
                                        finance & accounting, website & app development, creative & design, 
                                        customer support and operations.
                                        <hr />
-                                       Learn more at < a href ={site.dash_url_login} >WrenchBoard</a>
+                                       Learn more at < a href ={process.env.REACT_APP_DASH_URL_LOGIN} >WrenchBoard</a>
                                     </p>
                                 </div>
                             </div>
diff --git a/src/components/Service/HeaderService.js b/src/components/Service/HeaderService.js
index 5ee5761..aa3a709 100644
--- a/src/components/Service/HeaderService.js
+++ b/src/components/Service/HeaderService.js
@@ -25,10 +25,10 @@ function HeaderService({ 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={site.dash_url_login}>
+                                    <a className="login-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
                                         <i className="fal fa-user"></i> Login
                                     </a>
-                                    <a className="main-btn ml-30" href={site.dash_url_signup}>
+                                    <a className="main-btn ml-30" href={process.env.REACT_APP_DASH_URL_SIGNUP}>
                                         Get Started
                                     </a>
                                     <div
diff --git a/src/components/Service/ServiceSideMenu.js b/src/components/Service/ServiceSideMenu.js
index 1d7c356..7850d39 100644
--- a/src/components/Service/ServiceSideMenu.js
+++ b/src/components/Service/ServiceSideMenu.js
@@ -54,7 +54,7 @@ function ServiceSideMenu() {
                             </a>
                         </li>
                         <li>
-                            <a className="item-2" href={site.android_app}>
+                            <a className="item-2" href={process.env.REACT_APP_ANDROID_APP}>
                                 <i className="fab fa-google-play" /> Download for
                                 Android
                             </a>
diff --git a/src/components/UseCases/HeaderNews.js b/src/components/UseCases/HeaderNews.js
index 9c093e1..93dc2f7 100644
--- a/src/components/UseCases/HeaderNews.js
+++ b/src/components/UseCases/HeaderNews.js
@@ -19,7 +19,7 @@ function HeaderNews({ action }) {
                             <div className="col-lg-2 col-md-4 col-sm-5 col-6 order-1 order-sm-1">
                                 <div className="appie-logo-box">
                                     <a href="/">
-                                        <img src={logo} alt={site.site_name} />
+                                        <img src={logo} alt={process.env.REACT_APP_SITE_NAME} />
                                     </a>
                                 </div>
                             </div>
@@ -30,10 +30,10 @@ function HeaderNews({ 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={site.dash_url_login}>
+                                    <a className="login-btn" href={process.env.REACT_APP_DASH_URL_LOGIN}>
                                         <i className="fal fa-user"></i> Login
                                     </a>
-                                    <a className="main-btn ml-30" href={site.dash_url_signup}>
+                                    <a className="main-btn ml-30" href={process.env.REACT_APP_DASH_URL_SIGNUP}>
                                         Get Started
                                     </a>
                                     <div
diff --git a/src/components/UseCases/UseCase.js b/src/components/UseCases/UseCase.js
index 4423138..01db699 100644
--- a/src/components/UseCases/UseCase.js
+++ b/src/components/UseCases/UseCase.js
@@ -31,11 +31,11 @@ function UseCase() {
                                     <div className="b-post-details">
 
                                         <h3>
-                                            <a href={site.dash_url_login}>
+                                            <a href={process.env.REACT_APP_DASH_URL_LOGIN}>
                                                 {i.title}
                                             </a>
                                         </h3>
-                                        <a className="read-more" href={site.dash_url_login}>
+                                        <a className="read-more" href={process.env.REACT_APP_DASH_URL_LOGIN}>
                                             Learn more<i className="fal fa-arrow-right"></i>
                                         </a>
                                     </div>