diff --git a/ansible-role-elasticsearch/tasks/Debian.yml b/ansible-role-elasticsearch/tasks/Debian.yml
index d6e3a7e1..c51fb631 100644
--- a/ansible-role-elasticsearch/tasks/Debian.yml
+++ b/ansible-role-elasticsearch/tasks/Debian.yml
@@ -1,6 +1,9 @@
 ---
 - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
-  apt: name="{{ item }}" state=present update_cache=yes
+  apt:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: 3600
   with_items:
     - apt-transport-https
     - ca-certificates
@@ -9,6 +12,7 @@
   apt_repository:
     repo: 'ppa:webupd8team/java'
     codename: 'xenial'
+    update_cache: yes
 
 - when: elasticsearch_install_java
   block:
@@ -20,7 +24,10 @@
         vtype: boolean
 
     - name: Debian/Ubuntu | Oracle Java 8 installer
-      apt: name=oracle-java8-installer state=present update_cache=yes
+      apt:
+        name: oracle-java8-installer
+        state: present
+        cache_valid_time: 3600
       tags: install
 
 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
@@ -33,7 +40,11 @@
     repo: 'deb https://artifacts.elastic.co/packages/6.x/apt stable main'
     state: present
     filename: 'elastic_repo'
+    update_cache: yes
 
 - name: Debian/Ubuntu | Install Elasticsarch
-  apt: name=elasticsearch={{ elastic_stack_version }} state=present update_cache=yes
+  apt:
+    name: "elasticsearch={{ elastic_stack_version }}"
+    state: present
+    cache_valid_time: 3600
   tags: install
diff --git a/ansible-role-filebeat/tasks/Debian.yml b/ansible-role-filebeat/tasks/Debian.yml
index 24ae6173..45494c26 100644
--- a/ansible-role-filebeat/tasks/Debian.yml
+++ b/ansible-role-filebeat/tasks/Debian.yml
@@ -1,6 +1,9 @@
 ---
 - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
-  apt: name="{{ item }}" state=present update_cache=yes
+  apt:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: 3600
   with_items:
     - apt-transport-https
     - ca-certificates
diff --git a/ansible-role-filebeat/tests/test.yml b/ansible-role-filebeat/tests/test.yml
index 6981d75b..5e71b672 100644
--- a/ansible-role-filebeat/tests/test.yml
+++ b/ansible-role-filebeat/tests/test.yml
@@ -3,7 +3,8 @@
 
   pre_tasks:
     - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
+      apt:
+        cache_valid_time: 600
       when: ansible_os_family == 'Debian'
 
     - name: Install test dependencies (RedHat).
diff --git a/ansible-role-kibana/tasks/Debian.yml b/ansible-role-kibana/tasks/Debian.yml
index 356bda03..9cb809d2 100644
--- a/ansible-role-kibana/tasks/Debian.yml
+++ b/ansible-role-kibana/tasks/Debian.yml
@@ -1,6 +1,9 @@
 ---
 - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
-  apt: name="{{ item }}" state=present update_cache=yes
+  apt:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: 3600
   with_items:
     - apt-transport-https
     - ca-certificates
@@ -15,7 +18,11 @@
     repo: 'deb https://artifacts.elastic.co/packages/6.x/apt stable main'
     state: present
     filename: 'elastic_repo'
+    update_cache: yes
 
 - name: Debian/Ubuntu | Install Kibana
-  apt: name=kibana={{ elastic_stack_version }} state=present update_cache=yes
+  apt:
+    name: "kibana={{ elastic_stack_version }}"
+    state: present
+    cache_valid_time: 3600
   tags: install
diff --git a/ansible-role-logstash/tasks/Debian.yml b/ansible-role-logstash/tasks/Debian.yml
index afaf50e3..a5ffb14e 100644
--- a/ansible-role-logstash/tasks/Debian.yml
+++ b/ansible-role-logstash/tasks/Debian.yml
@@ -1,6 +1,9 @@
 ---
 - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
-  apt: name="{{ item }}" state=present update_cache=yes
+  apt:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: 3600
   with_items:
     - apt-transport-https
     - ca-certificates
@@ -22,8 +25,8 @@
     - name: Debian/Ubuntu | Oracle Java 8 installer
       apt:
         name: oracle-java8-installer
-        update_cache: yes
         state: present
+        cache_valid_time: 3600
       tags: install
 
 - name: Debian/Ubuntu | Add Elasticsearch GPG key
@@ -38,7 +41,10 @@
     filename: 'elastic_repo'
 
 - name: Debian/Ubuntu | Install Logstash
-  apt: name=logstash=1:{{ elastic_stack_version }}-1 state=present update_cache=yes
+  apt:
+    name: "logstash=1:{{ elastic_stack_version }}-1"
+    state: present
+    update_cache: yes
   tags: install
 
 - name: Debian/Ubuntu | Checking if wazuh-manager is installed
diff --git a/ansible-wazuh-agent/tasks/Debian.yml b/ansible-wazuh-agent/tasks/Debian.yml
index db8008d7..9f265eb1 100644
--- a/ansible-wazuh-agent/tasks/Debian.yml
+++ b/ansible-wazuh-agent/tasks/Debian.yml
@@ -1,6 +1,9 @@
 ---
 - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
-  apt: name="{{ item }}" state=present update_cache=yes
+  apt:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: 3600
   with_items:
     - apt-transport-https
     - ca-certificates
@@ -23,6 +26,7 @@
   apt_repository:
     repo: 'ppa:webupd8team/java'
     codename: 'xenial'
+    update_cache: yes
   when:
     - wazuh_agent_config.cis_cat.disable == 'no'
     - wazuh_agent_config.cis_cat.install_java == 'yes'
@@ -42,7 +46,10 @@
     - init
 
 - name: Debian/Ubuntu | Oracle Java 8 installer
-  apt: name=oracle-java8-installer state=present update_cache=yes
+  apt:
+    name: oracle-java8-installer
+    state: present
+    cache_valid_time: 3600
   when:
     - wazuh_agent_config.cis_cat.disable == 'no'
     - wazuh_agent_config.cis_cat.install_java == 'yes'
@@ -50,7 +57,10 @@
     - init
 
 - name: Debian/Ubuntu | Install OpenScap
-  package: name={{ item }} state=present update_cache=yes
+  apt:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: 3600
   when: wazuh_agent_config.openscap.disable == 'no'
   with_items:
     - libopenscap8
diff --git a/ansible-wazuh-manager/tasks/Debian.yml b/ansible-wazuh-manager/tasks/Debian.yml
index f6e517b6..56090f87 100644
--- a/ansible-wazuh-manager/tasks/Debian.yml
+++ b/ansible-wazuh-manager/tasks/Debian.yml
@@ -1,6 +1,9 @@
 ---
 - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
-  apt: name="{{ item }}" state=present update_cache=yes
+  apt:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: 3600
   with_items:
     - apt-transport-https
     - ca-certificates
@@ -19,7 +22,7 @@
 
 - name: Debian/Ubuntu | Add NodeSource repositories for Node.js
   apt_repository:
-    repo: deb https://deb.nodesource.com/node_6.x {{ ansible_distribution_release }} main
+    repo: "deb https://deb.nodesource.com/node_6.x {{ ansible_distribution_release }} main"
     state: present
     update_cache: yes
 
@@ -31,6 +34,7 @@
   apt_repository:
     repo: 'ppa:webupd8team/java'
     codename: 'xenial'
+    update_cache: yes
   when:
     - wazuh_manager_config.cis_cat.disable == 'no'
     - wazuh_manager_config.cis_cat.install_java == 'yes'
@@ -50,7 +54,10 @@
     - init
 
 - name: Debian/Ubuntu | Oracle Java 8 installer
-  apt: name=oracle-java8-installer state=present update_cache=yes
+  apt:
+    name: oracle-java8-installer
+    state: present
+    cache_valid_time: 3600
   when:
     - wazuh_manager_config.cis_cat.disable == 'no'
     - wazuh_manager_config.cis_cat.install_java == 'yes'
@@ -58,7 +65,10 @@
     - init
 
 - name: Debian/Ubuntu | Install OpenScap
-  package: name={{ item }} state=present update_cache=yes
+  package:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: 3600
   when: wazuh_manager_config.openscap.disable == 'no'
   with_items:
     - libopenscap8