diff --git a/.config/shell/profile b/.config/shell/profile
index fe1b964..051e0fa 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -40,7 +40,6 @@ export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default"
 export KODI_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/kodi"
 export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
-# export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
 export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
 export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
 export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"
@@ -49,8 +48,6 @@ export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history"
 export WEECHAT_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/weechat"
 export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config"
 export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum"
-export ANDROID_AVD_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/android/avd"
-export ANDROID_USER_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/android"
 export CODEX_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/codex"
 export XCOMPOSEFILE="${XDG_CONFIG_HOME:-$HOME/.config}/xcompose"
 export GEMINI_CLI_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
@@ -83,10 +80,12 @@ export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads.
 export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm
 
 # Development variables
-export ANDROID_SDK_ROOT="$HOME/.local/share/android/Sdk"
-export ANDROID_HOME="$ANDROID_SDK_ROOT"
-export ANDROID_USER_HOME="$HOME/.local/share/android"
-export GRADLE_USER_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/gradle"
+export ANDROID_USER_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/android"
+export ANDROID_HOME="$ANDROID_USER_HOME/Sdk"
+export ANDROID_SDK_ROOT="$ANDROID_HOME"
+export ANDROID_AVD_HOME="$ANDROID_USER_HOME/avd"
+export GRADLE_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/gradle"
+export GRADLE_USER_HOME="$GRADLE_HOME"
 
 export PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$ANDROID_HOME/emulator:$XDG_DATA_HOME/cargo/bin"
 export PATH="$HOME/development/flutter/bin:$PATH"