diff --git a/fedora-atomic/aarch64.yml b/fedora-atomic/aarch64.yml
new file mode 100644
index 0000000..bf7f915
--- /dev/null
+++ b/fedora-atomic/aarch64.yml
@@ -0,0 +1,12 @@
+---
+- name: Install Starship
+  ansible.builtin.copy:
+    src: "{{ home_dir }}/Sync/bin/starship-aarch64"
+    dest: "{{ home_dir }}/bin/starship"
+    mode: "0755"
+
+- name: Install Protonmail Bridge
+  ansible.builtin.copy:
+    src: "{{ home_dir }}/Sync/bin/bridge-aarch64"
+    dest: "{{ home_dir }}/bin/bridge"
+    mode: "0755"
diff --git a/fedora-atomic/main.yml b/fedora-atomic/main.yml
index 5040f2b..6ca406b 100644
--- a/fedora-atomic/main.yml
+++ b/fedora-atomic/main.yml
@@ -9,18 +9,18 @@
     dotfiles_config_dir: "{{ ansible_facts['env']['HOME'] }}/dotfiles/.config"
 
   tasks:
+    # - name: SHow facts
+    #   ansible.builtin.debug:
+    #     var: ansible_facts
     - name: Install Flatpaks from Flathub
       community.general.flatpak:
         name:
-          - io.gitlab.librewolf-community
           - org.gajim.Gajim
-          - org.gajim.Gajim.Plugin.openpgp
           - org.gtk.Gtk3theme.Breeze
           - org.telegram.desktop
           - io.crow_translate.CrowTranslate
           - im.dino.Dino
           - org.libreoffice.LibreOffice
-          - im.kaidan.kaidan
           - im.pidgin.Pidgin
           - org.kde.gwenview
           - org.kde.okular
@@ -32,32 +32,6 @@
         remote: flathub
       become: true
 
-    - name: Install Flatpaks from Fedora
-      community.general.flatpak:
-        name:
-          - org.mozilla.Thunderbird
-        state: present
-        remote: fedora
-      become: true
-
-    - name: Setup h directory
-      ansible.builtin.file:
-        path: "{{ home_dir }}/h"
-        state: directory
-        mode: "0755"
-
-    - name: Setup sublime-text config directory
-      ansible.builtin.file:
-        path: "{{ config_dir }}/sublime-text"
-        state: directory
-        mode: "0755"
-
-    - name: Setup sublime-merge config directory
-      ansible.builtin.file:
-        path: "{{ config_dir }}/sublime-merge"
-        state: directory
-        mode: "0755"
-
     - name: Setup bin directory
       ansible.builtin.file:
         path: "{{ home_dir }}/bin"
@@ -94,18 +68,6 @@
         dest: "{{ home_dir }}/bin/p"
         state: link
 
-    - name: Install Starship
-      ansible.builtin.copy:
-        src: "{{ home_dir }}/Sync/bin/starship-aarch64"
-        dest: "{{ home_dir }}/bin/starship"
-        mode: "0755"
-
-    - name: Install Protonmail Bridge
-      ansible.builtin.copy:
-        src: "{{ home_dir }}/Sync/bin/bridge-aarch64"
-        dest: "{{ home_dir }}/bin/bridge"
-        mode: "0755"
-
     - name: Link msmtp config
       ansible.builtin.file:
         src: "{{ home_dir }}/Sync/.msmtprc"
@@ -123,3 +85,7 @@
         src: "{{ home_dir }}/dotfiles/.mailcap"
         dest: "{{ home_dir }}/.mailcap"
         state: link
+
+    - name: Tasks for aarch64 system
+      ansible.builtin.include_tasks: aarch64.yml
+      when: ansible_facts['architecture'] == "aarch64"