diff --git a/tasks/workstation/linux/software/llm.yml b/tasks/workstation/linux/software/llm.yml
index d1294cb..2f6af34 100644
--- a/tasks/workstation/linux/software/llm.yml
+++ b/tasks/workstation/linux/software/llm.yml
@@ -524,7 +524,7 @@
             owner: "{{ user }}"
             mode: "0755"
 
-        - name: Workstation | Linux | Software | LLMs | runit | open-terminal | Dir | AI-Sandbox
+        - name: Workstation | Linux | Software | LLMs | runit | open-terminal | AI-Sandbox | Dir
           ansible.builtin.file:
             dest: "{{ user_user.home }}/AI-Sandbox"
             state: directory
@@ -532,6 +532,28 @@
             group: "{{ user }}"
             mode: "0755"
 
+        - name: Workstation | Linux | Software | LLMs | runit | open-terminal | AI-Sandbox | Env
+          ansible.builtin.blockinfile:
+            path: "{{ user_user.home }}/AI-Sandbox/.bash_profile"
+            marker: "# {mark} | MANAGE BY ANSIBLE | Env Vars"
+            content: |
+              if [[ -d $HOME/bin ]]; then
+                export PATH="$HOME/bin:$PATH"
+              fi
+
+              export ANDROID_HOME="/home/user/SDKs/Android/Sdk"
+              export PATH="$ANDROID_HOME/platform-tools:$PATH"
+              export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$PATH"
+
+              export FLUTTER_HOME="/home/user/SDKs/Flutter/flutter"
+              export PATH="$FLUTTER_HOME/bin:$PATH"
+
+              export JAVA_HOME="/home/user/SDKs/Java"
+              export PATH="$JAVA_HOME/bin:$PATH"
+            owner: "{{ user }}"
+            group: "{{ user }}"
+            mode: "0755"
+
         - name: Workstation | Linux | Software | LLMs | runit | open-terminal | Script | Run
           ansible.builtin.copy:
             dest: /etc/sv/open-terminal/run
@@ -575,9 +597,6 @@
                 -v {{ user_user.home }}/Code:/home/user/Code \
                 -v {{ user_user.home }}/SDKs:/home/user/SDKs \
                 -v {{ jdk_src }}:{{ jdk_src }} \
-                -e ANDROID_HOME="/home/user/SDKs/Android/Sdk" \
-                -e FLUTTER_HOME="/home/user/SDKs/Flutter/flutter" \
-                -e    JAVA_HOME="/home/user/SDKs/Java" \
                 -v {{ user_user.home }}/.gradle:/home/user/.gradle \
                 -v {{ user_user.home }}/.pub_cache:/home/user/.pub_cache \
                 -e OPEN_TERMINAL_FILE_BROWSER_ROOT="/home/user" \