diff --git a/capacitor.config.ts b/capacitor.config.ts
index c56dd736..07976594 100644
--- a/capacitor.config.ts
+++ b/capacitor.config.ts
@@ -1,11 +1,13 @@
 import type { CapacitorConfig } from '@capacitor/cli';
 
+const LOCAL_ANDROID = process.env.NEXT_PUBLIC_LOCAL_ANDROID !== undefined
+
 const config: CapacitorConfig = {
   appId: 'com.compass.app',
   appName: 'Compass',
   webDir: 'web/.next',
   server: {
-    url: 'https://compassmeet.com',
+    url: LOCAL_ANDROID ? "http://10.0.2.2:3000" : 'https://compassmeet.com',
     cleartext: true
   },
 };
diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts
index 915363bb..5d5857a2 100644
--- a/web/lib/firebase/users.ts
+++ b/web/lib/firebase/users.ts
@@ -6,7 +6,6 @@ import {getAuth, GoogleAuthProvider, OAuthProvider, signInWithCredential, signIn
 import {safeLocalStorage} from '../util/local'
 import {app} from './init'
 import {SocialLogin} from "@capgo/capacitor-social-login";
-import {Capacitor} from "@capacitor/core";
 
 dayjs.extend(utc)
 
@@ -79,11 +78,14 @@ export async function googleNativeLogin() {
   return userCredential
 }
 
+export const isRunningInAPK = () => typeof window !== 'undefined' && (window as any).IS_APK === true
 
 export async function firebaseLogin() {
-  if (Capacitor.isNativePlatform()) {
+  if (isRunningInAPK()) {
+    console.log('Running in APK')
     return await googleNativeLogin()
   }
+  console.log('Running in web')
   const provider = new GoogleAuthProvider()
   return signInWithPopup(auth, provider).then(async (result) => {
     return result