diff --git a/roles/aqua/defaults/main.yml b/roles/aqua/defaults/main.yml
index d92e553..24d2f72 100644
--- a/roles/aqua/defaults/main.yml
+++ b/roles/aqua/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 
-aqua_version: v2.27.0
+aqua_version: v2.31.0
diff --git a/roles/aqua/tasks/install_MacOS.yml b/roles/aqua/tasks/install_MacOS.yml
new file mode 100644
index 0000000..45bf13d
--- /dev/null
+++ b/roles/aqua/tasks/install_MacOS.yml
@@ -0,0 +1,5 @@
+---
+
+- name: Install aqua
+  community.general.homebrew:
+    name: aquaprooj/aqua/aqua
diff --git a/roles/aqua/tasks/main.yml b/roles/aqua/tasks/main.yml
index 009ccf8..285f8f7 100644
--- a/roles/aqua/tasks/main.yml
+++ b/roles/aqua/tasks/main.yml
@@ -23,7 +23,11 @@
     backup: true
     mode: 0644
 
+- name: Set shell info
+  ansible.builtin.set_fact:
+    shell_info: "{{ ansible_user_shell | shell_config }}"
+
 - name: Setup environment variable
   ansible.builtin.lineinfile:
     line: 'export AQUA_GLOBAL_CONFIG=$HOME/.config/aquaproj-aqua/aqua.yaml'
-    dest: '$HOME/.bashrc'
+    dest: '{{ ansible_user_dir }}/{{ shell_info.rc_file }}'
diff --git a/roles/shell/tasks/main.yml b/roles/shell/tasks/main.yml
index 98921c1..ee41ed1 100644
--- a/roles/shell/tasks/main.yml
+++ b/roles/shell/tasks/main.yml
@@ -8,6 +8,7 @@
   ansible.builtin.command: which starship
   register: starship_installed
   changed_when: false
+  failed_when: false
 
 - name: Setup starship
   ansible.builtin.include_tasks: setup_starship.yml