diff --git a/api/package-lock.json b/api/package-lock.json
index a39b79ef..2a192458 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "api",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "api",
-      "version": "3.0.0",
+      "version": "3.1.0",
       "license": "ISC",
       "dependencies": {
         "@babel/cli": "^7.24.5",
diff --git a/api/package.json b/api/package.json
index 54f40d62..b25876a6 100644
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "",
   "main": "index.js",
   "type": "module",
diff --git a/backend/package-lock.json b/backend/package-lock.json
index 707e6d63..f7c29cc9 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "backend",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "backend",
-      "version": "3.0.0",
+      "version": "3.1.0",
       "dependencies": {
         "@craco/craco": "^7.1.0",
         "@emotion/react": "^11.11.4",
diff --git a/backend/package.json b/backend/package.json
index 8b5617ac..8c0fd6e6 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "private": true,
   "dependencies": {
     "@craco/craco": "^7.1.0",
diff --git a/backend/src/config/env.config.ts b/backend/src/config/env.config.ts
index a2e87ab3..c3edef87 100644
--- a/backend/src/config/env.config.ts
+++ b/backend/src/config/env.config.ts
@@ -20,18 +20,18 @@ const env = {
   isMobile: () => window.innerWidth <= 960,
 
   APP_TYPE: movininTypes.AppType.Backend,
-  API_HOST: process.env.REACT_APP_MI_API_HOST,
+  API_HOST: String(process.env.REACT_APP_MI_API_HOST),
   LANGUAGES: LANGUAGES.map((l) => l.code),
   _LANGUAGES: LANGUAGES,
-  DEFAULT_LANGUAGE: process.env.REACT_APP_MI_DEFAULT_LANGUAGE || 'en',
+  DEFAULT_LANGUAGE: String(process.env.REACT_APP_MI_DEFAULT_LANGUAGE || 'en'),
   PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_PAGE_SIZE), 10) || 30,
   PROPERTIES_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_PROPERTIES_PAGE_SIZE), 10) || 15,
   BOOKINGS_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_BOOKINGS_PAGE_SIZE), 10) || 20,
   BOOKINGS_MOBILE_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_BOOKINGS_MOBILE_PAGE_SIZE), 10) || 10,
-  CDN_USERS: process.env.REACT_APP_MI_CDN_USERS,
-  CDN_TEMP_USERS: process.env.REACT_APP_MI_CDN_TEMP_USERS,
-  CDN_PROPERTIES: process.env.REACT_APP_MI_CDN_PROPERTIES,
-  CDN_TEMP_PROPERTIES: process.env.REACT_APP_MI_CDN_TEMP_PROPERTIES,
+  CDN_USERS: String(process.env.REACT_APP_MI_CDN_USERS),
+  CDN_TEMP_USERS: String(process.env.REACT_APP_MI_CDN_TEMP_USERS),
+  CDN_PROPERTIES: String(process.env.REACT_APP_MI_CDN_PROPERTIES),
+  CDN_TEMP_PROPERTIES: String(process.env.REACT_APP_MI_CDN_TEMP_PROPERTIES),
   PAGE_OFFSET: 200,
   INFINITE_SCROLL_OFFSET: 40,
   AGENCY_IMAGE_WIDTH: Number.parseInt(String(process.env.REACT_APP_MI_AGENCY_IMAGE_WIDTH), 10) || 60,
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b74af5b8..52da3da2 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "frontend",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "frontend",
-      "version": "3.0.0",
+      "version": "3.1.0",
       "dependencies": {
         "@craco/craco": "^7.1.0",
         "@emotion/react": "^11.11.4",
diff --git a/frontend/package.json b/frontend/package.json
index 7bef9dda..b14b47cc 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "private": true,
   "dependencies": {
     "@craco/craco": "^7.1.0",
diff --git a/frontend/src/config/env.config.ts b/frontend/src/config/env.config.ts
index 95ae2bc6..8de6ca81 100644
--- a/frontend/src/config/env.config.ts
+++ b/frontend/src/config/env.config.ts
@@ -20,16 +20,16 @@ const env = {
   isMobile: () => window.innerWidth <= 960,
 
   APP_TYPE: movininTypes.AppType.Frontend,
-  API_HOST: process.env.REACT_APP_MI_API_HOST,
+  API_HOST: String(process.env.REACT_APP_MI_API_HOST),
   LANGUAGES: LANGUAGES.map((l) => l.code),
   _LANGUAGES: LANGUAGES,
-  DEFAULT_LANGUAGE: process.env.REACT_APP_MI_DEFAULT_LANGUAGE || 'en',
+  DEFAULT_LANGUAGE: String(process.env.REACT_APP_MI_DEFAULT_LANGUAGE || 'en'),
   PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_PAGE_SIZE), 10) || 30,
   PROPERTIES_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_PROPERTIES_PAGE_SIZE), 10) || 15,
   BOOKINGS_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_BOOKINGS_PAGE_SIZE), 10) || 20,
   BOOKINGS_MOBILE_PAGE_SIZE: Number.parseInt(String(process.env.REACT_APP_MI_BOOKINGS_MOBILE_PAGE_SIZE), 10) || 10,
-  CDN_USERS: process.env.REACT_APP_MI_CDN_USERS,
-  CDN_PROPERTIES: process.env.REACT_APP_MI_CDN_PROPERTIES,
+  CDN_USERS: String(process.env.REACT_APP_MI_CDN_USERS),
+  CDN_PROPERTIES: String(process.env.REACT_APP_MI_CDN_PROPERTIES),
   PAGE_OFFSET: 200,
   INFINITE_SCROLL_OFFSET: 40,
   AGENCY_IMAGE_WIDTH: Number.parseInt(String(process.env.REACT_APP_MI_AGENCY_IMAGE_WIDTH), 10) || 60,
@@ -39,7 +39,7 @@ const env = {
   PROPERTY_OPTION_IMAGE_HEIGHT: 85,
   SELECTED_PROPERTY_OPTION_IMAGE_HEIGHT: 30,
   RECAPTCHA_ENABLED: (process.env.REACT_APP_MI_RECAPTCHA_ENABLED && process.env.REACT_APP_MI_RECAPTCHA_ENABLED.toLowerCase()) === 'true',
-  RECAPTCHA_SITE_KEY: process.env.REACT_APP_MI_RECAPTCHA_SITE_KEY,
+  RECAPTCHA_SITE_KEY: String(process.env.REACT_APP_MI_RECAPTCHA_SITE_KEY),
   MINIMUM_AGE: Number.parseInt(String(process.env.REACT_APP_MI_MINIMUM_AGE), 10) || 21,
   // PAGINATION_MODE: CLASSIC or INFINITE_SCROLL
   // If you choose CLASSIC, you will get a classic pagination with next and previous buttons on desktop and infinite scroll on mobile.
@@ -50,7 +50,7 @@ const env = {
       ? Const.PAGINATION_MODE.INFINITE_SCROLL
       : Const.PAGINATION_MODE.CLASSIC,
   SIZE_UNIT: 'm²',
-  STRIPE_PUBLISHABLE_KEY: process.env.REACT_APP_MI_STRIPE_PUBLISHABLE_KEY,
+  STRIPE_PUBLISHABLE_KEY: String(process.env.REACT_APP_MI_STRIPE_PUBLISHABLE_KEY),
 }
 
 export default env
diff --git a/frontend/src/pages/Checkout.tsx b/frontend/src/pages/Checkout.tsx
index 1e7fbd33..3f10713f 100644
--- a/frontend/src/pages/Checkout.tsx
+++ b/frontend/src/pages/Checkout.tsx
@@ -52,7 +52,7 @@ import '../assets/css/checkout.css'
 // Make sure to call `loadStripe` outside of a component’s render to avoid
 // recreating the `Stripe` object on every render.
 //
-const stripePromise = loadStripe(env.STRIPE_PUBLISHABLE_KEY as string)
+const stripePromise = loadStripe(env.STRIPE_PUBLISHABLE_KEY)
 
 const Checkout = () => {
   const reactLocation = useLocation()
diff --git a/mobile/app.json b/mobile/app.json
index d4eca1fb..f341a28e 100644
--- a/mobile/app.json
+++ b/mobile/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "jsEngine": "hermes",
     "name": "Movin' In",
-    "version": "3.0.0",
+    "version": "3.1.0",
     "slug": "movinin",
     "icon": "./assets/icon.png",
     "assetBundlePatterns": [
@@ -26,7 +26,7 @@
       "package": "com.movinin"
     },
     "ios": {
-      "buildNumber": "3.0.0",
+      "buildNumber": "3.1.0",
       "supportsTablet": true,
       "icon": "./assets/icon.png",
       "splash": {
diff --git a/mobile/package-lock.json b/mobile/package-lock.json
index 7c03e854..f4e22bb8 100644
--- a/mobile/package-lock.json
+++ b/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "movinin",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "movinin",
-      "version": "3.0.0",
+      "version": "3.1.0",
       "dependencies": {
         "@react-native-async-storage/async-storage": "1.21.0",
         "@react-native-community/datetimepicker": "7.6.1",
diff --git a/mobile/package.json b/mobile/package.json
index dc1ab8a0..0f37dcdd 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "movinin",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "tsc --build --verbose && expo start --port 8081",