diff --git a/Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/Debian.yml b/Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/Debian.yml
index 8aa2a79..6002940 100644
--- a/Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/Debian.yml
+++ b/Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/Debian.yml
@@ -27,10 +27,17 @@
     name: libwxbase3.0-0v5
     update_cache: yes
     state: present
-  ignore_errors: yes
+  when
   become: yes
 
-- name: Install erlang
+- name: Install erlang 21.2.1-1
   apt:
     deb: "{{ xray_home }}/app/third-party/rabbitmq/esl-erlang_21.2.1-1~ubuntu~xenial_amd64.deb"
+  when: {{ xray_version is version('3.8.0','<') }}
+  become: yes
+
+- name: Install erlang 22.3.4.1-1
+  apt:
+    deb: "{{ xray_home }}/app/third-party/rabbitmq/esl-erlang_22.3.4.1-1_ubuntu_xenial_amd64.deb"
+  when: {{ xray_version is version('3.8.0','>=') }}
   become: yes
\ No newline at end of file
diff --git a/Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/RedHat.yml b/Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/RedHat.yml
index 35792f9..a9fbfe6 100644
--- a/Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/RedHat.yml
+++ b/Ansible/ansible_collections/jfrog/installers/roles/xray/tasks/RedHat.yml
@@ -11,8 +11,16 @@
     state: present
   become: yes
 
-- name: Install erlang
+- name: Install erlang 21.1.4-1
   yum:
     name: "{{ xray_home }}/app/third-party/rabbitmq/erlang-21.1.4-1.el7.centos.x86_64.rpm"
     state: present
+  when: {{ xray_version is version('3.8.0','<') }}
+  become: yes
+
+- name: Install erlang 22.3.4.1-1
+  yum:
+    name: "{{ xray_home }}/app/third-party/rabbitmq/erlang-22.3.4.1-1.el7.centos.x86_64.rpm"
+    state: present
+  when: {{ xray_version is version('3.8.0','>=') }}
   become: yes
\ No newline at end of file