diff --git a/app.config.ts b/app.config.ts
new file mode 100644
index 0000000..59e0546
--- /dev/null
+++ b/app.config.ts
@@ -0,0 +1,18 @@
+import { ConfigContext, ExpoConfig } from '@expo/config';
+
+export default ({ config }: ConfigContext): ExpoConfig => ({
+  ...config,
+  name: 'Jeżyk',
+  slug: 'hedgeapp',
+  ios: {
+    bundleIdentifier: 'com.szarbartosz.hedgeapp',
+  },
+  android: {
+    package: 'com.szarbartosz.hedgeapp',
+    config: {
+      googleMaps: {
+        apiKey: process.env.ANDROID_GOOGLE_API_KEY,
+      },
+    },
+  },
+});
diff --git a/app.json b/app.json
index d187a78..370cb0d 100644
--- a/app.json
+++ b/app.json
@@ -14,15 +14,13 @@
     },
     "assetBundlePatterns": ["**/*"],
     "ios": {
-      "supportsTablet": true,
-      "bundleIdentifier": "com.szarbartosz.hedgeapp"
+      "supportsTablet": true
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./src/assets/images/adaptive-icon.png",
         "backgroundColor": "#ffffff"
-      },
-      "package": "com.szarbartosz.hedgeapp"
+      }
     },
     "web": {
       "bundler": "metro",
diff --git a/eas.json b/eas.json
index 30eae47..bc5e27d 100644
--- a/eas.json
+++ b/eas.json
@@ -5,6 +5,9 @@
   },
   "build": {
     "development": {
+      "env": {
+        "EXPO_PUBLIC_BASE_URL": "https://hedgeapp.szarbartosz.com"
+      },
       "developmentClient": true,
       "distribution": "internal",
       "ios": {
@@ -12,9 +15,22 @@
       }
     },
     "preview": {
+      "env": {
+        "EXPO_PUBLIC_BASE_URL": "https://hedgeapp.szarbartosz.com"
+      },
+      "developmentClient": false,
+      "android": {
+        "buildType": "apk"
+      },
       "distribution": "internal"
     },
     "production": {
+      "env": {
+        "EXPO_PUBLIC_BASE_URL": "https://hedgeapp.szarbartosz.com"
+      },
+      "android": {
+        "buildType": "apk"
+      },
       "autoIncrement": true
     }
   },