diff --git a/ansible-playbook.yml b/ansible-playbook.yml
index 7a405dd..0fc07d7 100644
--- a/ansible-playbook.yml
+++ b/ansible-playbook.yml
@@ -117,6 +117,7 @@
         name: wazuh-certs-generator
         env:
           CERT_TOOL_VERSION: 4.14
+        auto_remove: yes
         command: "generator"
         volumes:
           - /opt/apps/wazuh/config/wazuh_indexer_ssl_certs/:/certificates/
@@ -126,18 +127,18 @@
 
     - name: Deploy Wazuh Manager
       containers.podman.podman_container:
-        image: wazuh/wazuh-manager:5.0.0
+        image: wazuh/wazuh-manager:{{ wazah_version }}
         name: wazuh.manager
         env:
-          INDEXER_URL: https://wazuh.indexer:9200
-          INDEXER_USERNAME: admin
-          INDEXER_PASSWORD: SecretPassword
-          FILEBEAT_SSL_VERIFICATION_MODE: full
-          SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
-          SSL_CERTIFICATE: /etc/ssl/filebeat.pem
-          SSL_KEY: /etc/ssl/filebeat.key
-          API_USERNAME: wazuh-wui
-          API_PASSWORD: MyS3cr37P450r.*-
+          INDEXER_URL: "https://wazuh.indexer:9200"
+          INDEXER_USERNAME: "admin"
+          INDEXER_PASSWORD: "SecretPassword"
+          FILEBEAT_SSL_VERIFICATION_MODE: "full"
+          SSL_CERTIFICATE_AUTHORITIES: "/etc/ssl/root-ca.pem"
+          SSL_CERTIFICATE: "/etc/ssl/filebeat.pem"
+          SSL_KEY: "/etc/ssl/filebeat.key"
+          API_USERNAME: "wazuh-wui"
+          API_PASSWORD: "MyS3cr37P450r.*-"
         ulimits:
           - "memlock:-1:-1"
           - "nofile:655360:655360"
@@ -168,7 +169,7 @@
 
     - name: Deploy Wazuh Indexer
       containers.podman.podman_container:
-        image: wazuh/wazuh-indexer:5.0.0
+        image: wazuh/wazuh-indexer:{{ wazah_version }}
         name: wazuh.indexer
         env:
           OENSEARCH_JAVA_OPTS: "-Xms1g -Xmx1g"
@@ -192,16 +193,16 @@
 
     - name: Deploy Wazuh Dashboard
       containers.podman.podman_container:
-        image: wazuh/wazuh-dashboard:5.0.0
+        image: wazuh/wazuh-dashboard:{{ wazah_version }}
         name: wazuh.dashboard
         env:
-          INDEXER_USERNAME: admin
-          INDEXER_PASSWORD: SecretPassword
-          WAZUH_API_URL: https://wazuh.manager
-          DASHBOARD_USERNAME: kibanaserver
-          DASHBOARD_PASSWORD: kibanaserver
-          API_USERNAME: wazuh-wui
-          API_PASSWORD: "MyS3cr37P450r.*-""
+          INDEXER_USERNAME: "admin"
+          INDEXER_PASSWORD: "SecretPassword"
+          WAZUH_API_URL: "https://wazuh.manager"
+          DASHBOARD_USERNAME: "kibanaserver"
+          DASHBOARD_PASSWORD: "kibanaserver"
+          API_USERNAME: "wazuh-wui"
+          API_PASSWORD: "MyS3cr37P450r.*-"
         ulimits:
           - "memlock:-1:-1"
           - "nofile:655360:655360"
diff --git a/vars.yml b/vars.yml
index 24fa08c..101dac8 100644
--- a/vars.yml
+++ b/vars.yml
@@ -11,7 +11,7 @@ directories:
   - /opt/apps/prowler/postgres/data
   - /opt/apps/wazuh
 #  - /opt/apps/n8n/files
-  - 
+
 
 ## Jellyfin directories for media
 directories_jellyfin:
@@ -23,7 +23,12 @@ images:
   - lscr.io/linuxserver/jellyfin:latest
 #  - docker.n8n.io/n8nio/n8n
   - docker.gitea.com/gitea:nightly
+  - docker.io/wazuh/wazuh-certs-generator:0.0.3
+  - docker.io/wazuh/wazuh-dashboard:{{ wazah_version }}
+  - docker.io/wazuh/wazuh-indexer:{{ wazah_version }}
+  - docker.io/wazuh/wazuh-manager:{{ wazah_version }}
 
+wazah_version: 4.14.1
 sudo_password: sdfwwww
 
 POSTGRES_ADMIN_USER: theuseriwant