diff --git a/molecule/filebeat/molecule.yml b/molecule/filebeat/molecule.yml
index e456c4ae..761326f3 100644
--- a/molecule/filebeat/molecule.yml
+++ b/molecule/filebeat/molecule.yml
@@ -11,23 +11,23 @@ lint:
 platforms:
   - name: trusty
     image: ubuntu:trusty
-  - name: bionic
-    image: solita/ubuntu-systemd:bionic
-    command: /sbin/init
-    privileged: true
-  - name: xenial
-    image: solita/ubuntu-systemd:xenial
-    privileged: true
-    command: /sbin/init
-  - name: centos6
-    image: geerlingguy/docker-centos6-ansible
-    privileged: true
-    command: /sbin/init
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-  - name: centos7
-    image: milcom/centos7-systemd
-    privileged: true
+ # - name: bionic
+ #   image: solita/ubuntu-systemd:bionic
+ #   command: /sbin/init
+ #   privileged: true
+ # - name: xenial
+ #   image: solita/ubuntu-systemd:xenial
+ #   privileged: true
+ #   command: /sbin/init
+ #- name: centos6
+ #  image: geerlingguy/docker-centos6-ansible
+ #  privileged: true
+ #  command: /sbin/init
+ #  volumes:
+ #    - /sys/fs/cgroup:/sys/fs/cgroup:ro
+ #- name: centos7
+ #  image: milcom/centos7-systemd
+ #  privileged: true
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/filebeat/prepare.yml b/molecule/filebeat/prepare.yml
index f3dc9aac..49325b85 100644
--- a/molecule/filebeat/prepare.yml
+++ b/molecule/filebeat/prepare.yml
@@ -7,6 +7,7 @@
     - name: "Install Python packages for Trusty to solve trust issues"
       package:
         name:
+          - python-apt
           - python-setuptools
           - python-pip
         state: latest
diff --git a/molecule/kibana/molecule.yml b/molecule/kibana/molecule.yml
index 2017a6bd..8cf21dc2 100644
--- a/molecule/kibana/molecule.yml
+++ b/molecule/kibana/molecule.yml
@@ -9,31 +9,31 @@ lint:
     config-data:
       ignore: .virtualenv
 platforms:
-  - name: bionic
-    image: solita/ubuntu-systemd:bionic
-    command: /sbin/init
-    ulimits:
-      - nofile:262144:262144
-    privileged: true
-    memory_reservation: 1024m
-  - name: xenial
-    image: solita/ubuntu-systemd:xenial
-    privileged: true
-    memory_reservation: 1024m
-    command: /sbin/init
-    ulimits:
-      - nofile:262144:262144
+#  - name: bionic
+#    image: solita/ubuntu-systemd:bionic
+#    command: /sbin/init
+#    ulimits:
+#      - nofile:262144:262144
+#    privileged: true
+#    memory_reservation: 1024m
+#  - name: xenial
+#    image: solita/ubuntu-systemd:xenial
+#    privileged: true
+#    memory_reservation: 1024m
+#    command: /sbin/init
+#    ulimits:
+#      - nofile:262144:262144
 #  - name: trusty
 #    image: ubuntu:trusty
 #    memory_reservation: 1024m
 #    ulimits:
 #      - nofile:262144:262144
-  - name: centos6
-    image: centos:6
-    privileged: true
-    memory_reservation: 1024m
-    ulimits:
-      - nofile:262144:262144
+#  - name: centos6
+#    image: centos:6
+#    privileged: true
+#    memory_reservation: 1024m
+#    ulimits:
+#      - nofile:262144:262144
   - name: centos7
     image: milcom/centos7-systemd
     memory_reservation: 1024m
diff --git a/molecule/kibana/playbook.yml b/molecule/kibana/playbook.yml
index 74fc1038..18543dce 100644
--- a/molecule/kibana/playbook.yml
+++ b/molecule/kibana/playbook.yml
@@ -3,3 +3,4 @@
   hosts: all
   roles:
     - role: elastic-stack/ansible-kibana
+    
\ No newline at end of file
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
index b35f11e1..67a34e7e 100644
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@@ -8,12 +8,6 @@
   register: elasticsearch_ca_packages_installed
   until: elasticsearch_ca_packages_installed is succeeded
 
-- name: "Install Java Repo for Trusty"
-  apt_repository: repo='ppa:openjdk-r/ppa'
-  when:
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_major_version | int == 14
-
 - name: Update and upgrade apt packages
   become: true
   apt:
@@ -24,14 +18,6 @@
     - ansible_distribution == "Ubuntu"
     - ansible_distribution_major_version | int == 14
 
-- name: Install Oracle Java 8
-  become: true
-  apt: name=openjdk-8-jdk
-
-  when:
-    - ansible_distribution == "Ubuntu"
-    - ansible_distribution_major_version | int == 14
-
 - name: Update and upgrade apt packages
   become: true
   apt:
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
index 81176ee0..16366dfc 100644
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
@@ -9,13 +9,6 @@
     gpgcheck: true
   changed_when: false
 
-- name: CentOS x.x => x.x < 7.0 | Installing Java
-  yum:
-    name: java-1.8.0-openjdk.x86_64
-    state: present
-  when:
-    - ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int < 7
-
 - name: RedHat/CentOS/Fedora | Install Elasticsarch
   package: name=elasticsearch-{{ elastic_stack_version }} state=present
   tags: install
diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml
index b0e5371c..7e1d408a 100644
--- a/roles/wazuh/ansible-filebeat/tasks/main.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/main.yml
@@ -90,13 +90,14 @@
 
 - name: Download Filebeat module package
   get_url:
-    url: https://packages-dev.wazuh.com/3.x/filebeat/{{ filebeat_module_package_name }}
+    url: https://packages.wazuh.com/3.x/filebeat/{{ filebeat_module_package_name }}
     dest: "{{ filebeat_module_package_path }}"
 
 - name: Unpakcaging Filebeat module package
-    unarchive:
+  unarchive:
     src: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}"
     dest: "{{ filebeat_module_destination }}"
+    remote_src: yes
 
 - name: Setting 0755 permission for Filebeat module folder
   file: dest={{ filebeat_module_folder }} mode=u=rwX,g=rwX,o=rwX recurse=yes