diff --git a/modules/i18n/spanish/es.json b/modules/i18n/spanish/es.json
index 3b061e82a..d850b1205 100644
--- a/modules/i18n/spanish/es.json
+++ b/modules/i18n/spanish/es.json
@@ -6,8 +6,8 @@
     "other": "Otro",
     "submit": "Entrega",
     "fName": "Primer Nombre",
-    "lName": "Apedillo",
-    "city": "Cuidad",
+    "lName": "Apellido",
+    "city": "Ciudad",
     "commName": "Nombre de comunidad",
     "notes": "Notas"
   },
diff --git a/package-lock.json b/package-lock.json
index d45a6f0f0..11c840557 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "puente-reactnative",
-  "version": "7.1.0",
+  "version": "8.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3625,9 +3625,9 @@
       }
     },
     "@react-native-community/async-storage": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@react-native-community/async-storage/-/async-storage-1.11.0.tgz",
-      "integrity": "sha512-Pq9LlmvtCEKAGdkyrgTcRxNh2fnHFykEj2qnRYijOl1pDIl2MkD5IxaXu5eOL0wgOtAl4U//ff4z40Td6XR5rw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@react-native-community/async-storage/-/async-storage-1.12.1.tgz",
+      "integrity": "sha512-70WGaH3PKYASi4BThuEEKMkyAgE9k7VytBqmgPRx3MzJx9/MkspwqJGmn3QLCgHLIFUgF1pit2mWICbRJ3T3lg==",
       "requires": {
         "deep-assign": "^3.0.0"
       }
@@ -4248,9 +4248,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.14.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.3.tgz",
-      "integrity": "sha512-33/L34xS7HVUx23e0wOT2V1qPF1IrHgQccdJVm9uXGTB9vFBrrzBtkQymT8VskeKOxjz55MSqMv0xuLq+u98WQ=="
+      "version": "14.14.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.5.tgz",
+      "integrity": "sha512-H5Wn24s/ZOukBmDn03nnGTp18A60ny9AmCwnEcgJiTgSGsCO7k+NWP7zjCCbhlcnVCoI+co52dUAt9GMhOSULw=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -8830,9 +8830,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "3.11.3",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.3.tgz",
-          "integrity": "sha512-wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA==",
+          "version": "3.11.4",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz",
+          "integrity": "sha512-FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw==",
           "dev": true,
           "optional": true
         }
@@ -13710,9 +13710,9 @@
       "optional": true
     },
     "nanoid": {
-      "version": "3.1.15",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.15.tgz",
-      "integrity": "sha512-n8rXUZ8UU3lV6+43atPrSizqzh25n1/f00Wx1sCiE7R1sSHytZLTTiQl8DjC4IDLOnEZDlgJhy0yO4VsIpMxow=="
+      "version": "3.1.16",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz",
+      "integrity": "sha512-+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -14782,13 +14782,13 @@
       }
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
+      "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "prop-types": {
diff --git a/package.json b/package.json
index f3331b97f..01102a922 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "react-native-emoji": "1.8.0",
     "react-native-gesture-handler": "1.6.0",
     "react-native-localize": "1.3.3",
+    "react-native-maps": "0.27.1",
     "react-native-paper": "3.11.0",
     "react-native-safe-area-context": "3.0.7",
     "react-native-screens": "2.9.0",
@@ -72,8 +73,7 @@
     "react-redux": "7.2.0",
     "redux": "4.0.5",
     "redux-actions": "2.6.5",
-    "yup": "0.29.3",
-    "react-native-maps": "0.27.1"
+    "yup": "0.29.3"
   },
   "devDependencies": {
     "@babel/core": "7.10.2",
@@ -92,4 +92,4 @@
     "standard-version-expo": "1.0.3"
   },
   "private": true
-}
+}
\ No newline at end of file
diff --git a/services/aws/index.js b/services/aws/index.js
index 118116eb5..683fb61b0 100644
--- a/services/aws/index.js
+++ b/services/aws/index.js
@@ -1,9 +1,9 @@
-import getEnvVars from '../../environment';
+import selectedENV from '../../environment';
 
 const axios = require('axios');
 
 function retrievePuenteAutofillData(parameter) {
-  const { AWS_LAMBDA_URL } = getEnvVars();
+  const { AWS_LAMBDA_URL } = selectedENV;
   return axios.get(AWS_LAMBDA_URL, {
     params: {
       bucket_name: 'google-sheets-lambda',
diff --git a/services/parse/auth/index.js b/services/parse/auth/index.js
index c1e47d042..28348efa2 100644
--- a/services/parse/auth/index.js
+++ b/services/parse/auth/index.js
@@ -1,9 +1,9 @@
 import { Parse } from 'parse/react-native';
-import { AsyncStorage } from 'react-native';
-import getEnvVars from '../../../environment';
+import AsyncStorage from '@react-native-community/async-storage';
+import selectedENV from '../../../environment';
 
 function initialize() {
-  const { parseAppId, parseJavascriptKey, parseServerUrl } = getEnvVars();
+  const { parseAppId, parseJavascriptKey, parseServerUrl } = selectedENV;
 
   Parse.setAsyncStorage(AsyncStorage);
   Parse.initialize(parseAppId, parseJavascriptKey);
diff --git a/services/tasky/tasks/index.js b/services/tasky/tasks/index.js
index faef328ac..12adba1b0 100644
--- a/services/tasky/tasks/index.js
+++ b/services/tasky/tasks/index.js
@@ -1,8 +1,8 @@
 import axios from 'axios';
-import getEnvVars from '../../../environment';
+import selectedENV from '../../../environment';
 
 function getTasks() {
-  const { taskyUrlApi } = getEnvVars();
+  const { taskyUrlApi } = selectedENV;
 
   return axios.get(`${taskyUrlApi}/tasks`)
     .then(async (response) => {