diff --git a/app.json b/app.json
index 0844c12f..0cc093bc 100644
--- a/app.json
+++ b/app.json
@@ -8,13 +8,14 @@
     },
     "assetBundlePatterns": ["**/*"],
     "ios": {
-      "jsEngine": "hermes",
       "buildNumber": "17",
-      "supportsTablet": true,
-      "googleServicesFile": "./GoogleService-Info.plist",
       "config": {
         "usesNonExemptEncryption": false
-      }
+      },
+      "googleServicesFile": "./GoogleService-Info.plist",
+      "jsEngine": "hermes",
+      "usesAppleSignIn": true,
+      "supportsTablet": true
     },
     "name": "BACA",
     "orientation": "portrait",
@@ -32,6 +33,7 @@
     "version": "2.2.0",
     "plugins": [
       "@react-native-google-signin/google-signin",
+      "expo-apple-authentication",
       "expo-font",
       "expo-localization",
       "expo-secure-store",
diff --git a/assets/social/apple-icon-dark.png b/assets/social/apple-icon-dark.png
deleted file mode 100644
index 213c5404..00000000
Binary files a/assets/social/apple-icon-dark.png and /dev/null differ
diff --git a/assets/social/apple-icon.png b/assets/social/apple-icon.png
deleted file mode 100644
index 34a7babe..00000000
Binary files a/assets/social/apple-icon.png and /dev/null differ
diff --git a/assets/social/facebook-icon.png b/assets/social/facebook-icon.png
deleted file mode 100644
index cc110986..00000000
Binary files a/assets/social/facebook-icon.png and /dev/null differ
diff --git a/package.json b/package.json
index 981bf60f..3b70b3ea 100644
--- a/package.json
+++ b/package.json
@@ -109,6 +109,7 @@
     "@tanstack/react-query": "^4.29.19",
     "axios": "^1.6.7",
     "expo": "~50.0.13",
+    "expo-apple-authentication": "~6.3.0",
     "expo-application": "~5.8.3",
     "expo-asset": "~9.0.2",
     "expo-build-properties": "~0.11.1",
diff --git a/src/components/molecules/SocialButtons/AppleButton/AppleButton.tsx b/src/components/molecules/SocialButtons/AppleButton/AppleButton.tsx
new file mode 100644
index 00000000..8cd268a6
--- /dev/null
+++ b/src/components/molecules/SocialButtons/AppleButton/AppleButton.tsx
@@ -0,0 +1,77 @@
+import { useAuthAppleControllerLogin } from '@baca/api/query/auth-social/auth-social'
+import { assignPushToken, setToken } from '@baca/services'
+import { isSignedInAtom, store } from '@baca/store'
+import * as ExpoAppleAuthentication from 'expo-apple-authentication'
+import { Dispatch, FC, SetStateAction, useCallback, useEffect, useState } from 'react'
+
+import { SocialButton } from '../SocialButton'
+
+type AppleButtonProps = {
+  isDisabled: boolean
+  setIsDisabled: Dispatch<SetStateAction<boolean>>
+}
+
+export const AppleButton: FC<AppleButtonProps> = ({ isDisabled, setIsDisabled }) => {
+  const { mutate: signInApple } = useAuthAppleControllerLogin()
+  const [isLoading, setIsLoading] = useState<boolean>(false)
+  const [showAppleButton, setShowAppleButton] = useState<boolean>(false)
+
+  const checkIfAvailable = useCallback(async () => {
+    const isAvailable = await ExpoAppleAuthentication.isAvailableAsync()
+    setShowAppleButton(isAvailable)
+  }, [])
+
+  useEffect(() => {
+    checkIfAvailable()
+  }, [checkIfAvailable])
+
+  const onPress = useCallback(async () => {
+    setIsDisabled(true)
+    setIsLoading(true)
+    try {
+      const appleResponse = await ExpoAppleAuthentication.signInAsync({
+        requestedScopes: [
+          ExpoAppleAuthentication.AppleAuthenticationScope.EMAIL,
+          ExpoAppleAuthentication.AppleAuthenticationScope.FULL_NAME,
+        ],
+      })
+
+      signInApple(
+        {
+          data: {
+            idToken: appleResponse.identityToken!,
+            firstName: appleResponse.fullName?.givenName || '',
+            lastName: appleResponse.fullName?.familyName || '',
+          },
+        },
+
+        {
+          onError: (e) => {
+            if (e.code === 'ERR_REQUEST_CANCELED') {
+              console.log('Request cancelled by the user')
+            } else return e
+          },
+          onSuccess: async (response) => {
+            const { user, ...token } = response
+            if (token) {
+              await setToken(token)
+            }
+            store.set(isSignedInAtom, true)
+
+            // Send push token to backend
+            await assignPushToken()
+          },
+        }
+      )
+    } catch (e) {
+      console.log('Cannot login with apple', e)
+    } finally {
+      setIsLoading(false)
+      setIsDisabled(false)
+    }
+  }, [setIsDisabled, signInApple])
+
+  if (!showAppleButton) return null
+
+  return <SocialButton disabled={isDisabled} loading={isLoading} type="apple" onPress={onPress} />
+}
diff --git a/src/components/molecules/SocialButtons/AppleButton/index.ts b/src/components/molecules/SocialButtons/AppleButton/index.ts
new file mode 100644
index 00000000..a47ce11d
--- /dev/null
+++ b/src/components/molecules/SocialButtons/AppleButton/index.ts
@@ -0,0 +1 @@
+export * from './AppleButton'
diff --git a/src/components/molecules/SocialButtons/GoogleButton/GoogleButton.tsx b/src/components/molecules/SocialButtons/GoogleButton/GoogleButton.tsx
new file mode 100644
index 00000000..03684ec0
--- /dev/null
+++ b/src/components/molecules/SocialButtons/GoogleButton/GoogleButton.tsx
@@ -0,0 +1,9 @@
+import { isExpoGo, isWeb } from '@baca/constants'
+
+import { GoogleButtonProps, NativeGoogleButton } from './NativeGoogleButton'
+
+export const GoogleButton = (props: GoogleButtonProps) => {
+  //TODO: Add google button for web
+  if (isExpoGo || isWeb) return null
+  return <NativeGoogleButton {...props} />
+}
diff --git a/src/components/molecules/SocialButtons/GoogleButton/NativeGoogleButton.tsx b/src/components/molecules/SocialButtons/GoogleButton/NativeGoogleButton.tsx
index cf582110..2b69a067 100644
--- a/src/components/molecules/SocialButtons/GoogleButton/NativeGoogleButton.tsx
+++ b/src/components/molecules/SocialButtons/GoogleButton/NativeGoogleButton.tsx
@@ -4,22 +4,29 @@ import { useCallback, useEffect, useState } from '@baca/hooks'
 import { assignPushToken, setToken } from '@baca/services'
 import { isSignedInAtom, store } from '@baca/store'
 import { showErrorToast } from '@baca/utils'
-import { FC } from 'react'
+import { Dispatch, FC, SetStateAction } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import { SocialButton } from '../SocialButton'
 
-let NativeGoogleButton: FC = () => null
+export type GoogleButtonProps = {
+  isDisabled: boolean
+  setIsDisabled: Dispatch<SetStateAction<boolean>>
+}
+
+let NativeGoogleButton: FC<GoogleButtonProps> = () => null
 
 if (!isExpoGo && !isWeb) {
   // Conditionally import makes it work with expo go
   import('@react-native-google-signin/google-signin').then(({ GoogleSignin, statusCodes }) => {
     type GoogleSignInError = Error & { code: keyof typeof statusCodes }
 
-    NativeGoogleButton = () => {
-      const [isDisabled, setIsDisabled] = useState(false)
-      const { mutate: signInByGoogle } = useAuthGoogleControllerLogin()
+    NativeGoogleButton = ({ isDisabled, setIsDisabled }) => {
       const { t } = useTranslation()
+      const { mutate: signInByGoogle } = useAuthGoogleControllerLogin()
+
+      const [isGoogleButtonDisabled, setIsGoogleButtonDisabled] = useState<boolean>(false)
+      const [isLoading, setIsLoading] = useState(false)
 
       useEffect(() => {
         // No extra configuration is needed,
@@ -31,7 +38,7 @@ if (!isExpoGo && !isWeb) {
       }, [])
 
       const verifyPlayServices = useCallback(async (): Promise<void> => {
-        setIsDisabled(!(await GoogleSignin?.hasPlayServices?.()))
+        setIsGoogleButtonDisabled(!(await GoogleSignin?.hasPlayServices?.()))
       }, [])
 
       useEffect(() => {
@@ -65,6 +72,8 @@ if (!isExpoGo && !isWeb) {
       }, [signInByGoogle])
 
       const signIn = useCallback(async (): Promise<void> => {
+        setIsLoading(true)
+        setIsDisabled(true)
         try {
           await GoogleSignin?.signIn?.()
           await verifyToken()
@@ -88,10 +97,20 @@ if (!isExpoGo && !isWeb) {
           }
 
           showErrorToast({ description: t('errors.something_went_wrong') })
+        } finally {
+          setIsDisabled(false)
+          setIsLoading(false)
         }
-      }, [t, verifyToken])
-
-      return <SocialButton disabled={isDisabled} onPress={signIn} type="google" />
+      }, [setIsDisabled, t, verifyToken])
+
+      return (
+        <SocialButton
+          disabled={isGoogleButtonDisabled || isDisabled}
+          loading={isLoading}
+          onPress={signIn}
+          type="google"
+        />
+      )
     }
   })
 }
diff --git a/src/components/molecules/SocialButtons/GoogleButton/index.ts b/src/components/molecules/SocialButtons/GoogleButton/index.ts
new file mode 100644
index 00000000..e38dad87
--- /dev/null
+++ b/src/components/molecules/SocialButtons/GoogleButton/index.ts
@@ -0,0 +1 @@
+export * from './GoogleButton'
diff --git a/src/components/molecules/SocialButtons/GoogleButton/index.tsx b/src/components/molecules/SocialButtons/GoogleButton/index.tsx
deleted file mode 100644
index 184d596c..00000000
--- a/src/components/molecules/SocialButtons/GoogleButton/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { isExpoGo, isWeb } from '@baca/constants'
-
-import { NativeGoogleButton } from './NativeGoogleButton'
-
-export const GoogleButton = () => {
-  //TODO: Add google button for web
-  if (isExpoGo || isWeb) return null
-  return <NativeGoogleButton />
-}
diff --git a/src/components/molecules/SocialButtons/SocialButton.tsx b/src/components/molecules/SocialButtons/SocialButton.tsx
index a8e96848..11e51700 100644
--- a/src/components/molecules/SocialButtons/SocialButton.tsx
+++ b/src/components/molecules/SocialButtons/SocialButton.tsx
@@ -1,24 +1,22 @@
-import { appleIconDark, appleIcon, facebookIcon, googleIcon } from '@baca/constants'
+import { googleIcon } from '@baca/constants'
 import { useColorScheme } from '@baca/contexts'
-import { Button, ButtonProps } from '@baca/design-system'
+import { Button, ButtonProps, Icon } from '@baca/design-system'
 import i18n from '@baca/i18n'
-import { FC } from 'react'
+import { FC, useCallback } from 'react'
 import { Image, ImageSourcePropType } from 'react-native'
 
 type SocialMediaType = 'apple' | 'facebook' | 'google'
 
 const socialButtonVariants: {
   [key in SocialMediaType]: {
-    source: { light: ImageSourcePropType; dark?: ImageSourcePropType }
+    source?: { light: ImageSourcePropType; dark?: ImageSourcePropType }
     text: () => string
   }
 } = {
   apple: {
-    source: { light: appleIcon, dark: appleIconDark },
     text: () => i18n.t('sign_in_screen.sign_in_by_apple'),
   },
   facebook: {
-    source: { light: facebookIcon },
     text: () => i18n.t('sign_in_screen.sign_in_by_facebook'),
   },
   google: {
@@ -37,11 +35,34 @@ export const SocialButton: FC<SocialButtonProps> = ({ type = 'google', ...rest }
 
   const { source, text } = socialButtonVariants[type]
 
+  const generateLeftElement = useCallback(
+    (type: SocialMediaType) => {
+      switch (type) {
+        case 'apple':
+          return (
+            <Icon
+              color={colorScheme === 'light' ? 'Base.black' : 'Base.white'}
+              name="apple-fill"
+              size={24}
+            />
+          )
+        case 'facebook':
+          // @ts-expect-error icon type accepts only ColorNames in order to make suggestion in code, but strings works as well
+          return <Icon color="#1877F2" name="facebook-circle-fill" size={24} />
+        case 'google':
+          return (
+            <Image source={source?.[colorScheme] || source?.['light']} width={24} height={24} />
+          )
+      }
+    },
+    [colorScheme, source]
+  )
+
   return (
     <Button
       alignItems="center"
       justifyContent="center"
-      leftElement={<Image source={source[colorScheme] || source['light']} width={24} height={24} />}
+      leftElement={generateLeftElement(type)}
       variant="SecondaryGray"
       maxW={360}
       w="full"
diff --git a/src/components/molecules/SocialButtons/SocialButtons.tsx b/src/components/molecules/SocialButtons/SocialButtons.tsx
new file mode 100644
index 00000000..a5a506d5
--- /dev/null
+++ b/src/components/molecules/SocialButtons/SocialButtons.tsx
@@ -0,0 +1,19 @@
+import { Box } from '@baca/design-system'
+import { Dispatch, FC, SetStateAction } from 'react'
+
+import { AppleButton } from './AppleButton'
+import { GoogleButton } from './GoogleButton'
+
+type SocialButtonsProps = {
+  isDisabled: boolean
+  setIsDisabled: Dispatch<SetStateAction<boolean>>
+}
+
+export const SocialButtons: FC<SocialButtonsProps> = ({ isDisabled, setIsDisabled }) => {
+  return (
+    <Box gap={3} w="full">
+      <GoogleButton {...{ isDisabled, setIsDisabled }} />
+      <AppleButton {...{ isDisabled, setIsDisabled }} />
+    </Box>
+  )
+}
diff --git a/src/components/molecules/SocialButtons/index.ts b/src/components/molecules/SocialButtons/index.ts
index e81f3f99..8b0ba6ca 100644
--- a/src/components/molecules/SocialButtons/index.ts
+++ b/src/components/molecules/SocialButtons/index.ts
@@ -1,2 +1,3 @@
 export * from './GoogleButton'
 export * from './SocialButton'
+export * from './SocialButtons'
diff --git a/src/constants/images.ts b/src/constants/images.ts
index 93740605..2533fd16 100644
--- a/src/constants/images.ts
+++ b/src/constants/images.ts
@@ -8,7 +8,4 @@ export const lightBinarLogo = require('@baca/assets/logo/logo-light.png')
 export const darkLogoSygnet = require('@baca/assets/logo/logo-sygnet-dark.png')
 export const lightLogoSygnet = require('@baca/assets/logo/logo-sygnet-light.png')
 
-export const appleIcon = require('@baca/assets/social/apple-icon.png')
-export const appleIconDark = require('@baca/assets/social/apple-icon-dark.png')
-export const facebookIcon = require('@baca/assets/social/facebook-icon.png')
 export const googleIcon = require('@baca/assets/social/google-icon.png')
diff --git a/src/design-system/components/Button/Button.tsx b/src/design-system/components/Button/Button.tsx
index 0ab1f3ce..c21d8d70 100644
--- a/src/design-system/components/Button/Button.tsx
+++ b/src/design-system/components/Button/Button.tsx
@@ -61,7 +61,6 @@ const styles = StyleSheet.create({
   baseText: {
     fontStyle: 'normal',
     fontWeight: '400',
-    lineHeight: 21,
   },
 })
 
@@ -230,11 +229,19 @@ const RawButton = memo(
         ({ pressed }: PressableStateCallbackType) =>
           StyleSheet.flatten([
             styles.baseText,
+            { lineHeight: buttonSizeVariant.lineHeight },
             pressed ? hoverColorStyle : defaultColorStyle,
             disabled && disabledColorStyle,
             textStyle,
           ]),
-        [hoverColorStyle, defaultColorStyle, disabled, disabledColorStyle, textStyle]
+        [
+          buttonSizeVariant.lineHeight,
+          hoverColorStyle,
+          defaultColorStyle,
+          disabled,
+          disabledColorStyle,
+          textStyle,
+        ]
       )
 
       const iconElement = useCallback(
diff --git a/src/design-system/components/Button/__snapshots__/Button.test.tsx.snap b/src/design-system/components/Button/__snapshots__/Button.test.tsx.snap
index 8acaea4b..d2e6dd04 100644
--- a/src/design-system/components/Button/__snapshots__/Button.test.tsx.snap
+++ b/src/design-system/components/Button/__snapshots__/Button.test.tsx.snap
@@ -73,7 +73,7 @@ exports[`Button renders correctly 1`] = `
           "fontSize": 14,
           "fontStyle": "normal",
           "fontWeight": "400",
-          "lineHeight": 21,
+          "lineHeight": 20,
           "textAlign": "center",
           "textTransform": "none",
         }
diff --git a/src/design-system/config/buttonVariants.ts b/src/design-system/config/buttonVariants.ts
index 384547b5..9e40077e 100644
--- a/src/design-system/config/buttonVariants.ts
+++ b/src/design-system/config/buttonVariants.ts
@@ -257,6 +257,7 @@ type SizeStyle = {
   paddingVertical: number
   iconGap: number
   iconSize: number
+  lineHeight: number
 }
 
 export const buttonSizeVariants: { [key in ButtonSize]: SizeStyle } = {
@@ -266,6 +267,7 @@ export const buttonSizeVariants: { [key in ButtonSize]: SizeStyle } = {
     paddingVertical: 8,
     iconGap: 4,
     iconSize: 20,
+    lineHeight: 20,
   },
   md: {
     textVariant: 'SmSemibold',
@@ -273,6 +275,7 @@ export const buttonSizeVariants: { [key in ButtonSize]: SizeStyle } = {
     paddingVertical: 10,
     iconGap: 4,
     iconSize: 20,
+    lineHeight: 20,
   },
   lg: {
     textVariant: 'MdSemibold',
@@ -280,6 +283,7 @@ export const buttonSizeVariants: { [key in ButtonSize]: SizeStyle } = {
     paddingVertical: 12,
     iconGap: 6,
     iconSize: 20,
+    lineHeight: 24,
   },
   xl: {
     textVariant: 'MdSemibold',
@@ -287,6 +291,7 @@ export const buttonSizeVariants: { [key in ButtonSize]: SizeStyle } = {
     paddingVertical: 16,
     iconGap: 6,
     iconSize: 20,
+    lineHeight: 24,
   },
   xxl: {
     textVariant: 'LgSemibold',
@@ -294,6 +299,7 @@ export const buttonSizeVariants: { [key in ButtonSize]: SizeStyle } = {
     paddingVertical: 18,
     iconGap: 10,
     iconSize: 24,
+    lineHeight: 28,
   },
 } as const
 
diff --git a/src/enums/queryKeys.ts b/src/enums/queryKeys.ts
index 174422f3..52870bfe 100644
--- a/src/enums/queryKeys.ts
+++ b/src/enums/queryKeys.ts
@@ -1,3 +1,4 @@
 export enum QueryKeys {
   TODOS = 'TODOS',
+  USER_DATA = 'USER DATA',
 }
diff --git a/src/hooks/forms/useSignInForm.ts b/src/hooks/forms/useSignInForm.ts
index 7af93d25..cb66ea0f 100644
--- a/src/hooks/forms/useSignInForm.ts
+++ b/src/hooks/forms/useSignInForm.ts
@@ -4,12 +4,17 @@ import { assignPushToken, setToken } from '@baca/services'
 import { isSignedInAtom } from '@baca/store/auth'
 import { handleFormError, hapticImpact } from '@baca/utils'
 import { useSetAtom } from 'jotai'
+import { Dispatch, SetStateAction } from 'react'
 import { useForm } from 'react-hook-form'
 
 type SignInFormValues = AuthEmailLoginDto & {
   confirm: boolean
 }
 
+type UseSignInFormProps = {
+  setIsSignInButtonsDisabled?: Dispatch<SetStateAction<boolean>>
+}
+
 const defaultValues: SignInFormValues = {
   // TODO: Reset this values when building production app
   email: 'l.jeziorski+user@binarapps.com',
@@ -17,7 +22,7 @@ const defaultValues: SignInFormValues = {
   confirm: false,
 }
 
-export const useSignInForm = () => {
+export const useSignInForm = ({ setIsSignInButtonsDisabled }: UseSignInFormProps) => {
   const setIsSignedIn = useSetAtom(isSignedInAtom)
 
   const { mutate: loginMutate, isLoading: isSubmitting } = useAuthControllerLogin<{
@@ -37,6 +42,7 @@ export const useSignInForm = () => {
   })
 
   const onSubmit = async (data: SignInFormValues) => {
+    setIsSignInButtonsDisabled?.(true)
     // Errors are handled on UI side
     // if you want to stop this function with error just throw new Error.
     // Remember to pass readable error message for user, because this error will be displayed for him
@@ -67,6 +73,7 @@ export const useSignInForm = () => {
         },
       }
     )
+    setIsSignInButtonsDisabled?.(false)
   }
 
   return {
diff --git a/src/hooks/forms/useSignUpForm.ts b/src/hooks/forms/useSignUpForm.ts
index 240fd9b9..793726a4 100644
--- a/src/hooks/forms/useSignUpForm.ts
+++ b/src/hooks/forms/useSignUpForm.ts
@@ -1,9 +1,14 @@
 import { useAuthControllerRegister } from '@baca/api/query/auth/auth'
 import { AuthRegisterLoginDto } from '@baca/api/types'
 import { handleFormError, hapticImpact, showSuccessToast } from '@baca/utils'
+import { Dispatch, SetStateAction } from 'react'
 import { useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 
+type UseSignUpFormProps = {
+  setIsSignUpButtonDisabled?: Dispatch<SetStateAction<boolean>>
+}
+
 const defaultValues: AuthRegisterLoginDto = {
   email: '',
   password: '',
@@ -15,7 +20,7 @@ const defaultValues: AuthRegisterLoginDto = {
   privacyPolicyAccepted: false,
 }
 
-export const useSignUpForm = () => {
+export const useSignUpForm = ({ setIsSignUpButtonDisabled }: UseSignUpFormProps) => {
   const { mutate: signUpMutation, isLoading } = useAuthControllerRegister()
   const { t } = useTranslation()
 
@@ -31,6 +36,7 @@ export const useSignUpForm = () => {
   })
 
   const onSubmit = (data: AuthRegisterLoginDto) => {
+    setIsSignUpButtonDisabled?.(true)
     signUpMutation(
       {
         data,
@@ -52,6 +58,7 @@ export const useSignUpForm = () => {
         },
       }
     )
+    setIsSignUpButtonDisabled?.(false)
   }
 
   return {
diff --git a/src/hooks/forms/useUpdateProfileForm.ts b/src/hooks/forms/useUpdateProfileForm.ts
index 6b1eef9f..f2d201d9 100644
--- a/src/hooks/forms/useUpdateProfileForm.ts
+++ b/src/hooks/forms/useUpdateProfileForm.ts
@@ -1,12 +1,13 @@
 import { useAuthControllerUpdate, useAuthControllerMe } from '@baca/api/query/auth/auth'
 import { AuthUpdateDto } from '@baca/api/types'
+import { QueryKeys } from '@baca/enums'
 import { handleFormError, hapticImpact, showSuccessToast } from '@baca/utils'
 import { useMemo, useEffect } from 'react'
 import { useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 
 export const useUpdateProfileForm = () => {
-  const { data: userData } = useAuthControllerMe()
+  const { data: userData } = useAuthControllerMe({ query: { queryKey: [QueryKeys.USER_DATA] } })
   const { t } = useTranslation()
   const { mutate: updateUserMutation, isLoading } = useAuthControllerUpdate()
 
diff --git a/src/providers/NotificationProvider.tsx b/src/providers/NotificationProvider.tsx
index 95c152ff..45ab9fa7 100644
--- a/src/providers/NotificationProvider.tsx
+++ b/src/providers/NotificationProvider.tsx
@@ -50,10 +50,10 @@ export const NotificationProvider: FC<PropsWithChildren> = ({ children }) => {
   // Ideally this should be added as hook to layout file as described in this tutorial:
   // - https://docs.expo.dev/versions/latest/sdk/notifications/#handle-push-notifications-with-navigation
   useEffect(() => {
-    if (notification && rootNavigationState.key) {
+    if (notification && rootNavigationState?.key) {
       deeplinkWhenNotificationReceived(notification)
     }
-  }, [rootNavigationState.key, notification])
+  }, [rootNavigationState?.key, notification])
 
   // -------------------------------------------------------------
   // --------------- Sending push token to backend ---------------
diff --git a/src/providers/Providers.tsx b/src/providers/Providers.tsx
index af96940a..e4baa8ca 100644
--- a/src/providers/Providers.tsx
+++ b/src/providers/Providers.tsx
@@ -1,11 +1,12 @@
 import { AppLoading } from '@baca/components'
 import { useAppStateActive } from '@baca/hooks'
 import { AuthLogic } from '@baca/logic/AuthLogic'
+import { queryClient } from '@baca/queryClient'
 import { store } from '@baca/store'
 import { checkForUpdates } from '@baca/utils'
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'
 import { PortalProvider } from '@gorhom/portal'
-import { QueryClientProvider, QueryClient } from '@tanstack/react-query'
+import { QueryClientProvider } from '@tanstack/react-query'
 import { Provider } from 'jotai'
 import { FC, PropsWithChildren } from 'react'
 import { StyleSheet } from 'react-native'
@@ -16,17 +17,6 @@ import { ColorSchemeProvider } from './ColorSchemeProvider'
 import { NotificationsProvider } from './NotificatedProvider'
 import { NotificationProvider as ExpoNotificationsProvider } from './NotificationProvider'
 
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      // It's needed to do it like that because when it's set to true it refetch query every 1-2 seconds
-      refetchOnMount: false,
-      refetchOnWindowFocus: false,
-      refetchOnReconnect: false,
-    },
-  },
-})
-
 export const Providers: FC<PropsWithChildren> = ({ children }) => {
   useAppStateActive(checkForUpdates, false)
 
diff --git a/src/queryClient.ts b/src/queryClient.ts
new file mode 100644
index 00000000..98199e91
--- /dev/null
+++ b/src/queryClient.ts
@@ -0,0 +1,12 @@
+import { QueryClient } from '@tanstack/react-query'
+
+export const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      // It's needed to do it like that because when it's set to true it refetch query every 1-2 seconds
+      refetchOnMount: false,
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
+    },
+  },
+})
diff --git a/src/screens/auth/SignInScreen.tsx b/src/screens/auth/SignInScreen.tsx
index 7a0c41b7..97456f97 100644
--- a/src/screens/auth/SignInScreen.tsx
+++ b/src/screens/auth/SignInScreen.tsx
@@ -2,20 +2,24 @@ import {
   CompanyLogo,
   ControlledField,
   FormWrapper,
-  GoogleButton,
   LanguagePicker,
+  SocialButtons,
   Version,
 } from '@baca/components'
 import { REGEX, isWeb } from '@baca/constants'
 import { Box, Button, Center, Display, Row, Spacer, Text } from '@baca/design-system'
-import { useCallback, useSignInForm, useTranslation } from '@baca/hooks'
+import { useCallback, useSignInForm, useState, useTranslation } from '@baca/hooks'
 import { useRouter } from 'expo-router'
 
 export const SignInScreen = (): JSX.Element => {
   const { push } = useRouter()
   const { t } = useTranslation()
 
-  const { control, errors, submit, getValues, isSubmitting, setFocus } = useSignInForm()
+  const [isSignInButtonDisabled, setIsSignInButtonsDisabled] = useState<boolean>(false)
+
+  const { control, errors, submit, getValues, isSubmitting, setFocus } = useSignInForm({
+    setIsSignInButtonsDisabled,
+  })
 
   const navigateToSignUp = useCallback(() => push('/sign-up'), [push])
   const navigateToAppInfo = useCallback(() => push('/application-info'), [push])
@@ -96,7 +100,7 @@ export const SignInScreen = (): JSX.Element => {
           </Button.LinkColor>
         </Row>
         <Button
-          disabled={isSubmitting}
+          disabled={isSubmitting || isSignInButtonDisabled}
           loading={isSubmitting}
           my={4}
           onPress={submit}
@@ -105,9 +109,10 @@ export const SignInScreen = (): JSX.Element => {
         >
           {t('sign_in_screen.sign_in')}
         </Button>
-        <Box gap={3} w="full">
-          <GoogleButton />
-        </Box>
+        <SocialButtons
+          isDisabled={isSignInButtonDisabled}
+          setIsDisabled={setIsSignInButtonsDisabled}
+        />
         <Row alignItems="center" mt={8}>
           <Text.SmRegular color="text.tertiary">
             {t('sign_in_screen.do_not_have_an_account')}
diff --git a/src/screens/auth/SignUpScreen.tsx b/src/screens/auth/SignUpScreen.tsx
index 4706bc52..e0312370 100644
--- a/src/screens/auth/SignUpScreen.tsx
+++ b/src/screens/auth/SignUpScreen.tsx
@@ -1,8 +1,7 @@
-import { CompanyLogo, ControlledField, FormWrapper, GoogleButton } from '@baca/components'
+import { CompanyLogo, ControlledField, FormWrapper, SocialButtons } from '@baca/components'
 import { Box, Button, Center, Display, Row, Spacer, Text } from '@baca/design-system'
-import { useSignUpForm, useTranslation } from '@baca/hooks'
+import { useCallback, useSignUpForm, useState, useTranslation } from '@baca/hooks'
 import { router } from 'expo-router'
-import { useCallback } from 'react'
 import { Keyboard } from 'react-native'
 
 import { usePasswordValidation } from '../../hooks/usePasswordValidation'
@@ -14,7 +13,11 @@ const navigateToLogIn = () => {
 export const SignUpScreen = () => {
   const { t } = useTranslation()
 
-  const { control, errors, register, isSubmitting, setFocus } = useSignUpForm()
+  const [isSignUpButtonDisabled, setIsSignUpButtonDisabled] = useState<boolean>(false)
+
+  const { control, errors, register, isSubmitting, setFocus } = useSignUpForm({
+    setIsSignUpButtonDisabled,
+  })
 
   const { isPasswordError, passwordSuggestions, validationFn } = usePasswordValidation()
 
@@ -118,9 +121,10 @@ export const SignUpScreen = () => {
           {t('sign_up_screen.get_started')}
         </Button>
         <Spacer y={4} />
-        <Box gap={3} w="full">
-          <GoogleButton />
-        </Box>
+        <SocialButtons
+          isDisabled={isSignUpButtonDisabled}
+          setIsDisabled={setIsSignUpButtonDisabled}
+        />
         <Spacer y={4} />
         <Row alignItems="center">
           <Text.SmRegular color="text.tertiary">
diff --git a/src/store/auth/authActions.ts b/src/store/auth/authActions.ts
index 16ad41bd..8aa967a5 100644
--- a/src/store/auth/authActions.ts
+++ b/src/store/auth/authActions.ts
@@ -1,3 +1,6 @@
+import { QueryKeys } from '@baca/enums'
+import { queryClient } from '@baca/queryClient'
+
 import { isSignedInAtom } from './authState'
 import { removePushToken } from '../../services/NotificationService'
 import { deleteToken } from '../../services/TokenService'
@@ -7,6 +10,9 @@ export async function signOut() {
   // set user logged out
   store.set(isSignedInAtom, false)
 
+  // remove user profile data from device
+  queryClient.removeQueries({ queryKey: [QueryKeys.USER_DATA] })
+
   // remove auth token from device
   await deleteToken()
 
diff --git a/yarn.lock b/yarn.lock
index 685d71c9..a291c7dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6655,6 +6655,11 @@ expect@^29.0.0, expect@^29.7.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
+expo-apple-authentication@~6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/expo-apple-authentication/-/expo-apple-authentication-6.3.0.tgz#0e591efbb70e97f87c1fcadfb8ca97a1d78bf47b"
+  integrity sha512-eYoRMlh7qKkWdbNe5TV5n0/1mLMRDFDxt+uetyu0XMdn70vZSTaPr5yewyGzoFHRx5t4QCEj8wTobcjoqH5PGw==
+
 expo-application@~5.8.0, expo-application@~5.8.3:
   version "5.8.3"
   resolved "https://registry.yarnpkg.com/expo-application/-/expo-application-5.8.3.tgz#43991bd81d05c987b07b2f430c036cda1572bc62"