diff --git a/tasks/main.yml b/tasks/main.yml
index be934c0..c4021ff 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,27 +1,26 @@
 ---
 # tasks file for jotbe.dev-tools
-- name: Provide dev-tools
-  block:
-  - name: Add key for Sublime Text repo
-    apt_key:
-      url: https://download.sublimetext.com/sublimehq-pub.gpg
-      state: present
-
-  - name: Add repository for Sublime Text
-    apt_repository:
-      repo: deb https://download.sublimetext.com/ apt/stable/
-      state: present
-
-  - name: Update apt cache
-    apt:
-      update_cache: yes
-      cache_valid_time: 7200
-
-  - name: Install Sublime Text
-    apt:
-      pkg:
-        - sublime-text
-    register: sublime_text_installed
-
+- name: Provide dev-tools (on Debian)
+  include_tasks:
+    file: sublime_text_debian.yml
+    apply:
+      tags:
+        - sublime_text
   when: ansible_facts['os_family'] == 'Debian'
-  become: yes
+
+- name: Provide dev-tools (on Debian)
+  include_tasks:
+    file: sublime_text_debian.yml
+    apply:
+      tags:
+        - sublime_text
+  when: ansible_facts['os_family'] == 'Debian'
+
+- name: Provide dev-tools (on Archlinux)
+  include_tasks:
+    file: sublime_text_archlinux.yml
+    apply:
+      tags:
+        - sublime_text
+  when:
+    - ansible_facts['os_family'] == 'Archlinux'
diff --git a/tasks/sublime_text_archlinux.yml b/tasks/sublime_text_archlinux.yml
new file mode 100644
index 0000000..490c321
--- /dev/null
+++ b/tasks/sublime_text_archlinux.yml
@@ -0,0 +1,27 @@
+---
+- name: Install Sublime Text (on Archlinux)
+  block:
+  - name: Add key for Sublime Text repo
+    shell:
+      cmd: |
+        curl -O https://download.sublimetext.com/sublimehq-pub.gpg && \
+        sudo pacman-key --add sublimehq-pub.gpg && sudo pacman-key --lsign-key 8A8F901A && \
+        rm sublimehq-pub.gpg
+
+  - name: Add repository for Sublime Text
+    blockinfile:
+      path: /etc/pacman.conf
+      block: |
+        [sublime-text]
+        Server = https://download.sublimetext.com/arch/dev/x86_64
+
+  - name: Install Sublime Text
+    pacman:
+      name: sublime-text
+      state: latest
+      update_cache: yes
+    register: sublime_text_installed
+
+  when:
+    - ansible_architecture == 'x86_64'
+  become: yes
diff --git a/tasks/sublime_text_debian.yml b/tasks/sublime_text_debian.yml
new file mode 100644
index 0000000..a45c622
--- /dev/null
+++ b/tasks/sublime_text_debian.yml
@@ -0,0 +1,24 @@
+---
+- name: Install Sublime Text (on Debian)
+  block:
+    - name: Add key for Sublime Text repo
+      apt_key:
+        url: https://download.sublimetext.com/sublimehq-pub.gpg
+        state: present
+
+    - name: Add repository for Sublime Text
+      apt_repository:
+        repo: deb https://download.sublimetext.com/ apt/stable/
+        state: present
+
+    - name: Update apt cache
+      apt:
+        update_cache: yes
+        cache_valid_time: 7200
+
+    - name: Install Sublime Text
+      apt:
+        pkg:
+          - sublime-text
+      register: sublime_text_installed
+  become: true
\ No newline at end of file