diff --git a/.provision/playbook.yml b/.provision/playbook.yml
index c67f348..0a0cb24 100644
--- a/.provision/playbook.yml
+++ b/.provision/playbook.yml
@@ -7,23 +7,7 @@
     - role: cui
       tags: cui
 
-- name: gui
-  hosts: localhost
-  connection: local
-  gather_facts: yes
-  roles:
-    - role: gui
-      tags: gui
-
-- name: appstore
-  hosts: localhost
-  connection: local
-  gather_facts: yes
-  roles:
-    - role: appstore
-      tags: appstore
-
-- name: os
+- name: macos
   hosts: localhost
   connection: local
   gather_facts: yes
@@ -33,5 +17,4 @@
     - name: "Restart Finder"
       shell: "killall Finder"
   roles:
-    - role: os
-      tags: os
+    - role: macos
diff --git a/.provision/roles/appstore/tasks/main.yml b/.provision/roles/appstore/tasks/main.yml
deleted file mode 100644
index e2b2fed..0000000
--- a/.provision/roles/appstore/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- import_tasks: mas.yml
diff --git a/.provision/roles/gui/tasks/main.yml b/.provision/roles/gui/tasks/main.yml
deleted file mode 100644
index f9dfc71..0000000
--- a/.provision/roles/gui/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- import_tasks: homebrew.yml
diff --git a/.provision/roles/appstore/spec/appstore_spec.rb b/.provision/roles/macos/spec/appstore_spec.rb
similarity index 100%
rename from .provision/roles/appstore/spec/appstore_spec.rb
rename to .provision/roles/macos/spec/appstore_spec.rb
diff --git a/.provision/roles/gui/spec/gui_spec.rb b/.provision/roles/macos/spec/gui_spec.rb
similarity index 100%
rename from .provision/roles/gui/spec/gui_spec.rb
rename to .provision/roles/macos/spec/gui_spec.rb
diff --git a/.provision/roles/os/spec/os_spec.rb b/.provision/roles/macos/spec/os_spec.rb
similarity index 100%
rename from .provision/roles/os/spec/os_spec.rb
rename to .provision/roles/macos/spec/os_spec.rb
diff --git a/.provision/roles/appstore/tasks/mas.yml b/.provision/roles/macos/tasks/appstore.yml
similarity index 93%
rename from .provision/roles/appstore/tasks/mas.yml
rename to .provision/roles/macos/tasks/appstore.yml
index e40abb5..04ac07b 100644
--- a/.provision/roles/appstore/tasks/mas.yml
+++ b/.provision/roles/macos/tasks/appstore.yml
@@ -1,6 +1,7 @@
 ---
 - name: Install mas packages
-  shell: "mas install {{ item.id }}"
+  mas:
+    id: "{{ item.id }}"
   with_items:
     - { name: BetterSnapTool, id: 417375580 }
     - { name: Evernote, id: 406056744 }
diff --git a/.provision/roles/macos/tasks/command.yml b/.provision/roles/macos/tasks/command.yml
new file mode 100644
index 0000000..e27b522
--- /dev/null
+++ b/.provision/roles/macos/tasks/command.yml
@@ -0,0 +1,6 @@
+---
+- name: Install mas which is package manager of Mac App Store
+  homebrew:
+    name: "{{ item.name }}"
+  with_items:
+    - { name: mas }
diff --git a/.provision/roles/gui/tasks/homebrew.yml b/.provision/roles/macos/tasks/gui.yml
similarity index 60%
rename from .provision/roles/gui/tasks/homebrew.yml
rename to .provision/roles/macos/tasks/gui.yml
index 30d5b42..fc5f386 100644
--- a/.provision/roles/gui/tasks/homebrew.yml
+++ b/.provision/roles/macos/tasks/gui.yml
@@ -1,15 +1,7 @@
+---
 - name: Tap brew packages
   homebrew_tap:
     name: "homebrew/cask-fonts"
-- name: Install font
-  homebrew_cask:
-    name: font-fira-code-nerd-font
-
-- name: Install mas which is package manager of Mac App Store
-  homebrew:
-    name: "{{ item.name }}"
-  with_items:
-    - { name: mas }
 
 - name: Install brew cask packages
   homebrew_cask:
@@ -18,6 +10,7 @@
     - { name: clipy }
     - { name: docker }
     - { name: drawio }
+    - { name: dynalist }
+    - { name: font-fira-code-nerd-font }
     - { name: google-chrome }
     - { name: typora }
-    - { name: dynalist }
diff --git a/.provision/roles/macos/tasks/main.yml b/.provision/roles/macos/tasks/main.yml
new file mode 100644
index 0000000..45c9850
--- /dev/null
+++ b/.provision/roles/macos/tasks/main.yml
@@ -0,0 +1,8 @@
+---
+- import_tasks: appstore.yml
+  tags: appstore
+- import_tasks: os.yml
+  tags: os
+- import_tasks: command.yml
+- import_tasks: gui.yml
+  tags: gui
diff --git a/.provision/roles/os/tasks/main.yml b/.provision/roles/macos/tasks/os.yml
similarity index 100%
rename from .provision/roles/os/tasks/main.yml
rename to .provision/roles/macos/tasks/os.yml