diff --git a/tasks/install_x86_64.yml b/tasks/install.yml
similarity index 100%
rename from tasks/install_x86_64.yml
rename to tasks/install.yml
diff --git a/tasks/install_arm.yml b/tasks/install_arm.yml
deleted file mode 100644
index 8d56030..0000000
--- a/tasks/install_arm.yml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-- name: Ensure Ruby packages are installed
-  package:
-    name:
-      - ruby-full
-      - ruby-augeas
-      # - libaugeas0
-      - libaugeas-dev
-      # - augeas-tools
-
-- name: Ensure Puppet agent gem is installed
-  gem:
-    name: puppet
-    version: "<{{ puppet_version + 1}}"
-    norc: true
-    user_install: false
-    state: present
-
-- name: Ensure Pathspec gem is installed
-  gem:
-    name: pathspec
-    version: "0.2.1"
-    user_install: false
-    state: present
-
-- name: Ensure other gems are installed
-  gem:
-    name: "{{ item }}"
-    user_install: false
-  loop:
-    - augeas
-    - ruby-augeas
-    - rspec-puppet-augeas
-    - puppet-lint-concatenated_template_files-check
-
-- name: Ensure puppet group exists
-  group:
-    name: puppet
-
-- name: Ensure puppet user exists
-  user:
-    name: puppet
-    group: puppet
-
-- name: Ensure puppet folder exists
-  file:
-    path: /etc/puppetlabs/puppet/
-    state: directory
-    owner: puppet
-    group: puppet
-
-- name: Ensure puppet server is configured
-  ini_file:
-    path: /etc/puppetlabs/puppet/puppet.conf
-    owner: puppet
-    group: puppet
-    section: main
-    option: server
-    value: "{{ puppet_server }}"
-    create: true
-
-- name: Ensure default puppet exists
-  copy:
-    src: files/default_puppet
-    dest: /etc/default/puppet
-
-- name: Ensure puppet agent service unit file exists
-  copy:
-    src: files/puppet.service
-    dest: /etc/systemd/system/puppet.service
-  notify: Reload Systemd daemon
-
-# mkdir -p /etc/puppetlabs/code/environments/production/modules/
-# mkdir -p /etc/puppetlabs/code/environments/production/manifests/
-
-- name: Ensure puppet agent service is enabled and running
-  systemd:
-    name: puppet
-    enabled: true
-    state: started
diff --git a/tasks/main.yml b/tasks/main.yml
index e33b1a0..7842e63 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,11 +1,6 @@
 ---
-- name: Ensure installation in x86 64bits systems
-  include_tasks: install_x86_64.yml
-  when: ansible_facts['architecture'] == "x86_64"
-
-- name: Ensure installation in ARM device
-  include_tasks: install_arm.yml
-  when: ansible_facts['architecture'] | regex_search("^arm") or ansible_facts['architecture'] == 'aarch64'
+- name: Ensure installation
+  include_tasks: install.yml
 
 - name: Ensure configuration
   include_tasks: configure.yml